]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
cephadm: change shared_folder directory for prometheus and grafana 44920/head
authorNizamudeen A <nia@redhat.com>
Mon, 7 Feb 2022 10:53:29 +0000 (16:23 +0530)
committerNizamudeen A <nia@redhat.com>
Mon, 7 Feb 2022 11:04:37 +0000 (16:34 +0530)
commit27592b75618706194e668c40056d9bfc58c5a3c6
treeece0fffa914253ba97f096cefdc3f34dc37b9505
parent32faa6b2f5a88d8ffad08ec6286abdb2d0dddeec
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>
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