Skip to content
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.

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

reef: mgr/dashboard: empty grafana panels for performance of daemons #52774

Merged
merged 3 commits into from Aug 4, 2023

Conversation

avanthakkar
Copy link
Contributor

@avanthakkar avanthakkar commented Aug 2, 2023

backport tracker: https://tracker.ceph.com/issues/62223


backport of #52191, #49248
parent trackers: https://tracker.ceph.com/issues/61792, #52774

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/main/src/script/ceph-backport.sh

Fixes: https://tracker.ceph.com/issues/61792
Signed-off-by: avanthakkar <avanjohn@gmail.com>

Removing the `ceph-` prefix from ceph_daemon label to adopt it with the label
format used by queries in grafana dashboards. Also changing the
`instance_id` label for rgw to match the values coming from
exporter and prometheus module

(cherry picked from commit fa2d1f9)
@avanthakkar avanthakkar requested a review from a team as a code owner August 2, 2023 20:07
@avanthakkar avanthakkar requested review from cloudbehl and Pegonzal and removed request for a team August 2, 2023 20:07
@avanthakkar avanthakkar added this to the reef milestone Aug 2, 2023
Signed-off-by: avanthakkar <avanjohn@gmail.com>
(cherry picked from commit ca56918)
@avanthakkar avanthakkar added the backport: no-conflicts Backport without conflicts label Aug 2, 2023
@avanthakkar avanthakkar requested a review from jmolmo August 2, 2023 20:10
@jmolmo
Copy link
Member

jmolmo commented Aug 3, 2023

jenkins test dashboard cephadm

@jmolmo
Copy link
Member

jmolmo commented Aug 3, 2023

jenkins test windows

@jmolmo
Copy link
Member

jmolmo commented Aug 3, 2023

jenkins test dashboard

@avanthakkar
Copy link
Contributor Author

jenkins test dashboard cephadm

Fixes: https://tracker.ceph.com/issues/58164
Signed-off-by: Avan Thakkar <athakkar@redhat.com>

Introducing module option in prometheus module to enable/disable support for exporting ceph daemons
perf counters as prometheus metrics, by default this option will be disabled. The use case for this option
is in case if ceph-exporter deployment failed for any reason then user still can have option to fetch metrics
from promethues exporter.
@avanthakkar
Copy link
Contributor Author

There's a missing backport which was failing the e2e. I included this backport in this PR itself for tracker https://tracker.ceph.com/issues/59317

@avanthakkar
Copy link
Contributor Author

jenkins test dashboard

@avanthakkar avanthakkar merged commit 577bf0b into ceph:reef Aug 4, 2023
12 of 13 checks passed
@avanthakkar avanthakkar deleted the wip-62223-reef branch August 4, 2023 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants