diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index db370e1d51a0054b0c3582e243e97c61a6d59cfd..473f89d35fe3d0f5ee77d3108f3aa0ca646b1435 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 c73c16ab2b6a7c4d827c3ea723983674616bb6ed..5fe1c074c8b71919ffff70cf4f7f48f9dbcd8692 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 d232d9203775b2f3b0c35178e20c8b00619b71f0..2d012110172b070f2a2a21540aad1abb3fe1e7fd 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 0b991a07bbb0032963789ce4633d4fcac8b93ab0..11e9c0c02f09ac2ae7f553f05031324c40ab8929 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 dbb903a7fc006c0bad6bb55e7b6ef5a24d720296..09771ebebdad76c363cc3c9b92ce03a22d3fdfca 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 e4e75ccc736027f662b95a4ff190afa3f61f50f5..548af0d6dde9646f2add57c915d9fe25524971aa 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 cca52f696071938a307dc6386421fe0443a69cca..3d1073ade8737ed1773f1750dfefc54600540e18 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 529f2944f61f18a616a1a99121214e660ae3effd..273d2748e45cb8a9bf63e4e0682c1d3e02e80e7e 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 90b25476e057ae87e33a0708b8b3f01865bcabe2..b7605dbeb6e4a4253db105a0a6faee1882880767 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