Merge pull request #1409 from brancz/unnecessary-ns-sel

kube-prometheus: Remove unnecessary namespace selectors

Documentation/user-guides/cluster-monitoring.md

@@ -546,9 +546,6 @@ spec:
     tlsConfig:
       insecureSkipVerify: true
   jobLabel: k8s-app
-  namespaceSelector:
-    matchNames:
-    - monitoring
   selector:
     matchLabels:
       k8s-app: kube-state-metrics
@@ -572,9 +569,6 @@ spec:
     tlsConfig:
       insecureSkipVerify: true
   jobLabel: k8s-app
-  namespaceSelector:
-    matchNames:
-    - monitoring
   selector:
     matchLabels:
       k8s-app: node-exporter

contrib/kube-prometheus/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet

@@ -61,11 +61,6 @@ local alertmanagerConfig = "\nglobal:\n  resolve_timeout: 5m\nroute:\n  group_by
               alertmanager: $._config.alertmanager.name,
             },
           },
-          namespaceSelector: {
-            matchNames: [
-              'monitoring',
-            ],
-          },
           endpoints: [
             {
               port: 'web',

contrib/kube-prometheus/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet

@@ -254,11 +254,6 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
               'k8s-app': 'kube-state-metrics',
             },
           },
-          namespaceSelector: {
-            matchNames: [
-              'monitoring',
-            ],
-          },
           endpoints: [
             {
               port: 'https-main',

contrib/kube-prometheus/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet

@@ -134,11 +134,6 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
               'k8s-app': 'node-exporter',
             },
           },
-          namespaceSelector: {
-            matchNames: [
-              'monitoring',
-            ],
-          },
           endpoints: [
             {
               port: 'https',

contrib/kube-prometheus/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet

@@ -149,5 +149,29 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
       service.mixin.metadata.withLabels({ 'k8s-app': 'prometheus-operator' }) +
       service.mixin.metadata.withNamespace($._config.namespace) +
       service.mixin.spec.withClusterIp('None'),
+    serviceMonitor:
+      {
+        apiVersion: 'monitoring.coreos.com/v1',
+        kind: 'ServiceMonitor',
+        metadata: {
+          name: 'prometheus-operator',
+          namespace: $._config.namespace,
+          labels: {
+            'k8s-app': 'prometheus-operator',
+          },
+        },
+        spec: {
+          endpoints: [
+            {
+              port: 'http',
+            },
+          ],
+          selector: {
+            matchLabels: {
+              'k8s-app': 'prometheus-operator',
+            },
+          },
+        },
+      },
   },
 }

contrib/kube-prometheus/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet

@@ -222,7 +222,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
           },
         },
       },
-    serviceMonitorPrometheus:
+    serviceMonitor:
       {
         apiVersion: 'monitoring.coreos.com/v1',
         kind: 'ServiceMonitor',
@@ -239,11 +239,6 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
               prometheus: $._config.prometheus.name,
             },
           },
-          namespaceSelector: {
-            matchNames: [
-              'monitoring',
-            ],
-          },
           endpoints: [
             {
               port: 'web',
@@ -252,30 +247,6 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
           ],
         },
       },
-    serviceMonitorPrometheusOperator:
-      {
-        apiVersion: 'monitoring.coreos.com/v1',
-        kind: 'ServiceMonitor',
-        metadata: {
-          name: 'prometheus-operator',
-          namespace: $._config.namespace,
-          labels: {
-            'k8s-app': 'prometheus-operator',
-          },
-        },
-        spec: {
-          endpoints: [
-            {
-              port: 'http',
-            },
-          ],
-          selector: {
-            matchLabels: {
-              'k8s-app': 'prometheus-operator',
-            },
-          },
-        },
-      },
     serviceMonitorKubeScheduler:
       {
         apiVersion: 'monitoring.coreos.com/v1',

contrib/kube-prometheus/manifests/alertmanager-serviceMonitor.yaml

@@ -9,9 +9,6 @@ spec:
   endpoints:
   - interval: 30s
     port: web
-  namespaceSelector:
-    matchNames:
-    - monitoring
   selector:
     matchLabels:
       alertmanager: main

contrib/kube-prometheus/manifests/kube-state-metrics-serviceMonitor.yaml

@@ -21,9 +21,6 @@ spec:
     tlsConfig:
       insecureSkipVerify: true
   jobLabel: k8s-app
-  namespaceSelector:
-    matchNames:
-    - monitoring
   selector:
     matchLabels:
       k8s-app: kube-state-metrics

contrib/kube-prometheus/manifests/node-exporter-serviceMonitor.yaml

@@ -14,9 +14,6 @@ spec:
     tlsConfig:
       insecureSkipVerify: true
   jobLabel: k8s-app
-  namespaceSelector:
-    matchNames:
-    - monitoring
   selector:
     matchLabels:
       k8s-app: node-exporter

contrib/kube-prometheus/manifests/prometheus-serviceMonitor.yaml

@@ -9,9 +9,6 @@ spec:
   endpoints:
   - interval: 30s
     port: web
-  namespaceSelector:
-    matchNames:
-    - monitoring
   selector:
     matchLabels:
       prometheus: k8s