From 7b33fc8e1971a509e5aaee1af8d9781dab677e40 Mon Sep 17 00:00:00 2001 From: HarHarLinks Date: Wed, 20 Oct 2021 12:57:55 +0200 Subject: [PATCH] fixup! auto-generate prometheus.yml for workers metrics --- roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml | 2 +- .../templates/prometheus/external_prometheus.yml.example.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml b/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml index 3dd828d2..e577491b 100644 --- a/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml +++ b/roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml @@ -44,7 +44,7 @@ dest: "{{ matrix_base_data_path }}/external_prometheus.yml.example" owner: "{{ matrix_user_username }}" group: "{{ matrix_user_groupname }}" - mode: 0400 + mode: 0644 when: matrix_nginx_proxy_proxy_synapse_metrics|bool - name: Ensure Matrix nginx-proxy configured (generic) diff --git a/roles/matrix-nginx-proxy/templates/prometheus/external_prometheus.yml.example.j2 b/roles/matrix-nginx-proxy/templates/prometheus/external_prometheus.yml.example.j2 index 36d61c05..01a39ffa 100644 --- a/roles/matrix-nginx-proxy/templates/prometheus/external_prometheus.yml.example.j2 +++ b/roles/matrix-nginx-proxy/templates/prometheus/external_prometheus.yml.example.j2 @@ -33,7 +33,7 @@ scrape_configs: password_file: /path/to/your/passwordfile.pwd {% endif %} static_configs: - - targets: [{{ matrix_server_fqn_matrix }:{{ matrix_nginx_proxy_container_https_host_bind_port if matrix_nginx_proxy_https_enabled else matrix_nginx_proxy_container_http_host_bind_port }}'] + - targets: ['{{ matrix_server_fqn_matrix }}:{{ matrix_nginx_proxy_container_https_host_bind_port if matrix_nginx_proxy_https_enabled else matrix_nginx_proxy_container_http_host_bind_port }}'] labels: job: "{{ worker.type }}" index: {{ worker.instanceId }}