Skip to content

Commit 12cd7fd

Browse files
author
Dimitrije Manic
committed
Prometheus ruleSelector defaults to all rules
1 parent 6a150f4 commit 12cd7fd

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

jsonnet/kube-prometheus/components/prometheus.libsonnet

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,9 @@ local defaults = {
2424
for labelName in std.objectFields(defaults.commonLabels)
2525
if !std.setMember(labelName, ['app.kubernetes.io/version'])
2626
} + { prometheus: defaults.name },
27-
ruleSelector: {
28-
matchLabels: defaults.mixin.ruleLabels,
29-
},
27+
ruleSelector: {},
3028
mixin: {
31-
ruleLabels: {
32-
role: 'alert-rules',
33-
prometheus: defaults.name,
34-
},
29+
ruleLabels: {},
3530
_config: {
3631
prometheusSelector: 'job="prometheus-' + defaults.name + '",namespace="' + defaults.namespace + '"',
3732
prometheusName: '{{$labels.namespace}}/{{$labels.pod}}',

manifests/prometheus-prometheus.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ spec:
3636
requests:
3737
memory: 400Mi
3838
ruleNamespaceSelector: {}
39-
ruleSelector:
40-
matchLabels:
41-
prometheus: k8s
42-
role: alert-rules
39+
ruleSelector: {}
4340
securityContext:
4441
fsGroup: 2000
4542
runAsNonRoot: true

0 commit comments

Comments
 (0)