dashboards: Don't filter out 10GbE iface names

https://github.com/ceph/cephmetrics/issues/205

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/dashboards/mgr-prometheus/alert-status.json b/dashboards/mgr-prometheus/alert-status.json
index 1069b4371b6f30a9f943d8cb37868adb44351d90..27f2da8380f0e573d1fa860ec1d45c0e41f8a128 100644 (file)
--- a/dashboards/mgr-prometheus/alert-status.json
+++ b/dashboards/mgr-prometheus/alert-status.json
@@ -1098,7 +1098,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum by (instance, device) (\n  irate(node_network_receive_drop{device=~\"(eth|en|bond|ib|mlx).*\"}[5m]) +\n  irate(node_network_receive_errs{device=~\"(eth|en|bond|ib|mlx).*\"}[5m]) +\n  irate(node_network_transmit_drop{device=~\"(eth|en|bond|ib|mlx).*\"}[5m]) +\n  irate(node_network_transmit_errs{device=~\"(eth|en|bond|ib|mlx).*\"}[5m])\n) > 0",
+          "expr": "sum by (instance, device) (\n  irate(node_network_receive_drop{device=~\"(eth|en|bond|ib|mlx|p).*\"}[5m]) +\n  irate(node_network_receive_errs{device=~\"(eth|en|bond|ib|mlx|p).*\"}[5m]) +\n  irate(node_network_transmit_drop{device=~\"(eth|en|bond|ib|mlx|p).*\"}[5m]) +\n  irate(node_network_transmit_errs{device=~\"(eth|en|bond|ib|mlx|p).*\"}[5m])\n) > 0",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{instance}} / {{device}}",

diff --git a/dashboards/mgr-prometheus/ceph-backend-storage.json b/dashboards/mgr-prometheus/ceph-backend-storage.json
index 2f0474e5352453754d3dfd155649224728ad5b99..80ad7210cf3941699d5b726bd074a83a904015a1 100644 (file)
--- a/dashboards/mgr-prometheus/ceph-backend-storage.json
+++ b/dashboards/mgr-prometheus/ceph-backend-storage.json
@@ -1090,7 +1090,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "sum (irate(node_network_receive_bytes{instance=~\"($osd_servers)\", device=~\"(eth|en|bond|ib|mlx).*\"}[5m])) + \nsum (irate(node_network_transmit_bytes{instance=~\"($osd_servers)\", device=~\"(eth|en|bond|ib|mlx).*\"}[5m]))",
+              "expr": "sum (irate(node_network_receive_bytes{instance=~\"($osd_servers)\", device=~\"(eth|en|bond|ib|mlx|p).*\"}[5m])) + \nsum (irate(node_network_transmit_bytes{instance=~\"($osd_servers)\", device=~\"(eth|en|bond|ib|mlx|p).*\"}[5m]))",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 2,

diff --git a/dashboards/mgr-prometheus/iscsi-client-details.json b/dashboards/mgr-prometheus/iscsi-client-details.json
index f2bd608d3815a12fd32a093c55cb32b0713610aa..08fb20a8255249829fc8789e0e22496365a459ef 100644 (file)
--- a/dashboards/mgr-prometheus/iscsi-client-details.json
+++ b/dashboards/mgr-prometheus/iscsi-client-details.json
@@ -391,8 +391,8 @@
       {
         "allValue": null,
         "current": {
-          "text": "(eth|bon|en|ib|mlx)",
-          "value": "(eth|bon|en|ib|mlx)"
+          "text": "(eth|bon|en|ib|mlx|p)",
+          "value": "(eth|bon|en|ib|mlx|p)"
         },
         "hide": 2,
         "includeAll": false,
@@ -402,11 +402,11 @@
         "options": [
           {
             "selected": true,
-            "text": "(eth|bon|en|ib|mlx)",
-            "value": "(eth|bon|en|ib|mlx)"
+            "text": "(eth|bon|en|ib|mlx|p)",
+            "value": "(eth|bon|en|ib|mlx|p)"
           }
         ],
-        "query": "(eth|bon|en|ib|mlx)",
+        "query": "(eth|bon|en|ib|mlx|p)",
         "type": "custom"
       }
     ]

diff --git a/dashboards/mgr-prometheus/iscsi-overview.json b/dashboards/mgr-prometheus/iscsi-overview.json
index d45c15e2babc6917ad6a81737160177e7281ff71..72e9c2af5a0fef37ba558749f36cbba6b7744e5c 100644 (file)
--- a/dashboards/mgr-prometheus/iscsi-overview.json
+++ b/dashboards/mgr-prometheus/iscsi-overview.json
@@ -1478,8 +1478,8 @@
       {
         "allValue": null,
         "current": {
-          "text": "(eth|bon|en|ib|mlx)",
-          "value": "(eth|bon|en|ib|mlx)"
+          "text": "(eth|bon|en|ib|mlx|p)",
+          "value": "(eth|bon|en|ib|mlx|p)"
         },
         "hide": 2,
         "includeAll": false,
@@ -1489,11 +1489,11 @@
         "options": [
           {
             "selected": true,
-            "text": "(eth|bon|en|ib|mlx)",
-            "value": "(eth|bon|en|ib|mlx)"
+            "text": "(eth|bon|en|ib|mlx|p)",
+            "value": "(eth|bon|en|ib|mlx|p)"
           }
         ],
-        "query": "(eth|bon|en|ib|mlx)",
+        "query": "(eth|bon|en|ib|mlx|p)",
         "type": "custom"
       },
       {

diff --git a/dashboards/mgr-prometheus/network-usage-by-node.json b/dashboards/mgr-prometheus/network-usage-by-node.json
index 7349f9f208bd85c6fb6b082b214e101bbaa87549..ce7da19d329d2db08c0323b0d86ff9ec2f74afef 100644 (file)
--- a/dashboards/mgr-prometheus/network-usage-by-node.json
+++ b/dashboards/mgr-prometheus/network-usage-by-node.json
@@ -400,8 +400,8 @@
       {
         "allValue": null,
         "current": {
-          "text": "(eth|en|bond|mlx|ib)",
-          "value": "(eth|en|bond|mlx|ib)"
+          "text": "(eth|en|bond|mlx|ib|p)",
+          "value": "(eth|en|bond|mlx|ib|p)"
         },
         "hide": 2,
         "includeAll": false,
@@ -411,11 +411,11 @@
         "options": [
           {
             "selected": true,
-            "text": "(eth|en|bond|mlx|ib)",
-            "value": "(eth|en|bond|mlx|ib)"
+            "text": "(eth|en|bond|mlx|ib|p)",
+            "value": "(eth|en|bond|mlx|ib|p)"
           }
         ],
-        "query": "(eth|en|bond|mlx|ib)",
+        "query": "(eth|en|bond|mlx|ib|p)",
         "type": "custom"
       }
     ]

diff --git a/dashboards/mgr-prometheus/osd-node-detail.json b/dashboards/mgr-prometheus/osd-node-detail.json
index 2dc231b98befe4d81811d236d66cc428a922a260..30813744af34aa09edbcaa882bd2c0916ec90dd3 100644 (file)
--- a/dashboards/mgr-prometheus/osd-node-detail.json
+++ b/dashboards/mgr-prometheus/osd-node-detail.json
@@ -989,7 +989,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum by (device) (irate(node_network_receive_bytes{instance=~\"($osd_servers).*\", device=~\"(eth|en|bond|ib|mlx).*\"}[5m]))",
+          "expr": "sum by (device) (irate(node_network_receive_bytes{instance=~\"($osd_servers).*\", device=~\"(eth|en|bond|ib|mlx|p).*\"}[5m]))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{device}}.rx",
@@ -998,7 +998,7 @@
           "textEditor": true
         },
         {
-          "expr": "sum by (device) (irate(node_network_transmit_bytes{instance=~\"($osd_servers).*\", device=~\"(eth|en|bond|ib|mlx).*\"}[5m]))",
+          "expr": "sum by (device) (irate(node_network_transmit_bytes{instance=~\"($osd_servers).*\", device=~\"(eth|en|bond|ib|mlx|p).*\"}[5m]))",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{device}}.tx",