kube-prometheus: Remove unnecessary namespace selectors

This commit is contained in:
Frederic Branczyk
2018-05-31 17:28:37 +02:00
parent 10bbf403fe
commit b7d0da01d5
10 changed files with 25 additions and 57 deletions

View File

@@ -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',