diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index 9a6293891fc0b8a6a64219bc597683bdd372dc38..a44e5729462ddda67941c51b7c63b4b25a764aaa 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -24,14 +24,9 @@ local defaults = { for labelName in std.objectFields(defaults.commonLabels) if !std.setMember(labelName, ['app.kubernetes.io/version']) } + { prometheus: defaults.name }, - ruleSelector: { - matchLabels: defaults.mixin.ruleLabels, - }, + ruleSelector: {}, mixin: { - ruleLabels: { - role: 'alert-rules', - prometheus: defaults.name, - }, + ruleLabels: {}, _config: { prometheusSelector: 'job="prometheus-' + defaults.name + '",namespace="' + defaults.namespace + '"', prometheusName: '{{$labels.namespace}}/{{$labels.pod}}', diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 087a7aa25a9cdb88074eb89e759ba667ed63f5a4..e41383e91faa3acfcdd81bf8a8d8a6d015358b40 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -36,10 +36,7 @@ spec: requests: memory: 400Mi ruleNamespaceSelector: {} - ruleSelector: - matchLabels: - prometheus: k8s - role: alert-rules + ruleSelector: {} securityContext: fsGroup: 2000 runAsNonRoot: true