From 4beed361dbffba50fabb5d1f94b62d0e2e175f79 Mon Sep 17 00:00:00 2001 From: Javier Palomo Date: Fri, 19 Nov 2021 15:27:45 +0100 Subject: [PATCH] prometheus-ksonnet: Allow the kube-state-metrics namespace to be configured --- prometheus-ksonnet/lib/config.libsonnet | 1 + prometheus-ksonnet/lib/kube-state-metrics.libsonnet | 2 +- prometheus-ksonnet/mixins.libsonnet | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/prometheus-ksonnet/lib/config.libsonnet b/prometheus-ksonnet/lib/config.libsonnet index e99bb51be..a20f4a8df 100644 --- a/prometheus-ksonnet/lib/config.libsonnet +++ b/prometheus-ksonnet/lib/config.libsonnet @@ -7,6 +7,7 @@ namespace: error 'must specify namespace', alertmanager_namespace: self.namespace, node_exporter_namespace: self.namespace, + kube_state_metrics_namespace: self.namespace, // Grafana config options. grafana_root_url: 'http://nginx.%(namespace)s.svc.%(cluster_dns_suffix)s/grafana' % self, diff --git a/prometheus-ksonnet/lib/kube-state-metrics.libsonnet b/prometheus-ksonnet/lib/kube-state-metrics.libsonnet index e9dd11664..f960a7c04 100644 --- a/prometheus-ksonnet/lib/kube-state-metrics.libsonnet +++ b/prometheus-ksonnet/lib/kube-state-metrics.libsonnet @@ -20,7 +20,7 @@ local kube_state_metrics = import 'kube-state-metrics/main.libsonnet'; prometheus_config+:: { scrape_configs+: [ - kube_state_metrics.scrape_config($._config.namespace), + kube_state_metrics.scrape_config($._config.kube_state_metrics_namespace), ], }, } diff --git a/prometheus-ksonnet/mixins.libsonnet b/prometheus-ksonnet/mixins.libsonnet index e8ef10eb0..2a36836aa 100644 --- a/prometheus-ksonnet/mixins.libsonnet +++ b/prometheus-ksonnet/mixins.libsonnet @@ -32,7 +32,7 @@ _config+:: { cadvisorSelector: 'job="kube-system/cadvisor"', kubeletSelector: 'job="kube-system/kubelet"', - kubeStateMetricsSelector: 'job="%s/kube-state-metrics"' % $._config.namespace, + kubeStateMetricsSelector: 'job="%s/kube-state-metrics"' % $._config.kube_state_metrics_namespace, nodeExporterSelector: 'job="%s/node-exporter"' % $._config.node_exporter_namespace, // Also used by node-mixin. notKubeDnsSelector: 'job!="kube-system/kube-dns"', kubeSchedulerSelector: 'job="kube-system/kube-scheduler"',