Break dependency between matrix-prometheus-nginxlog-exporter and the Grafana role
Wiring happens via `group_vars/matrix_servers` now.
This commit is contained in:
parent
1006b8d899
commit
7c5826f1c3
@ -3384,6 +3384,14 @@ grafana_dashboard_download_urls: |
|
|||||||
(matrix_prometheus_nginxlog_exporter_dashboard_urls if matrix_prometheus_nginxlog_exporter_enabled else [])
|
(matrix_prometheus_nginxlog_exporter_dashboard_urls if matrix_prometheus_nginxlog_exporter_enabled else [])
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
grafana_provisioning_dashboard_template_files: |
|
||||||
|
{{
|
||||||
|
([{
|
||||||
|
'path': 'roles/custom/matrix-prometheus-nginxlog-exporter/templates/grafana/nginx-proxy.json',
|
||||||
|
'name': 'nginx-proxy.json',
|
||||||
|
}] if matrix_prometheus_nginxlog_exporter_enabled else [])
|
||||||
|
}}
|
||||||
|
|
||||||
grafana_default_home_dashboard_path: |-
|
grafana_default_home_dashboard_path: |-
|
||||||
{{
|
{{
|
||||||
{
|
{
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
version: v1.2.3-1.7.6-0
|
version: v1.2.3-1.7.6-0
|
||||||
|
|
||||||
- src: git+https://gitlab.com/etke.cc/roles/grafana.git
|
- src: git+https://gitlab.com/etke.cc/roles/grafana.git
|
||||||
version: v9.3.6-0
|
version: v9.3.6-1
|
||||||
|
|
||||||
- src: git+https://github.com/devture/com.devture.ansible.role.traefik.git
|
- src: git+https://github.com/devture/com.devture.ansible.role.traefik.git
|
||||||
version: fb09fd26f877372417d5586f1e79e83f983f0bd6
|
version: fb09fd26f877372417d5586f1e79e83f983f0bd6
|
||||||
|
@ -30,18 +30,8 @@
|
|||||||
owner: "{{ matrix_user_username }}"
|
owner: "{{ matrix_user_username }}"
|
||||||
group: "{{ matrix_user_groupname }}"
|
group: "{{ matrix_user_groupname }}"
|
||||||
|
|
||||||
- name: Ensure grafana dashboard is installed
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: "{{ role_path }}/templates/nginx-proxy.json"
|
|
||||||
dest: "{{ grafana_config_path }}/dashboards/"
|
|
||||||
mode: 0644
|
|
||||||
owner: "{{ matrix_user_username }}"
|
|
||||||
group: "{{ matrix_user_groupname }}"
|
|
||||||
when: grafana_enabled
|
|
||||||
|
|
||||||
- name: Ensure matrix-prometheus-nginxlog-exporter.service installed
|
- name: Ensure matrix-prometheus-nginxlog-exporter.service installed
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "{{ role_path }}/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2"
|
src: "{{ role_path }}/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2"
|
||||||
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-prometheus-nginxlog-exporter.service"
|
dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-prometheus-nginxlog-exporter.service"
|
||||||
mode: 0644
|
mode: 0644
|
||||||
register: matrix_prometheus_nginxlog_exporter_systemd_service_result
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user