Selaa lähdekoodia

fixup! auto-generate prometheus.yml for workers metrics

pull/1311/head
HarHarLinks 4 vuotta sitten
vanhempi
commit
7b33fc8e19
2 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. +1
    -1
      roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml
  2. +1
    -1
      roles/matrix-nginx-proxy/templates/prometheus/external_prometheus.yml.example.j2

+ 1
- 1
roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml Näytä tiedosto

@@ -44,7 +44,7 @@
dest: "{{ matrix_base_data_path }}/external_prometheus.yml.example" dest: "{{ matrix_base_data_path }}/external_prometheus.yml.example"
owner: "{{ matrix_user_username }}" owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}" group: "{{ matrix_user_groupname }}"
mode: 0400
mode: 0644
when: matrix_nginx_proxy_proxy_synapse_metrics|bool when: matrix_nginx_proxy_proxy_synapse_metrics|bool


- name: Ensure Matrix nginx-proxy configured (generic) - name: Ensure Matrix nginx-proxy configured (generic)


+ 1
- 1
roles/matrix-nginx-proxy/templates/prometheus/external_prometheus.yml.example.j2 Näytä tiedosto

@@ -33,7 +33,7 @@ scrape_configs:
password_file: /path/to/your/passwordfile.pwd password_file: /path/to/your/passwordfile.pwd
{% endif %} {% endif %}
static_configs: 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: labels:
job: "{{ worker.type }}" job: "{{ worker.type }}"
index: {{ worker.instanceId }} index: {{ worker.instanceId }}


Ladataan…
Peruuta
Tallenna