Merge pull request #2427 from stephen-soltesz/master

Kubernetes port annotations - match addresses with or without declared ports
This commit is contained in:
Tobias Schmidt 2017-02-14 22:45:30 -05:00 committed by GitHub
commit 0436e982cb
1 changed files with 3 additions and 3 deletions

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,8 +174,8 @@ 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
regex: __meta_kubernetes_pod_label_(.+) regex: __meta_kubernetes_pod_label_(.+)