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

Merge pull request #1132 from paulfantom/ruleNamespaceSelector

Browse Source
This commit is contained in:
Paweł Krupa
2021-05-06 23:05:34 +02:00
committed by GitHub
parent d50b5fd2ea 15a8351ce0
commit a1210f1eff
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,14 +277,15 @@ function(params) {
}, },
externalLabels: p._config.externalLabels, externalLabels: p._config.externalLabels,
serviceAccountName: 'prometheus-' + p._config.name, serviceAccountName: 'prometheus-' + p._config.name,
serviceMonitorSelector: {},
podMonitorSelector: {}, podMonitorSelector: {},
probeSelector: {},
serviceMonitorNamespaceSelector: {},
podMonitorNamespaceSelector: {}, podMonitorNamespaceSelector: {},
probeSelector: {},
probeNamespaceSelector: {}, probeNamespaceSelector: {},
nodeSelector: { 'kubernetes.io/os': 'linux' }, ruleNamespaceSelector: {},
ruleSelector: p._config.ruleSelector, ruleSelector: p._config.ruleSelector,
serviceMonitorSelector: {},
serviceMonitorNamespaceSelector: {},
nodeSelector: { 'kubernetes.io/os': 'linux' },
resources: p._config.resources, resources: p._config.resources,
alerting: { alerting: {
alertmanagers: [{ alertmanagers: [{

1
manifests/prometheus-prometheus.yaml
View File

@@ -34,6 +34,7 @@ spec:
resources: resources:
requests: requests:
memory: 400Mi memory: 400Mi
ruleNamespaceSelector: {}
ruleSelector: ruleSelector:
matchLabels: matchLabels:
prometheus: k8s prometheus: k8s