From efbcad4e5c430cd15f8b23251c203a002866479a Mon Sep 17 00:00:00 2001 From: Wei Kin Huang Date: Tue, 5 Mar 2019 15:36:00 -0500 Subject: [PATCH] [stable/prometheus-operator] Add metricRelabelings to node exporter servicemonitor (#11937) Signed-off-by: Wei Kin Huang --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/README.md | 1 + stable/prometheus-operator/ci/test-values.yaml | 10 ++++++++++ .../exporters/node-exporter/servicemonitor.yaml | 4 ++++ stable/prometheus-operator/values.yaml | 10 ++++++++++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 4d173bc309..3d8e95ae36 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -9,7 +9,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 4.3.0 +version: 4.3.1 appVersion: 0.29.0 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index edfe67e0cc..5523ffc02e 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -318,6 +318,7 @@ The following tables lists the configurable parameters of the prometheus-operato | `kube-state-metrics.podSecurityPolicy.enabled` | Create pod security policy resource for kube-state-metrics. | `true` | | `nodeExporter.enabled` | Deploy the `prometheus-node-exporter` and scrape it | `true` | | `nodeExporter.jobLabel` | The name of the label on the target service to use as the job name in prometheus. See `prometheus-node-exporter.podLabels.jobLabel=node-exporter` default | `jobLabel` | +| `nodeExporter.serviceMonitor.metricRelabelings` | Metric relablings for the `prometheus-node-exporter` ServiceMonitor | `[]` | | `prometheus-node-exporter.podLabels` | Additional labels for pods in the DaemonSet | `{"jobLabel":"node-exporter"}` | | `prometheus-node-exporter.extraArgs` | Additional arguments for the node exporter container | `["--collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/)", "--collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$"]` | diff --git a/stable/prometheus-operator/ci/test-values.yaml b/stable/prometheus-operator/ci/test-values.yaml index e8acac91a2..b86866b0b4 100644 --- a/stable/prometheus-operator/ci/test-values.yaml +++ b/stable/prometheus-operator/ci/test-values.yaml @@ -531,6 +531,16 @@ nodeExporter: ## jobLabel: jobLabel + serviceMonitor: {} + ## metric relabel configs to apply to samples before ingestion. + ## + # metricRelabelings: + # - sourceLabels: [__name__] + # separator: ; + # regex: ^node_mountstats_nfs_(event|operations|transport)_.+ + # replacement: $1 + # action: drop + ## Configuration for prometheus-node-exporter subchart ## prometheus-node-exporter: diff --git a/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml index 392b7c936b..fa5e52dcf8 100644 --- a/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml @@ -15,4 +15,8 @@ spec: endpoints: - port: metrics interval: 30s +{{- if .Values.nodeExporter.serviceMonitor.metricRelabelings }} + metricRelabelings: +{{ toYaml .Values.nodeExporter.serviceMonitor.metricRelabelings | indent 4 }} +{{- end }} {{- end }} diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index 8b0a5c14da..6a9d0e2563 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -544,6 +544,16 @@ nodeExporter: ## jobLabel: jobLabel + serviceMonitor: {} + ## metric relabel configs to apply to samples before ingestion. + ## + # metricRelabelings: + # - sourceLabels: [__name__] + # separator: ; + # regex: ^node_mountstats_nfs_(event|operations|transport)_.+ + # replacement: $1 + # action: drop + ## Configuration for prometheus-node-exporter subchart ## prometheus-node-exporter: