Update to the monitoring service ( regarding Matrix's update )

group_vars/monitoring/monitoring-admin.yml

@@ -78,8 +78,10 @@ prometheus_scrape_configs:
   - job_name: "prometheus"
     metrics_path: "{{ prometheus_metrics_path }}"
     static_configs:
-      - targets:
-          - "{{ prometheus_web_listen_address }}"
+      - targets: ["{{ prometheus_web_listen_address }}"]
+        labels:
+          job: "master"
+          index: 1
   - job_name: "node_exporter"
     basic_auth:
       username: admin_collector
@@ -88,7 +90,7 @@ prometheus_scrape_configs:
       - files:
           - "{{ prometheus_config_dir }}/file_sd/node.yml"
   - job_name: 'synapse'
-    metrics_path: /_synapse/metrics
+    metrics_path: /metrics/synapse/main-process
     scheme: https
     basic_auth:
       username: prometheus
@@ -99,28 +101,28 @@ prometheus_scrape_configs:
           job: "master"
           index: 1
   - job_name: 'node-exporter-matrix'
-    metrics_path: /node-exporter/metrics
+    metrics_path: /metrics/node-exporter
     scheme: https
     basic_auth:
       username: prometheus
       password: "{{ vault_monitoring_node_collector_password }}"
     static_configs:
-      - targets: ['stats.matrix.laquadrature.net:443']
+      - targets: ['matrix.laquadrature.net:443']
         labels:
           job: "master"
           index: 1
   - job_name: 'postgres-exporter-matrix'
-    metrics_path: /postgres-exporter/metrics
+    metrics_path: /metrics/postgres-exporter
     scheme: https
     basic_auth:
       username: prometheus
       password: "{{ vault_monitoring_node_collector_password }}"
     static_configs:
-      - targets: ['stats.matrix.laquadrature.net:443']
+      - targets: ['matrix.laquadrature.net:443']
         labels:
           job: "master"
           index: 1
-          
+
 # Add servers to monitor below
 # Ajoutez les serveurs sous surveillance ici
 prometheus_targets:
@@ -132,6 +134,8 @@ prometheus_targets:
        - stats.sso.lqdn.fr
      labels:
        env: production
+       job: master
+       index: 1
 
 # Grafana
 grafana_instance: "{{ monitoring_service_url }}"