From bd10cd745165d8928bc19fb4ab1f6623a369332f Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 22 Jun 2018 12:55:21 -0600 Subject: [PATCH] network-usage-by-node: Fix mon_server queries The variable queries needed to drop 'mon.' from the mon names, and the panel queries needed '[[mon_servers]]' to be wrapped in parentheses. Signed-off-by: Zack Cerza --- dashboards/mgr-prometheus/network-usage-by-node.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dashboards/mgr-prometheus/network-usage-by-node.json b/dashboards/mgr-prometheus/network-usage-by-node.json index 2249cdf..124f5b9 100644 --- a/dashboards/mgr-prometheus/network-usage-by-node.json +++ b/dashboards/mgr-prometheus/network-usage-by-node.json @@ -90,7 +90,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum (irate(node_network_receive_bytes{instance=~\"[[mon_servers]].*\",device=~\"[[interfaces]].*\"}[30s])) + \nsum (irate(node_network_transmit_bytes{instance=~\"[[mon_servers]].*\",device=~\"[[interfaces]].*\"}[30s]))", + "expr": "sum (irate(node_network_receive_bytes{instance=~\"([[mon_servers]]).*\",device=~\"[[interfaces]].*\"}[30s])) + \nsum (irate(node_network_transmit_bytes{instance=~\"([[mon_servers]]).*\",device=~\"[[interfaces]].*\"}[30s]))", "format": "time_series", "intervalFactor": 2, "legendFormat": "MONs", @@ -187,7 +187,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum (irate(node_network_receive_bytes{instance=~\"[[mon_servers]].*\", device=~\"[[interfaces]].*\"}[30s])) by (instance) + \nsum (irate(node_network_transmit_bytes{instance=~\"[[mon_servers]].*\", device=~\"[[interfaces]].*\"}[30s])) by (instance)", + "expr": "sum (irate(node_network_receive_bytes{instance=~\"([[mon_servers]]).*\", device=~\"[[interfaces]].*\"}[30s])) by (instance) + \nsum (irate(node_network_transmit_bytes{instance=~\"([[mon_servers]]).*\", device=~\"[[interfaces]].*\"}[30s])) by (instance)", "format": "time_series", "intervalFactor": 1, "legendFormat": "{{instance}}", @@ -389,7 +389,7 @@ "options": [], "query": "label_values(ceph_mon_quorum_status, ceph_daemon)", "refresh": 1, - "regex": "", + "regex": "/mon.(.*)/", "sort": 1, "tagValuesQuery": "", "tags": [], -- 2.47.3