Fix prometheus job_name issues

swarmlibs · Jul 10, 2024 · a6afc1a · a6afc1a
1 parent 8af9b38
commit a6afc1a
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/rootfs/etc/prometheus/scrape-configs/dockerswarm-tasks.yml b/rootfs/etc/prometheus/scrape-configs/dockerswarm-tasks.yml
@@ -41,6 +41,12 @@ scrape_configs:
       # Keep or drop targets with the following rules
       # ================================================================================
 
+      # io.prometheus.enabled=<true|false>
+      - source_labels:
+        - __meta_dockerswarm_service_label_io_prometheus_enabled
+        regex: 'true'
+        action: keep
+
       # - io.prometheus.dockerswarm-tasks.should_be_scraped=<true|false>
       - source_labels:
         - __meta_dockerswarm_service_label_io_prometheus_dockerswarm_tasks_should_be_scraped
@@ -61,12 +67,6 @@ scrape_configs:
       # ================================================================================
       # Override prometheus internal labels
       # ================================================================================
-
-      # io.prometheus.enabled=<true|false>
-      - source_labels:
-        - __meta_dockerswarm_service_label_io_prometheus_enabled
-        regex: 'true'
-        action: keep
 
       # io.prometheus.scrape_scheme=<scheme>
       - source_labels:
@@ -127,6 +127,13 @@ scrape_configs:
 
       # Override "job" label to Docker Swarm's Service Name combined with "namespace" labels
       # e.g. <com.docker.stack.namespace>/<io.prometheus.job_name>
+      - source_labels:
+          - __meta_dockerswarm_service_label_io_prometheus_job_name
+          - __meta_dockerswarm_service_name
+        target_label: __meta_dockerswarm_service_label_io_prometheus_job_name
+        separator: ';'
+        regex: ;(.*)
+        replacement: $1
       - source_labels:
         - __meta_dockerswarm_service_label_com_docker_stack_namespace
         - __meta_dockerswarm_service_label_io_prometheus_job_name