Merge pull request #2434 from stephen-soltesz/master

Fix kubernetes host:port relabel regex.
This commit is contained in:
Frederic Branczyk 2017-02-17 10:51:05 +00:00 committed by GitHub
commit e14caf83e7

View file

@ -108,7 +108,7 @@ scrape_configs:
- source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port] - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
action: replace action: replace
target_label: __address__ target_label: __address__
regex: (.+)(?::\d+)?;(\d+) regex: ([^:]+)(?::\d+)?;(\d+)
replacement: $1:$2 replacement: $1:$2
- action: labelmap - action: labelmap
regex: __meta_kubernetes_service_label_(.+) regex: __meta_kubernetes_service_label_(.+)
@ -174,7 +174,7 @@ scrape_configs:
regex: (.+) regex: (.+)
- source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port] - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
action: replace action: replace
regex: (.+)(?::\d+)?;(\d+) regex: ([^:]+)(?::\d+)?;(\d+)
replacement: $1:$2 replacement: $1:$2
target_label: __address__ target_label: __address__
- action: labelmap - action: labelmap