Skip to content

Commit

Permalink
[stable/prometheus] harmonization of regex reference without braces (h…
Browse files Browse the repository at this point in the history
…elm#10055)

Signed-off-by: Pierre DEMAGNY <[email protected]>
  • Loading branch information
pdemagny authored and coreypobrien committed Dec 31, 2018
1 parent 5f44e0f commit dcaacc2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion stable/prometheus/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: prometheus
version: 8.1.1
version: 8.1.2
appVersion: 2.5.0
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
Expand Down
6 changes: 3 additions & 3 deletions stable/prometheus/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ serverFiles:
- source_labels: [__meta_kubernetes_node_name]
regex: (.+)
target_label: __metrics_path__
replacement: /api/v1/nodes/${1}/proxy/metrics
replacement: /api/v1/nodes/$1/proxy/metrics


- job_name: 'kubernetes-nodes-cadvisor'
Expand Down Expand Up @@ -1002,7 +1002,7 @@ serverFiles:
# This configuration will work only on kubelet 1.7.3+
# As the scrape endpoints for cAdvisor have changed
# if you are using older version you need to change the replacement to
# replacement: /api/v1/nodes/${1}:4194/proxy/metrics
# replacement: /api/v1/nodes/$1:4194/proxy/metrics
# more info here https://github.com/coreos/prometheus-operator/issues/633
relabel_configs:
- action: labelmap
Expand All @@ -1012,7 +1012,7 @@ serverFiles:
- source_labels: [__meta_kubernetes_node_name]
regex: (.+)
target_label: __metrics_path__
replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor
replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor

# Scrape config for service endpoints.
#
Expand Down

0 comments on commit dcaacc2

Please sign in to comment.