From b7d0da01d5c79040cf4b550e4828992310a1a366 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Thu, 31 May 2018 17:28:37 +0200
Subject: [PATCH] kube-prometheus: Remove unnecessary namespace selectors
---
.../alertmanager/alertmanager.libsonnet | 5 ---
.../kube-state-metrics.libsonnet | 5 ---
.../node-exporter/node-exporter.libsonnet | 5 ---
.../prometheus-operator.libsonnet | 24 ++++++++++++++
.../prometheus/prometheus.libsonnet | 31 +------------------
... 0prometheus-operator-serviceMonitor.yaml} | 0
manifests/alertmanager-serviceMonitor.yaml | 3 --
.../kube-state-metrics-serviceMonitor.yaml | 3 --
manifests/node-exporter-serviceMonitor.yaml | 3 --
...us.yaml => prometheus-serviceMonitor.yaml} | 3 --
10 files changed, 25 insertions(+), 57 deletions(-)
rename manifests/{prometheus-serviceMonitorPrometheusOperator.yaml => 0prometheus-operator-serviceMonitor.yaml} (100%)
rename manifests/{prometheus-serviceMonitorPrometheus.yaml => prometheus-serviceMonitor.yaml} (82%)
diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
index db370e1d..473f89d3 100644
--- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
+++ b/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',
diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
index c73c16ab..5fe1c074 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/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',
diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
index d232d920..2d012110 100644
--- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
+++ b/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',
diff --git a/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet b/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet
index 0b991a07..11e9c0c0 100644
--- a/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet
+++ b/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',
+ },
+ },
+ },
+ },
},
}
diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
index dbb903a7..09771ebe 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/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',
diff --git a/manifests/prometheus-serviceMonitorPrometheusOperator.yaml b/manifests/0prometheus-operator-serviceMonitor.yaml
similarity index 100%
rename from manifests/prometheus-serviceMonitorPrometheusOperator.yaml
rename to manifests/0prometheus-operator-serviceMonitor.yaml
diff --git a/manifests/alertmanager-serviceMonitor.yaml b/manifests/alertmanager-serviceMonitor.yaml
index e4e75ccc..548af0d6 100644
--- a/manifests/alertmanager-serviceMonitor.yaml
+++ b/manifests/alertmanager-serviceMonitor.yaml
@@ -9,9 +9,6 @@ spec:
endpoints:
- interval: 30s
port: web
- namespaceSelector:
- matchNames:
- - monitoring
selector:
matchLabels:
alertmanager: main
diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml
index cca52f69..3d1073ad 100644
--- a/manifests/kube-state-metrics-serviceMonitor.yaml
+++ b/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
diff --git a/manifests/node-exporter-serviceMonitor.yaml b/manifests/node-exporter-serviceMonitor.yaml
index 529f2944..273d2748 100644
--- a/manifests/node-exporter-serviceMonitor.yaml
+++ b/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
diff --git a/manifests/prometheus-serviceMonitorPrometheus.yaml b/manifests/prometheus-serviceMonitor.yaml
similarity index 82%
rename from manifests/prometheus-serviceMonitorPrometheus.yaml
rename to manifests/prometheus-serviceMonitor.yaml
index 90b25476..b7605dbe 100644
--- a/manifests/prometheus-serviceMonitorPrometheus.yaml
+++ b/manifests/prometheus-serviceMonitor.yaml
@@ -9,9 +9,6 @@ spec:
endpoints:
- interval: 30s
port: web
- namespaceSelector:
- matchNames:
- - monitoring
selector:
matchLabels:
prometheus: k8s
--
GitLab