From baedcbd106a10ed9ffee1be4697bafe861f20bbb Mon Sep 17 00:00:00 2001 From: Dave Slinn Date: Sat, 23 Nov 2019 02:25:50 -0600 Subject: [PATCH] [stable/prometheus-operator] Rename relabeling target_label to targetLabel (#19089) * Rename relabeling target_label to targetLabel To match changes to coreos/kube-operator as noted here: https://github.com/coreos/prometheus-operator/issues/2503#issuecomment-478520117 Signed-off-by: Dave Slinn * bump version number Signed-off-by: Dave Slinn --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/values.yaml | 32 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 408d27b6b9..7d9bdab708 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -12,7 +12,7 @@ sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 8.2.3 +version: 8.2.4 appVersion: 0.34.0 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index b5cc50b752..28f82de5cf 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -220,7 +220,7 @@ alertmanager: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -482,7 +482,7 @@ grafana: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -559,7 +559,7 @@ kubelet: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -581,7 +581,7 @@ kubelet: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -634,7 +634,7 @@ kubeControllerManager: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -665,7 +665,7 @@ coreDns: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -700,7 +700,7 @@ kubeDns: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace dnsmasqMetricRelabelings: [] @@ -714,7 +714,7 @@ kubeDns: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -773,7 +773,7 @@ kubeEtcd: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -826,7 +826,7 @@ kubeScheduler: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -896,7 +896,7 @@ kubeStateMetrics: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -941,7 +941,7 @@ nodeExporter: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -1099,7 +1099,7 @@ prometheusOperator: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -1342,7 +1342,7 @@ prometheus: # - sourceLabels: [__meta_kubernetes_pod_node_name] # separator: ; # regex: ^(.*)$ - # target_label: nodename + # targetLabel: nodename # replacement: $1 # action: replace @@ -1635,7 +1635,7 @@ prometheus: # regex: __meta_kubernetes_node_label_(.+) # - source_labels: [__address__] # action: replace - # target_label: __address__ + # targetLabel: __address__ # regex: ([^:;]+):(\d+) # replacement: ${1}:2379 # - source_labels: [__meta_kubernetes_node_name] @@ -1643,7 +1643,7 @@ prometheus: # regex: .*mst.* # - source_labels: [__meta_kubernetes_node_name] # action: replace - # target_label: node + # targetLabel: node # regex: (.*) # replacement: ${1} # metric_relabel_configs: