Skip to content

MON-4163: Allow whitelisting KSM metrics #2625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

MON-4163: Allow whitelisting KSM metrics #2625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 4.20

- [#2595](https://github.com/openshift/cluster-monitoring-operator/pull/2595) Multi-tenant support for KSM's CRS feature-set downstream.
- [#2625](https://github.com/openshift/cluster-monitoring-operator/pull/2625) Support lookarounds in KSM's deny-list and white-list `kube_namespace_created`.

## 4.18

Expand Down
2 changes: 1 addition & 1 deletion assets/kube-state-metrics/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
- --metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*]
- |
--metric-denylist=
^kube_.+_created$,
^kube_(?=namespace).*_created$,
^kube_.+_metadata_resource_version$,
^kube_replicaset_metadata_generation$,
^kube_replicaset_status_observed_generation$,
Expand Down
19 changes: 18 additions & 1 deletion jsonnet/main.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ local alertmanager = import './components/alertmanager.libsonnet';
local alertmanagerUserWorkload = import './components/alertmanager-user-workload.libsonnet';
local dashboards = import './components/dashboards.libsonnet';
local kubeStateMetrics = import './components/kube-state-metrics.libsonnet';
local ksmLite = import 'github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/addons/ksm-lite.libsonnet';
local controlPlane = import './components/control-plane.libsonnet';
local nodeExporter = import './components/node-exporter.libsonnet';
local metricsServer = import './components/metrics-server.libsonnet';
Expand Down Expand Up @@ -432,7 +433,23 @@ local inCluster =
openshiftStateMetrics: openshiftStateMetrics($.values.openshiftStateMetrics),
} +
(import './utils/anti-affinity.libsonnet') +
(import 'github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/addons/ksm-lite.libsonnet') +
(ksmLite {
ksmConfig: {
ksmDenyList: [
'^kube_(?=namespace).*_created$',
'^kube_.+_metadata_resource_version$',
'^kube_replicaset_metadata_generation$',
'^kube_replicaset_status_observed_generation$',
'^kube_pod_restart_policy$',
'^kube_pod_init_container_status_terminated$',
'^kube_pod_init_container_status_running$',
'^kube_pod_container_status_terminated$',
'^kube_pod_container_status_running$',
'^kube_pod_completion_time$',
'^kube_pod_status_scheduled$',
],
},
}) +
(import './utils/ibm-cloud-managed-profile.libsonnet') +
(import './components/metrics-server-audit.libsonnet') +
{}; // Including empty object to simplify adding and removing imports during development
Expand Down