]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #44885 from BenoitKnecht/wip-54118-pacific
authorErnesto Puerta <37327689+epuertat@users.noreply.github.com>
Tue, 22 Mar 2022 18:53:19 +0000 (19:53 +0100)
committerGitHub <noreply@github.com>
Tue, 22 Mar 2022 18:53:19 +0000 (19:53 +0100)
pacific: mgr: Fix ceph_daemon label in ceph_rgw_* metrics

Reviewed-by: BenoitKnecht <NOT@FOUND>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
1  2 
monitoring/grafana/dashboards/hosts-overview.json
monitoring/grafana/dashboards/jsonnet/grafana_dashboards.jsonnet
src/mgr/ActivePyModules.cc
src/pybind/mgr/mgr_module.py
src/pybind/mgr/prometheus/module.py

Simple merge
Simple merge
Simple merge