]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
monitoring: make cluster matcher backward compatible for pre-7.1 metrics
authorAashish Sharma <Aashish.Sharma1@ibm.com>
Wed, 17 Dec 2025 09:21:14 +0000 (14:51 +0530)
committerAashish Sharma <aashish@li-e9bf2ecc-2ad7-11b2-a85c-baf05c5182ab.ibm.com>
Tue, 20 Jan 2026 07:40:10 +0000 (13:10 +0530)
commit8ae4f82b58210f07986ce0ebb394b53bcd0e6679
tree9b45869f3dd43b37d5d2141073676d8779d3b50b
parent3ca3f53fede9c5742c6de979784e774f082ef939
monitoring: make cluster matcher backward compatible for pre-7.1 metrics

Ceph 18.* adds a `cluster` label to all Prometheus metrics. When
upgrading from earlier releases, historical metrics lack this label
and are excluded by Grafana queries that strictly match on `cluster`.
Update the shared Grafana matcher logic to use a regex matcher that
also matches series without the `cluster` label, restoring visibility
of pre-upgrade metrics while preserving multi-cluster behavior.

Fixes: https://tracker.ceph.com/issues/74342
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit f7f74e455423feab79b33ac8ab472be0b98cb29d)
18 files changed:
monitoring/ceph-mixin/dashboards/utils.libsonnet
monitoring/ceph-mixin/dashboards_out/ceph-application-overview.json
monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
monitoring/ceph-mixin/dashboards_out/ceph-cluster.json
monitoring/ceph-mixin/dashboards_out/cephfsdashboard.json
monitoring/ceph-mixin/dashboards_out/host-details.json
monitoring/ceph-mixin/dashboards_out/hosts-overview.json
monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
monitoring/ceph-mixin/dashboards_out/osd-device-details.json
monitoring/ceph-mixin/dashboards_out/osds-overview.json
monitoring/ceph-mixin/dashboards_out/pool-detail.json
monitoring/ceph-mixin/dashboards_out/pool-overview.json
monitoring/ceph-mixin/dashboards_out/radosgw-detail.json
monitoring/ceph-mixin/dashboards_out/radosgw-overview.json
monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
monitoring/ceph-mixin/dashboards_out/rbd-details.json
monitoring/ceph-mixin/dashboards_out/rbd-overview.json
monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json