From 6892c42a103ca868dcc9ef95f74144ed0e7a0cb7 Mon Sep 17 00:00:00 2001 From: DaytonG Date: Tue, 6 Mar 2018 13:13:52 -0700 Subject: [PATCH] [stable/prometheus] update prometheus.io/port regex (#3961) * [stable/prometheus] update prometheus.io/port regex * [stable/prometheus] update prometheus.io/port replacement field --- stable/prometheus/Chart.yaml | 2 +- stable/prometheus/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index 2e2395af67..d29ae085e6 100755 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,5 +1,5 @@ name: prometheus -version: 5.4.0 +version: 5.4.1 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml index f7e15b57a0..3b9036c0a6 100644 --- a/stable/prometheus/values.yaml +++ b/stable/prometheus/values.yaml @@ -834,7 +834,7 @@ serverFiles: - 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_(.+) @@ -911,8 +911,8 @@ serverFiles: regex: (.+) - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port] action: replace - regex: (.+):(?:\d+);(\d+) - replacement: ${1}:${2} + regex: ([^:]+)(?::\d+)?;(\d+) + replacement: $1:$2 target_label: __address__ - action: labelmap regex: __meta_kubernetes_pod_label_(.+)