From ee7fb97598a3f7c4f2ec221b6958069935e34c97 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Tue, 4 May 2021 13:20:28 +0200 Subject: [PATCH 1/2] jsonnet: by default select rules from all available namespaces --- jsonnet/kube-prometheus/components/prometheus.libsonnet | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index b3e919ff..eb8f7561 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -277,14 +277,15 @@ function(params) { }, externalLabels: p._config.externalLabels, serviceAccountName: 'prometheus-' + p._config.name, - serviceMonitorSelector: {}, podMonitorSelector: {}, - probeSelector: {}, - serviceMonitorNamespaceSelector: {}, podMonitorNamespaceSelector: {}, + probeSelector: {}, probeNamespaceSelector: {}, - nodeSelector: { 'kubernetes.io/os': 'linux' }, + ruleNamespaceSelector: {}, ruleSelector: p._config.ruleSelector, + serviceMonitorSelector: {}, + serviceMonitorNamespaceSelector: {}, + nodeSelector: { 'kubernetes.io/os': 'linux' }, resources: p._config.resources, alerting: { alertmanagers: [{ From 15a8351ce0a5fdd0fb3377815f91ff121ef9a774 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Wed, 5 May 2021 08:57:27 +0200 Subject: [PATCH 2/2] manifests: regenerate --- manifests/prometheus-prometheus.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index e45a86f8..b466b670 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -34,6 +34,7 @@ spec: resources: requests: memory: 400Mi + ruleNamespaceSelector: {} ruleSelector: matchLabels: prometheus: k8s