From 3d063f6acef368ae213c2987bbc00aeffc575099 Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Wed, 30 Jun 2021 21:30:18 +0000
Subject: [PATCH] make them show as jobs in grafana

---
 .../templates/prometheus.yml.j2               | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/roles/matrix-prometheus/templates/prometheus.yml.j2 b/roles/matrix-prometheus/templates/prometheus.yml.j2
index edfa476b..2ab7c4e1 100644
--- a/roles/matrix-prometheus/templates/prometheus.yml.j2
+++ b/roles/matrix-prometheus/templates/prometheus.yml.j2
@@ -30,15 +30,20 @@ scrape_configs:
   - job_name: 'synapse'
     metrics_path: '/_synapse/metrics'
     static_configs:
-    - targets:
-    {% for target in matrix_prometheus_scraper_synapse_targets %}
-      - {{ target }}
-    {% endfor %}
-    {% for worker in matrix_synapse_workers_enabled_list|d([]) %}
-    {% if worker.metrics_port != 0 %}
-      - 'matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.metrics_port }}'
-    {% endif %}
-    {% endfor %}
+    - targets: {{ matrix_prometheus_scraper_synapse_targets|to_json }}
+      labels:
+        instance: {{ matrix_domain }}
+        job: master
+        index: 1
+  {% for worker in matrix_synapse_workers_enabled_list|d([]) %}
+  {% if worker.metrics_port != 0 %}
+    - targets: ['matrix-synapse-worker-{{ worker.type }}-{{ worker.instanceId }}:{{ worker.metrics_port }}']
+      labels:
+        instance: {{ matrix_domain }}
+        job: {{ worker.type }}
+        index: {{ worker.instanceId }}
+  {% endif %}
+  {% endfor %}
   {% endif %}
 
   {% if matrix_prometheus_scraper_node_enabled %}