From f372d82a52854da069f0ba95765f8081f6f96a84 Mon Sep 17 00:00:00 2001 From: Navid Sassan Date: Fri, 27 Sep 2024 14:35:08 +0200 Subject: [PATCH] improve grafana regex and query for repeating panels --- check-plugins/disk-io/grafana/disk-io.yml | 4 ++-- check-plugins/network-io/grafana/network-io.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/check-plugins/disk-io/grafana/disk-io.yml b/check-plugins/disk-io/grafana/disk-io.yml index db7c19fe..38915a90 100644 --- a/check-plugins/disk-io/grafana/disk-io.yml +++ b/check-plugins/disk-io/grafana/disk-io.yml @@ -39,9 +39,9 @@ spec: label: Metric multi: true name: metric - query: SHOW TAG VALUES FROM "cmd-check-disk-io" WITH KEY = "metric" + query: SHOW TAG VALUES FROM "cmd-check-disk-io" WITH KEY = "metric" WHERE hostname =~ /$hostname/ refresh: 2 - regex: /^(.*)_.*_.*_.*_.*$/ + regex: /^([^_]+)/ sort: 1 type: query diff --git a/check-plugins/network-io/grafana/network-io.yml b/check-plugins/network-io/grafana/network-io.yml index f1110d80..ff546b96 100644 --- a/check-plugins/network-io/grafana/network-io.yml +++ b/check-plugins/network-io/grafana/network-io.yml @@ -41,7 +41,7 @@ spec: name: metric query: SHOW TAG VALUES FROM "cmd-check-network-io" WITH KEY = "metric" WHERE hostname =~ /$hostname/ refresh: 2 - regex: /^(.*)_.*_.*_.*_.*$/ + regex: /^([^_]+)/ sort: 1 type: query