]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Cleanup of variables, queries and tests to enable showMultiCluster=True 55495/head
authorChristian Rohmann <christian.rohmann@inovex.de>
Fri, 26 Jan 2024 14:05:52 +0000 (15:05 +0100)
committerChristian Rohmann <christian.rohmann@inovex.de>
Mon, 22 Apr 2024 06:29:37 +0000 (08:29 +0200)
commit090b8e17f1e84d8b20e05143d5dd7ff107031176
tree536efbaef025fb6e9ec099437f3f44ca601ff939
parentd5c8530042f7705c6e8ec83a32e0ea1be9cbad40
Cleanup of variables, queries and tests to enable showMultiCluster=True

Rendering the dashboards with showMultiCluster=True allows for
them to work with multiple clusters storing their metrics in a single
Prometheus instance. This works via the cluster label and that functionality
already existed. This just fixes some inconsistencies in applying the label
filters.

Additionally this contains updates to the tests to have them succeed with
with both configurations and avoid the introduction of regressions in
regards to multiCluster in the future.

There also are some consistency cleanups here and there:
 * `datasource` was not used consistently
 * `cluster` label_values are determined from `ceph_health_status`
 * `job` template and filters on this label were removed to align multi cluster
    support solely via the `cluster` label
 * `ceph_hosts` filter now uses label_values from any ceph_metadata metrici
    to now show all instance values, but those of hosts with some Ceph
    component / daemon.
 *  Enable showMultiCluster=True since `cluster` label is now always present,
    via https://github.com/ceph/ceph/pull/54964

Improves: https://tracker.ceph.com/issues/64321
Signed-off-by: Christian Rohmann <christian.rohmann@inovex.de>
38 files changed:
monitoring/ceph-mixin/config.libsonnet
monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet
monitoring/ceph-mixin/dashboards/cephfs.libsonnet
monitoring/ceph-mixin/dashboards/host.libsonnet
monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet
monitoring/ceph-mixin/dashboards/osd.libsonnet
monitoring/ceph-mixin/dashboards/pool.libsonnet
monitoring/ceph-mixin/dashboards/rbd.libsonnet
monitoring/ceph-mixin/dashboards/rgw-s3-analytics.libsonnet
monitoring/ceph-mixin/dashboards/rgw.libsonnet
monitoring/ceph-mixin/dashboards/utils.libsonnet
monitoring/ceph-mixin/dashboards_out/.lint [deleted file]
monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
monitoring/ceph-mixin/dashboards_out/cephfs-overview.json
monitoring/ceph-mixin/dashboards_out/host-details.json
monitoring/ceph-mixin/dashboards_out/hosts-overview.json
monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
monitoring/ceph-mixin/dashboards_out/osd-device-details.json
monitoring/ceph-mixin/dashboards_out/osds-overview.json
monitoring/ceph-mixin/dashboards_out/pool-detail.json
monitoring/ceph-mixin/dashboards_out/pool-overview.json
monitoring/ceph-mixin/dashboards_out/radosgw-detail.json
monitoring/ceph-mixin/dashboards_out/radosgw-overview.json
monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
monitoring/ceph-mixin/dashboards_out/rbd-details.json
monitoring/ceph-mixin/dashboards_out/rbd-overview.json
monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json
monitoring/ceph-mixin/tests_dashboards/__init__.py
monitoring/ceph-mixin/tests_dashboards/features/ceph-cluster.feature
monitoring/ceph-mixin/tests_dashboards/features/environment.py
monitoring/ceph-mixin/tests_dashboards/features/host-details.feature
monitoring/ceph-mixin/tests_dashboards/features/hosts_overview.feature
monitoring/ceph-mixin/tests_dashboards/features/osd-device-details.feature
monitoring/ceph-mixin/tests_dashboards/features/osds-overview.feature
monitoring/ceph-mixin/tests_dashboards/features/radosgw-detail.feature
monitoring/ceph-mixin/tests_dashboards/features/radosgw_overview.feature
monitoring/ceph-mixin/tests_dashboards/features/self.feature
monitoring/ceph-mixin/tests_dashboards/util.py