From: Zack Cerza <zack@redhat.com>
Date: Fri, 22 Jun 2018 18:55:21 +0000 (-0600)
Subject: network-usage-by-node: Fix mon_server queries
X-Git-Tag: v2.0~18^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd10cd745165d8928bc19fb4ab1f6623a369332f;p=cephmetrics.git

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 <zack@redhat.com>
---

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": [],