diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index b3e919ff031aaaab62dc87bb0b52fb79a79e3af0..eb8f756197fd86439411571507afecc8d79d1ced 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: [{ diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index e45a86f8856d7de5f46bbc6778ea17a3ab813494..b466b67039effc1ce5992dc5bda61430e13db4f7 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