Automatically pick a job_name for Prometheus targets

roles/float-infra-prometheus/templates/prometheus.yml.j2

@@ -42,7 +42,7 @@
 
 {# Job scrape config for a float service. #}
 {% macro job_service_config(service_name, target_config) %}
-  - job_name: "{{ target_config.get('job_name', service_name) }}"
+  - job_name: "{{ service_name }}_{{ target_config.port }}"
     scheme: "{{ target_config.get('scheme', 'https') }}"
 {% if target_config.get('metrics_path') %}
     metrics_path: "{{ target_config['metrics_path'] }}"

services.prometheus-lts.yml

@@ -32,11 +32,9 @@ prometheus-lts:
       scheme: http
       enable_sso_proxy: true
   monitoring_endpoints:
-    - job_name: prometheus-lts
-      port: 9099
+    - port: 9099
       scheme: http
-    - job_name: thanos-sidecar-lts
-      port: 10912
+    - port: 10912
       scheme: http
   ports:
     - 10911

services.yml.default

@@ -21,8 +21,7 @@ reports-collector:
       port: 3995
       scheme: http
   monitoring_endpoints:
-    - job_name: reports-collector
-      port: 3995
+    - port: 3995
       scheme: http
   ports:
     - 3996
@@ -34,11 +33,9 @@ log-collector:
     - name: log-collector
       enable_client: false
   monitoring_endpoints:
-    - job_name: rsyslog-collector
-      port: 9105
+    - port: 9105
       scheme: http
-    - job_name: elasticsearch
-      port: 9201
+    - port: 9201
       scheme: http
   public_endpoints:
     - name: logs

services.yml.no-elasticsearch

@@ -35,8 +35,7 @@ log-collector:
     - name: log-collector
       enable_client: false
   monitoring_endpoints:
-    - job_name: rsyslog-collector
-      port: 9105
+    - port: 9105
       scheme: http
   containers:
     - name: rsyslog
@@ -142,26 +141,19 @@ prometheus:
       scheme: http
       enable_sso_proxy: true
   monitoring_endpoints:
-    - job_name: prometheus
-      port: 9090
+    - port: 9090
       scheme: http
-    - job_name: alertmanager
-      port: 9093
+    - port: 9093
       scheme: http
-    - job_name: karma
-      port: 9193
+    - port: 9193
       scheme: http
-    - job_name: grafana
-      port: 2929
+    - port: 2929
       scheme: https
-    - job_name: thanos-query
-      port: 10904
+    - port: 10904
       scheme: http
-    - job_name: thanos-sidecar
-      port: 10902
+    - port: 10902
       scheme: http
-    - job_name: thanos-query-frontend
-      port: 10906
+    - port: 10906
       scheme: http
   ports:
     - 9094
@@ -192,8 +184,7 @@ sso-server:
       port: 5002
       scheme: http
   monitoring_endpoints:
-    - job_name: sso-server
-      port: 5002
+    - port: 5002
       scheme: http
   systemd_services:
     - sso-server.service
@@ -220,8 +211,7 @@ user-meta-server:
   service_credentials:
     - name: user-meta-server
   monitoring_endpoints:
-    - job_name: user-meta-server
-      port: 5505
+    - port: 5505
       scheme: https
   ports:
     - 5505
@@ -261,8 +251,7 @@ backup-metadata:
     - name: backup-metadata
       enable_client: false
   monitoring_endpoints:
-    - job_name: backup-metadata
-      port: 5332
+    - port: 5332
       scheme: https
   public_endpoints:
     - name: backups
@@ -287,8 +276,7 @@ acme:
     - name: acme
       enable_server: false
   monitoring_endpoints:
-    - job_name: acme
-      port: 5004
+    - port: 5004
       scheme: http
   ports:
     - 5004
@@ -310,8 +298,7 @@ assets:
         - 3798
       egress_policy: internal
   monitoring_endpoints:
-    - job_name: assets
-      port: 3798
+    - port: 3798
       scheme: https
   public_endpoints:
     - name: assets