Merge pull request #1132 from paulfantom/ruleNamespaceSelector

2021-05-06 23:05:34 +02:00
parent d50b5fd2ea 15a8351ce0
commit a1210f1eff
2 changed files with 6 additions and 4 deletions
--- 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: [{
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -34,6 +34,7 @@ spec:
  resources:
    requests:
      memory: 400Mi
+  ruleNamespaceSelector: {}
  ruleSelector:
    matchLabels:
      prometheus: k8s