]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard: monitoring: refactor into ceph-mixin
authorArthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Tue, 23 Nov 2021 08:30:38 +0000 (09:30 +0100)
committerErnesto Puerta <epuertat@redhat.com>
Wed, 9 Feb 2022 19:48:51 +0000 (20:48 +0100)
commit57653c8ef02aedc063e753cbbd526ce1be820f1b
tree700106d3010a1ef9372cc7a51c1ca7109f676cff
parent9b4f43fde530a4a2ef3940bf6f44e4e504ace13d
mgr/dashboard: monitoring: refactor into ceph-mixin

Mixin is a way to bundle dashboards, prometheus rules and alerts into
jsonnet package. Shifting to mixin will allow easier integration with
monitoring automation that some users may use.

This commit moves `/monitoring/grafana/dashboards` and
`/monitoring/prometheus` to `/monitoring/ceph-mixin`. Prometheus alerts
was also converted to Jsonnet using an automated way (from yaml to json
to jsonnet). This commit minimises any change made to the generated files
and should not change neithers the dashboards nor the Prometheus alerts.

In the future some configuration will also be added to jsonnet to add
more functionalities to the dashboards or alerts (i.e.: multi cluster).

Fixes: https://tracker.ceph.com/issues/53374
Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
(cherry picked from commit 98236e3a1d2855c95d86640645c2984efa83791f)
119 files changed:
CMakeLists.txt
ceph.spec.in
debian/rules
monitoring/CMakeLists.txt [deleted file]
monitoring/ceph-mixin/.gitignore [new file with mode: 0644]
monitoring/ceph-mixin/.pylintrc [new symlink]
monitoring/ceph-mixin/CMakeLists.txt [new file with mode: 0644]
monitoring/ceph-mixin/Makefile [new file with mode: 0644]
monitoring/ceph-mixin/README.md [new file with mode: 0644]
monitoring/ceph-mixin/alerts.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/config.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards.jsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards/cephfs.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards/dashboards.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards/host.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards/osd.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards/pool.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards/rbd.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards/rgw.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards/utils.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/ceph-cluster.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/cephfs-overview.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/host-details.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/hosts-overview.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/osd-device-details.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/osds-overview.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/pool-detail.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/pool-overview.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/radosgw-detail.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/radosgw-overview.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/rbd-details.json [new file with mode: 0644]
monitoring/ceph-mixin/dashboards_out/rbd-overview.json [new file with mode: 0644]
monitoring/ceph-mixin/jsonnetfile.json [new file with mode: 0644]
monitoring/ceph-mixin/jsonnetfile.lock.json [new file with mode: 0644]
monitoring/ceph-mixin/lint-jsonnet.sh [new file with mode: 0755]
monitoring/ceph-mixin/mixin.libsonnet [new file with mode: 0644]
monitoring/ceph-mixin/prometheus_alerts.yaml [new file with mode: 0644]
monitoring/ceph-mixin/requirements-alerts.txt [new file with mode: 0644]
monitoring/ceph-mixin/requirements-grafonnet.txt [new file with mode: 0644]
monitoring/ceph-mixin/requirements-lint.txt [new file with mode: 0644]
monitoring/ceph-mixin/test-jsonnet.sh [new file with mode: 0755]
monitoring/ceph-mixin/tests_alerts/README.md [new file with mode: 0644]
monitoring/ceph-mixin/tests_alerts/__init__.py [new file with mode: 0644]
monitoring/ceph-mixin/tests_alerts/settings.py [new file with mode: 0644]
monitoring/ceph-mixin/tests_alerts/test_alerts.yml [new file with mode: 0644]
monitoring/ceph-mixin/tests_alerts/test_syntax.py [new file with mode: 0755]
monitoring/ceph-mixin/tests_alerts/test_unittests.py [new file with mode: 0644]
monitoring/ceph-mixin/tests_alerts/utils.py [new file with mode: 0644]
monitoring/ceph-mixin/tests_alerts/validate_rules.py [new file with mode: 0755]
monitoring/ceph-mixin/tests_dashboards/__init__.py [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/__init__.py [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/ceph-cluster.feature [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/environment.py [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/host-details.feature [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/hosts_overview.feature [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/osd-device-details.feature [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/osds-overview.feature [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/radosgw-detail.feature [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/radosgw_overview.feature [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/self.feature [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/features/steps/__init__.py [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/requirements.txt [new file with mode: 0644]
monitoring/ceph-mixin/tests_dashboards/util.py [new file with mode: 0644]
monitoring/ceph-mixin/tox.ini [new file with mode: 0644]
monitoring/grafana/README.md [deleted file]
monitoring/grafana/build/Makefile
monitoring/grafana/dashboards/.pylintrc [deleted symlink]
monitoring/grafana/dashboards/CMakeLists.txt [deleted file]
monitoring/grafana/dashboards/README [deleted file]
monitoring/grafana/dashboards/ceph-cluster.json [deleted file]
monitoring/grafana/dashboards/cephfs-overview.json [deleted file]
monitoring/grafana/dashboards/host-details.json [deleted file]
monitoring/grafana/dashboards/hosts-overview.json [deleted file]
monitoring/grafana/dashboards/jsonnet/grafana_dashboards.jsonnet [deleted file]
monitoring/grafana/dashboards/osd-device-details.json [deleted file]
monitoring/grafana/dashboards/osds-overview.json [deleted file]
monitoring/grafana/dashboards/pool-detail.json [deleted file]
monitoring/grafana/dashboards/pool-overview.json [deleted file]
monitoring/grafana/dashboards/radosgw-detail.json [deleted file]
monitoring/grafana/dashboards/radosgw-overview.json [deleted file]
monitoring/grafana/dashboards/radosgw-sync-overview.json [deleted file]
monitoring/grafana/dashboards/rbd-details.json [deleted file]
monitoring/grafana/dashboards/rbd-overview.json [deleted file]
monitoring/grafana/dashboards/requirements-grafonnet.txt [deleted file]
monitoring/grafana/dashboards/requirements-lint.txt [deleted file]
monitoring/grafana/dashboards/test-jsonnet.sh [deleted file]
monitoring/grafana/dashboards/tests/__init__.py [deleted file]
monitoring/grafana/dashboards/tests/features/__init__.py [deleted file]
monitoring/grafana/dashboards/tests/features/ceph-cluster.feature [deleted file]
monitoring/grafana/dashboards/tests/features/environment.py [deleted file]
monitoring/grafana/dashboards/tests/features/host-details.feature [deleted file]
monitoring/grafana/dashboards/tests/features/hosts_overview.feature [deleted file]
monitoring/grafana/dashboards/tests/features/osd-device-details.feature [deleted file]
monitoring/grafana/dashboards/tests/features/osds-overview.feature [deleted file]
monitoring/grafana/dashboards/tests/features/radosgw-detail.feature [deleted file]
monitoring/grafana/dashboards/tests/features/radosgw_overview.feature [deleted file]
monitoring/grafana/dashboards/tests/features/self.feature [deleted file]
monitoring/grafana/dashboards/tests/features/steps/__init__.py [deleted file]
monitoring/grafana/dashboards/tests/requirements.txt [deleted file]
monitoring/grafana/dashboards/tests/util.py [deleted file]
monitoring/grafana/dashboards/tox.ini [deleted file]
monitoring/prometheus/CMakeLists.txt [deleted file]
monitoring/prometheus/README.md [deleted file]
monitoring/prometheus/alerts/ceph_default_alerts.yml [deleted file]
monitoring/prometheus/tests/CMakeLists.txt [deleted file]
monitoring/prometheus/tests/README.md [deleted file]
monitoring/prometheus/tests/__init__.py [deleted file]
monitoring/prometheus/tests/requirements.txt [deleted file]
monitoring/prometheus/tests/settings.py [deleted file]
monitoring/prometheus/tests/test_alerts.yml [deleted file]
monitoring/prometheus/tests/test_syntax.py [deleted file]
monitoring/prometheus/tests/test_unittests.py [deleted file]
monitoring/prometheus/tests/tox.ini [deleted file]
monitoring/prometheus/tests/utils.py [deleted file]
monitoring/prometheus/tests/validate_rules.py [deleted file]
src/pybind/mgr/dashboard/grafana.py
src/pybind/mgr/dashboard/tox.ini
src/test/CMakeLists.txt