From 08352b65408f82aa1b66758e050be7fab26cbdaa Mon Sep 17 00:00:00 2001 From: Tatjana Dehler Date: Fri, 11 Nov 2022 16:30:55 +0100 Subject: [PATCH] ceph-mixing: fix ceph_hosts variable Do only use `instance` to query for hostnames in single-cluster-mode. Consider the cluster matcher only in multi-cluster-mode. In this case the query will look like: `"label_values({cluster=~\"$cluster\"}, instance)"`. Fixes: https://tracker.ceph.com/issues/57987 Signed-off-by: Tatjana Dehler --- monitoring/ceph-mixin/dashboards/host.libsonnet | 2 +- monitoring/ceph-mixin/dashboards_out/host-details.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monitoring/ceph-mixin/dashboards/host.libsonnet b/monitoring/ceph-mixin/dashboards/host.libsonnet index 3e0b31f2c4595..24c7755b1cd10 100644 --- a/monitoring/ceph-mixin/dashboards/host.libsonnet +++ b/monitoring/ceph-mixin/dashboards/host.libsonnet @@ -318,7 +318,7 @@ local g = import 'grafonnet/grafana.libsonnet'; .addTemplate( $.addTemplateSchema('ceph_hosts', '$datasource', - 'label_values({%(clusterMatcher)s}, instance)' % $.matchers(), + if $._config.showMultiCluster then ('label_values({%(clusterMatcher)s}, instance)' % $.matchers()) else 'label_values(instance)', 1, false, 3, diff --git a/monitoring/ceph-mixin/dashboards_out/host-details.json b/monitoring/ceph-mixin/dashboards_out/host-details.json index 93c51f0094107..ca97a31de2e68 100644 --- a/monitoring/ceph-mixin/dashboards_out/host-details.json +++ b/monitoring/ceph-mixin/dashboards_out/host-details.json @@ -1195,7 +1195,7 @@ "multi": false, "name": "ceph_hosts", "options": [ ], - "query": "label_values({}, instance)", + "query": "label_values(instance)", "refresh": 1, "regex": "([^.:]*).*", "sort": 3, -- 2.39.5