diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 2dd32b506a0b48c1aafa1fe9c828bad33e2a7cf4..f59cc80f75cd1d8a13f33636b82a956ac90e283b 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -29,6 +29,7 @@ local configMapList = k.core.v1.configMapList; kubeSchedulerSelector: 'job="kube-scheduler"', kubeControllerManagerSelector: 'job="kube-controller-manager"', kubeApiserverSelector: 'job="apiserver"', + coreDNSSelector: 'job="kube-dns"', podLabel: 'pod', alertmanagerSelector: 'job="alertmanager-main"', @@ -45,6 +46,7 @@ local configMapList = k.core.v1.configMapList; Alertmanager: $._config.alertmanagerSelector, Prometheus: $._config.prometheusSelector, PrometheusOperator: $._config.prometheusOperatorSelector, + CoreDNS: $._config.coreDNSSelector, }, prometheus+:: { diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index fafcd4d659736b76559e97cd31cee11d57483f34..f9de222ee773bbda853500b15449bac63f60d8e8 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -386,11 +386,9 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; }, }, spec: { - jobLabel: 'k8s-app', selector: { matchLabels: { - 'k8s-app': 'coredns', - component: 'metrics', + 'k8s-app': 'kube-dns', }, }, namespaceSelector: { @@ -400,7 +398,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; }, endpoints: [ { - port: 'http-metrics', + port: 'metrics', interval: '15s', bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', },