From 0f76dc63b6c7fb6c4828bfb08f44e82c28404f77 Mon Sep 17 00:00:00 2001 From: Robert Nemeti Date: Wed, 1 Aug 2018 13:34:37 +0000 Subject: [PATCH 1/2] add serviceMonitorNamespaceSelector to the prometheus jsonnet library to implement the feature from PR #1227 --- jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index c993d7af..3d8bea3e 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -167,6 +167,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; baseImage: $._config.imageRepos.prometheus, serviceAccountName: 'prometheus-' + $._config.prometheus.name, serviceMonitorSelector: selector.withMatchExpressions({ key: 'k8s-app', operator: 'Exists' }), + serviceMonitorNamespaceSelector: selector.withMatchExpressions({ key: 'prometheus', operator: 'In', values: ['yes', 'true'] }), nodeSelector: { 'beta.kubernetes.io/os': 'linux' }, ruleSelector: selector.withMatchLabels({ role: 'alert-rules', From 43dc7999cac2fdecd7f76b9e5dd51dd8f89cc8c7 Mon Sep 17 00:00:00 2001 From: Robert Nemeti Date: Mon, 6 Aug 2018 08:19:28 +0000 Subject: [PATCH 2/2] provide empty hash to serviceMonitorNamespaceSelector, which selects all the namespaces by default --- jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 3d8bea3e..a696d0b6 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -167,7 +167,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; baseImage: $._config.imageRepos.prometheus, serviceAccountName: 'prometheus-' + $._config.prometheus.name, serviceMonitorSelector: selector.withMatchExpressions({ key: 'k8s-app', operator: 'Exists' }), - serviceMonitorNamespaceSelector: selector.withMatchExpressions({ key: 'prometheus', operator: 'In', values: ['yes', 'true'] }), + serviceMonitorNamespaceSelector: selector.withMatchExpressions({}), nodeSelector: { 'beta.kubernetes.io/os': 'linux' }, ruleSelector: selector.withMatchLabels({ role: 'alert-rules',