Skip to content
Snippets Groups Projects
Unverified Commit 8b73d18b authored by Paweł Krupa's avatar Paweł Krupa Committed by GitHub
Browse files

Merge pull request #2232 from paulfantom/scrape-configs 

explicitly enable ScrapeConfig support
parents b9d1ff5a ec915f7b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
jsonnet/kube-prometheus/components/prometheus.libsonnet
+ 2
− 0
View file @ 8b73d18b
...@@ -340,6 +340,8 @@ function(params) { ...@@ -340,6 +340,8 @@ function(params) {
probeNamespaceSelector: {}, probeNamespaceSelector: {},
ruleNamespaceSelector: {}, ruleNamespaceSelector: {},
ruleSelector: p._config.ruleSelector, ruleSelector: p._config.ruleSelector,
scrapeConfigSelector: {},
scrapeConfigNamespaceSelector: {},
serviceMonitorSelector: {}, serviceMonitorSelector: {},
serviceMonitorNamespaceSelector: {}, serviceMonitorNamespaceSelector: {},
nodeSelector: { 'kubernetes.io/os': 'linux' }, nodeSelector: { 'kubernetes.io/os': 'linux' },
......
manifests/prometheus-prometheus.yaml
+ 2
− 0
View file @ 8b73d18b
...@@ -38,6 +38,8 @@ spec: ...@@ -38,6 +38,8 @@ spec:
memory: 400Mi memory: 400Mi
ruleNamespaceSelector: {} ruleNamespaceSelector: {}
ruleSelector: {} ruleSelector: {}
scrapeConfigNamespaceSelector: {}
scrapeConfigSelector: {}
securityContext: securityContext:
fsGroup: 2000 fsGroup: 2000
runAsNonRoot: true runAsNonRoot: true
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment