]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
cephadm: change shared_folder directory for prometheus and grafana
authorNizamudeen A <nia@redhat.com>
Mon, 7 Feb 2022 10:53:29 +0000 (16:23 +0530)
committerErnesto Puerta <epuertat@redhat.com>
Wed, 9 Feb 2022 19:48:52 +0000 (20:48 +0100)
commit27c29946f32ecf1cb136fe6e08055501b92b8efb
treef3259cb8c4bce486efb56b45180a77e52eec2d44
parentce27e363241735442d726e27d902d755dfb2e3c8
cephadm: change shared_folder directory for prometheus and grafana

After https://github.com/ceph/ceph/pull/44059 the monitoring/prometheus
and monitoring/grafana/dashboards directories are changed to
monitoring/ceph-mixins. That broke the shared_folders in the cephadm
bootstrap script.

Changed all the instances of monitoring/prometheus and
monitoring/grafana/dashboards to monitoring/ceph-mixins

Also, renaming all the instances of prometheus_alerts.yaml to
prometheus_alerts.yml.

Fixes: https://tracker.ceph.com/issues/54176
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 27592b75618706194e668c40056d9bfc58c5a3c6)
12 files changed:
ceph.spec.in
debian/rules
doc/mgr/dashboard.rst
monitoring/ceph-mixin/README.md
monitoring/ceph-mixin/alerts.libsonnet
monitoring/ceph-mixin/prometheus_alerts.yaml [deleted file]
monitoring/ceph-mixin/prometheus_alerts.yml [new file with mode: 0644]
monitoring/ceph-mixin/tests_alerts/settings.py
monitoring/ceph-mixin/tests_alerts/test_alerts.yml
monitoring/ceph-mixin/tox.ini
src/cephadm/cephadm
src/pybind/mgr/dashboard/ci/check_grafana_dashboards.py