From: Zack Cerza Date: Mon, 27 Aug 2018 22:43:37 +0000 (-0700) Subject: dashboards: Don't filter out 10GbE iface names X-Git-Tag: v2.0^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f41645a633ddd4d9565451a9ba35f1f7f0ab043f;p=cephmetrics.git dashboards: Don't filter out 10GbE iface names https://github.com/ceph/cephmetrics/issues/205 Signed-off-by: Zack Cerza --- diff --git a/dashboards/mgr-prometheus/alert-status.json b/dashboards/mgr-prometheus/alert-status.json index 1069b43..27f2da8 100644 --- 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 2f0474e..80ad721 100644 --- 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 f2bd608..08fb20a 100644 --- 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 d45c15e..72e9c2a 100644 --- 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 7349f9f..ce7da19 100644 --- 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 2dc231b..3081374 100644 --- 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",