Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings
/cephPublic

monitoring: make cluster matcher backward compatible for pre-reef metrics#66661

Merged
aaSharma14 merged 1 commit intoceph:mainfrom
rhcs-dashboard:prometheus-cluster-label-fix
Jan 20, 2026
Merged

monitoring: make cluster matcher backward compatible for pre-reef metrics#66661
aaSharma14 merged 1 commit intoceph:mainfrom
rhcs-dashboard:prometheus-cluster-label-fix

Conversation

@aaSharma14
Copy link
Contributor

@aaSharma14aaSharma14 commentedDec 17, 2025
edited
Loading

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

Fixes:https://tracker.ceph.com/issues/74342

Contribution Guidelines

  • To sign and title your commits, please refer toSubmitting Patches to Ceph.

  • If you are submitting a fix for a stable branch (e.g. "quincy"), please refer toSubmitting Patches to Ceph - Backports for the proper workflow.

  • When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding anx between the brackets:[x]. Spaces and capitalization matter when checking off items this way.

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • AffectsDashboard, opened tracker ticket
    • AffectsOrchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands

You must only issue one Jenkins command per-comment. Jenkins does not understand
comments with more than one command.

Copy link
Contributor

@cloudbehlcloudbehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

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.

I'm not sure why do they lack the cluster label as the cluster metric and the cluster label should be part of upgrade. Once back can you explain, what exactly happens and why?

@afreen23
Copy link
Contributor

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.

I'm not sure why do they lack the cluster label as the cluster metric and the cluster label should be part of upgrade. Once back can you explain, what exactly happens and why?

Prometheus creates new time series on addition of a new label, so the old ones no longer match the query and appears to be missing.
This PR is fixing a valid bug, and should be escalated as the cu upgrading will not see there past data after upgrade.

@aaSharma14aaSharma14force-pushed theprometheus-cluster-label-fix branch 2 times, most recently from5fbbf99 to164559aCompareJanuary 5, 2026 09:01
Copy link
Contributor

@cloudbehlcloudbehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I have not tested it, but the changes look good to me!

@aaSharma14
Copy link
ContributorAuthor

jenkins test windows

@aaSharma14
Copy link
ContributorAuthor

jenkins test make check

@cloudbehl
Copy link
Contributor

  1. The Grafana which doesn't have jsonnet doesn't have the change.
  2. We need to double check on variables, if the have OR applied on them, I saw them missing on few.

Ceph 18.* adds a `cluster` label to all Prometheus metrics. Whenupgrading from earlier releases, historical metrics lack this labeland are excluded by Grafana queries that strictly match on `cluster`.Update the shared Grafana matcher logic to use a regex matcher thatalso matches series without the `cluster` label, restoring visibilityof pre-upgrade metrics while preserving multi-cluster behavior.Fixes:https://tracker.ceph.com/issues/74342Signed-off-by: Aashish Sharma <aasharma@redhat.com>
Copy link
Contributor

@cloudbehlcloudbehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

LGTM.

@aaSharma14aaSharma14 merged commitaf3099e intoceph:mainJan 20, 2026
13 of 15 checks passed
@aaSharma14aaSharma14 deleted the prometheus-cluster-label-fix branchJanuary 20, 2026 07:28
@github-project-automationgithub-project-automationbot moved this fromReviewer approved toDone inCeph-DashboardJan 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@cloudbehlcloudbehlcloudbehl approved these changes

@abhidesai6abhidesai6Awaiting requested review from abhidesai6abhidesai6 is a code owner automatically assigned from ceph/dashboard

@devikab25devikab25Awaiting requested review from devikab25devikab25 is a code owner automatically assigned from ceph/dashboard

Assignees

No one assigned

Projects

Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@aaSharma14@afreen23@cloudbehl

[8]ページ先頭

©2009-2026 Movatter.jp