Merge pull request prometheus#2434 from stephen-soltesz/master

Fix kubernetes host:port relabel regex.
rongfengliang · Feb 17, 2017 · e14caf8 · e14caf8
2 parents 0436e98 + 3f29324
commit e14caf8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/documentation/examples/prometheus-kubernetes.yml b/documentation/examples/prometheus-kubernetes.yml
@@ -108,7 +108,7 @@ scrape_configs:
   - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
     action: replace
     target_label: __address__
-    regex: (.+)(?::\d+)?;(\d+)
+    regex: ([^:]+)(?::\d+)?;(\d+)
     replacement: $1:$2
   - action: labelmap
     regex: __meta_kubernetes_service_label_(.+)
@@ -174,7 +174,7 @@ scrape_configs:
     regex: (.+)
   - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
     action: replace
-    regex: (.+)(?::\d+)?;(\d+)
+    regex: ([^:]+)(?::\d+)?;(\d+)
     replacement: $1:$2
     target_label: __address__
   - action: labelmap