mirror of https://git.rancher.io/charts
Change default to all CRs in all namespaces
This commit sets the following field to false: `<serviceMonitor|podMonitor|rule>SelectorNilUsesHelmValues: true` As a result, we look for all CRs with any labels in all namespaces rather than just the ones tagged with `release: rancher-monitoring`.pull/507/head
parent
f3aebdca14
commit
d2bf307e59
|
@ -34,3 +34,4 @@ All notable changes from the upstream Prometheus Operator chart will be added to
|
||||||
- `kube-scheduler` metrics exporter
|
- `kube-scheduler` metrics exporter
|
||||||
- `kube-proxy` metrics exporter
|
- `kube-proxy` metrics exporter
|
||||||
- Updated default Grafana `deploymentStrategy` to `Recreate` to prevent deployments from being stuck on upgrade if a PV is attached to Grafana
|
- Updated default Grafana `deploymentStrategy` to `Recreate` to prevent deployments from being stuck on upgrade if a PV is attached to Grafana
|
||||||
|
- Modified the default `<serviceMonitor|podMonitor|rule>SelectorNilUsesHelmValues` to default to `false`. As a result, we look for all CRs with any labels in all namespaces by default rather than just the ones tagged with the label `release: rancher-monitoring`.
|
|
@ -1544,15 +1544,6 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
|
||||||
pspEnabled: true
|
pspEnabled: true
|
||||||
pspAnnotations: {}
|
pspAnnotations: {}
|
||||||
## Specify pod annotations
|
## Specify pod annotations
|
||||||
@@ -102,7 +305,7 @@
|
|
||||||
|
|
||||||
## Deploy alertmanager
|
|
||||||
##
|
|
||||||
- enabled: true
|
|
||||||
+ enabled: false
|
|
||||||
|
|
||||||
## Api that prometheus will use to communicate with alertmanager. Possible values are v1, v2
|
|
||||||
##
|
|
||||||
@@ -409,9 +612,13 @@
|
@@ -409,9 +612,13 @@
|
||||||
## Define resources requests and limits for single Pods.
|
## Define resources requests and limits for single Pods.
|
||||||
## ref: https://kubernetes.io/docs/user-guide/compute-resources/
|
## ref: https://kubernetes.io/docs/user-guide/compute-resources/
|
||||||
|
@ -1731,6 +1722,33 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/val
|
||||||
## Define which Nodes the Pods are scheduled on.
|
## Define which Nodes the Pods are scheduled on.
|
||||||
## ref: https://kubernetes.io/docs/user-guide/node-selection/
|
## ref: https://kubernetes.io/docs/user-guide/node-selection/
|
||||||
##
|
##
|
||||||
|
@@ -1660,7 +1915,7 @@
|
||||||
|
## prometheus resource to be created with selectors based on values in the helm deployment,
|
||||||
|
## which will also match the PrometheusRule resources created
|
||||||
|
##
|
||||||
|
- ruleSelectorNilUsesHelmValues: true
|
||||||
|
+ ruleSelectorNilUsesHelmValues: false
|
||||||
|
|
||||||
|
## PrometheusRules to be selected for target discovery.
|
||||||
|
## If {}, select all ServiceMonitors
|
||||||
|
@@ -1685,7 +1940,7 @@
|
||||||
|
## prometheus resource to be created with selectors based on values in the helm deployment,
|
||||||
|
## which will also match the servicemonitors created
|
||||||
|
##
|
||||||
|
- serviceMonitorSelectorNilUsesHelmValues: true
|
||||||
|
+ serviceMonitorSelectorNilUsesHelmValues: false
|
||||||
|
|
||||||
|
## ServiceMonitors to be selected for target discovery.
|
||||||
|
## If {}, select all ServiceMonitors
|
||||||
|
@@ -1705,7 +1960,7 @@
|
||||||
|
## prometheus resource to be created with selectors based on values in the helm deployment,
|
||||||
|
## which will also match the podmonitors created
|
||||||
|
##
|
||||||
|
- podMonitorSelectorNilUsesHelmValues: true
|
||||||
|
+ podMonitorSelectorNilUsesHelmValues: false
|
||||||
|
|
||||||
|
## PodMonitors to be selected for target discovery.
|
||||||
|
## If {}, select all PodMonitors
|
||||||
@@ -1802,9 +2057,13 @@
|
@@ -1802,9 +2057,13 @@
|
||||||
|
|
||||||
## Resource limits & requests
|
## Resource limits & requests
|
||||||
|
|
Loading…
Reference in New Issue