Skip to content

Commit

Permalink
[stable/prometheus-operator] Rename relabeling target_label to target…
Browse files Browse the repository at this point in the history
…Label (helm#19089)

* Rename relabeling target_label to targetLabel

To match changes to coreos/kube-operator as noted here:

prometheus-operator/prometheus-operator#2503 (comment)
Signed-off-by: Dave Slinn <dslinn@gms.ca>

* bump version number

Signed-off-by: Dave Slinn <dslinn@gms.ca>
  • Loading branch information
Dave Slinn authored and k8s-ci-robot committed Nov 23, 2019
1 parent 7b0750d commit baedcbd
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion stable/prometheus-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 16 additions & 16 deletions stable/prometheus-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ alertmanager:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -482,7 +482,7 @@ grafana:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -559,7 +559,7 @@ kubelet:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand All @@ -581,7 +581,7 @@ kubelet:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -634,7 +634,7 @@ kubeControllerManager:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -665,7 +665,7 @@ coreDns:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -700,7 +700,7 @@ kubeDns:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace
dnsmasqMetricRelabelings: []
Expand All @@ -714,7 +714,7 @@ kubeDns:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -773,7 +773,7 @@ kubeEtcd:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -826,7 +826,7 @@ kubeScheduler:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -896,7 +896,7 @@ kubeStateMetrics:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -941,7 +941,7 @@ nodeExporter:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -1099,7 +1099,7 @@ prometheusOperator:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -1342,7 +1342,7 @@ prometheus:
# - sourceLabels: [__meta_kubernetes_pod_node_name]
# separator: ;
# regex: ^(.*)$
# target_label: nodename
# targetLabel: nodename
# replacement: $1
# action: replace

Expand Down Expand Up @@ -1635,15 +1635,15 @@ 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]
# action: keep
# regex: .*mst.*
# - source_labels: [__meta_kubernetes_node_name]
# action: replace
# target_label: node
# targetLabel: node
# regex: (.*)
# replacement: ${1}
# metric_relabel_configs:
Expand Down

0 comments on commit baedcbd

Please sign in to comment.