mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-10-30 23:51:01 +01:00
Code Issues Projects Releases Wiki Activity

kube-prometheus: Adapt CoreDNS default configuration to default CoreDNS installs

Browse Source
This commit is contained in:
Frederic Branczyk 2018-11-21 16:22:06 +01:00
parent 7b5f15ff84
commit d7fc1eb32b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jsonnet/kube-prometheus/kube-prometheus.libsonnet
View File

@ -29,6 +29,7 @@ local configMapList = k.core.v1.configMapList;
kubeSchedulerSelector: 'job="kube-scheduler"', kubeSchedulerSelector: 'job="kube-scheduler"',
kubeControllerManagerSelector: 'job="kube-controller-manager"', kubeControllerManagerSelector: 'job="kube-controller-manager"',
kubeApiserverSelector: 'job="apiserver"', kubeApiserverSelector: 'job="apiserver"',
coreDNSSelector: 'job="kube-dns"',
podLabel: 'pod', podLabel: 'pod',
alertmanagerSelector: 'job="alertmanager-main"', alertmanagerSelector: 'job="alertmanager-main"',
@ -45,6 +46,7 @@ local configMapList = k.core.v1.configMapList;
Alertmanager: $._config.alertmanagerSelector, Alertmanager: $._config.alertmanagerSelector,
Prometheus: $._config.prometheusSelector, Prometheus: $._config.prometheusSelector,
PrometheusOperator: $._config.prometheusOperatorSelector, PrometheusOperator: $._config.prometheusOperatorSelector,
CoreDNS: $._config.coreDNSSelector,
}, },
prometheus+:: { prometheus+:: {

6
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View File

@ -386,11 +386,9 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
}, },
}, },
spec: { spec: {
jobLabel: 'k8s-app',
selector: { selector: {
matchLabels: { matchLabels: {
'k8s-app': 'coredns', 'k8s-app': 'kube-dns',
component: 'metrics',
}, },
}, },
namespaceSelector: { namespaceSelector: {
@ -400,7 +398,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
}, },
endpoints: [ endpoints: [
{ {
port: 'http-metrics', port: 'metrics',
interval: '15s', interval: '15s',
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
}, },