From 74099383cda56bd36e9f2c0021a6a9b9828d531d Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 12 Jan 2024 13:01:06 +0200
Subject: [PATCH] Adapt external_prometheus.yml.example.j2 to our new metrics
 exposure setup

---
 .../prometheus/external_prometheus.yml.example.j2    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/custom/matrix-synapse/templates/synapse/prometheus/external_prometheus.yml.example.j2 b/roles/custom/matrix-synapse/templates/synapse/prometheus/external_prometheus.yml.example.j2
index 1501697d7..87837da28 100644
--- a/roles/custom/matrix-synapse/templates/synapse/prometheus/external_prometheus.yml.example.j2
+++ b/roles/custom/matrix-synapse/templates/synapse/prometheus/external_prometheus.yml.example.j2
@@ -12,28 +12,28 @@ rule_files:
 scrape_configs:
   - job_name: 'synapse'
     metrics_path: /metrics/synapse/main-process
-    scheme: {{ 'https' if matrix_nginx_proxy_https_enabled|default(true) else 'http' }}
-{% if matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_enabled|default(true) %}
+    scheme: https
+{% if matrix_synapse_container_labels_metrics_middleware_basic_auth_enabled|default(true) %}
     basic_auth:
       username: prometheus
       password_file: /path/to/your/passwordfile.pwd
 {% endif %}
     static_configs:
-      - targets: ['{{ matrix_server_fqn_matrix }}:{{ matrix_nginx_proxy_container_https_host_bind_port|default(443) if matrix_nginx_proxy_https_enabled|default(true) else matrix_nginx_proxy_container_http_host_bind_port|default(80) }}']
+      - targets: ['{{ matrix_synapse_metrics_proxying_hostname }}:443']
         labels:
           job: "master"
           index: "0"
 {% for worker in matrix_synapse_workers_enabled_list %}
   - job_name: '{{ worker.name }}'
     metrics_path: /metrics/synapse/worker/{{ worker.id }}
-    scheme: {{ 'https' if matrix_nginx_proxy_https_enabled|default(true) else 'http' }}
-{% if matrix_nginx_proxy_proxy_matrix_metrics_basic_auth_enabled|default(true) %}
+    scheme: https
+{% if matrix_synapse_worker_container_labels_metrics_middleware_basic_auth_enabled|default(true) %}
     basic_auth:
       username: prometheus
       password_file: /path/to/your/passwordfile.pwd
 {% endif %}
     static_configs:
-      - targets: ['{{ matrix_server_fqn_matrix }}:{{ matrix_nginx_proxy_container_https_host_bind_port|default(443) if matrix_nginx_proxy_https_enabled|default(true) else matrix_nginx_proxy_container_http_host_bind_port|default(80) }}']
+      - targets: ['{{ matrix_synapse_metrics_proxying_hostname }}:443']
         labels:
           worker_id: {{ worker.id }}
           job: "{{ worker.type }}"