easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prometheus ruleSelector defaults to all rules

Browse Source
This commit is contained in:
Dimitrije Manic
2021-08-11 10:05:00 -04:00
parent 6a150f4cc8
commit 12cd7fd9ce
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsonnet/kube-prometheus/components/prometheus.libsonnet
View File

@@ -24,14 +24,9 @@ local defaults = {
for labelName in std.objectFields(defaults.commonLabels) for labelName in std.objectFields(defaults.commonLabels)
if !std.setMember(labelName, ['app.kubernetes.io/version']) if !std.setMember(labelName, ['app.kubernetes.io/version'])
} + { prometheus: defaults.name }, } + { prometheus: defaults.name },
ruleSelector: { ruleSelector: {},
matchLabels: defaults.mixin.ruleLabels,
},
mixin: { mixin: {
ruleLabels: { ruleLabels: {},
role: 'alert-rules',
prometheus: defaults.name,
},
_config: { _config: {
prometheusSelector: 'job="prometheus-' + defaults.name + '",namespace="' + defaults.namespace + '"', prometheusSelector: 'job="prometheus-' + defaults.name + '",namespace="' + defaults.namespace + '"',
prometheusName: '{{$labels.namespace}}/{{$labels.pod}}', prometheusName: '{{$labels.namespace}}/{{$labels.pod}}',

5
manifests/prometheus-prometheus.yaml
View File

@@ -36,10 +36,7 @@ spec:
requests: requests:
memory: 400Mi memory: 400Mi
ruleNamespaceSelector: {} ruleNamespaceSelector: {}
ruleSelector: ruleSelector: {}
matchLabels:
prometheus: k8s
role: alert-rules
securityContext: securityContext:
fsGroup: 2000 fsGroup: 2000
runAsNonRoot: true runAsNonRoot: true