diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cf701b1b1..c400f011bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - `KubePdbNotEnoughHealthyPods` - `KubeNodePressure` - `KubeNodeEviction` +- [#2677](https://github.com/openshift/cluster-monitoring-operator/pull/2677) Fix KSM deny-list typo that put `^kube_.+_annotations$^kube_customresource_.+_annotations_info$,` in the deny-list instead of seperate entries, like so, `^kube_.+_annotations$,^kube_customresource_.+_annotations_info$,`, due to the omission of a comma. ## 4.18 diff --git a/assets/kube-state-metrics/deployment.yaml b/assets/kube-state-metrics/deployment.yaml index b18f0f31b3..9682608d81 100644 --- a/assets/kube-state-metrics/deployment.yaml +++ b/assets/kube-state-metrics/deployment.yaml @@ -40,9 +40,9 @@ spec: - | --metric-denylist= ^kube_secret_labels$, - ^kube_.+_annotations$ + ^kube_.+_annotations$, ^kube_customresource_.+_annotations_info$, - ^kube_customresource_.+_labels_info$, + ^kube_customresource_.+_labels_info$ - --metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*] - | --metric-denylist= diff --git a/jsonnet/components/kube-state-metrics.libsonnet b/jsonnet/components/kube-state-metrics.libsonnet index 0e825e1fee..01a4159078 100644 --- a/jsonnet/components/kube-state-metrics.libsonnet +++ b/jsonnet/components/kube-state-metrics.libsonnet @@ -241,9 +241,9 @@ function(params) ||| --metric-denylist= ^kube_secret_labels$, - ^kube_.+_annotations$ + ^kube_.+_annotations$, ^kube_customresource_.+_annotations_info$, - ^kube_customresource_.+_labels_info$, + ^kube_customresource_.+_labels_info$ |||, '--metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*]', ],