From 348b3e312a11f145d1d1f4ca518f39990f6ed551 Mon Sep 17 00:00:00 2001 From: lou-lan Date: Mon, 4 Nov 2024 19:23:01 +0800 Subject: [PATCH] Update RDMA GrafanaDashboard Signed-off-by: lou-lan --- .../files/grafana-rdma-cluster.json | 727 +++++++++++++++++- .../spiderpool/files/grafana-rdma-node.json | 418 ++++++---- charts/spiderpool/files/grafana-rdma-pod.json | 218 ++++-- .../grafanaDashboardRdmaCluster.yaml | 3 +- .../templates/grafanaDashboardRdmaNode.yaml | 3 +- .../templates/grafanaDashboardRdmaPod.yaml | 3 +- 6 files changed, 1155 insertions(+), 217 deletions(-) diff --git a/charts/spiderpool/files/grafana-rdma-cluster.json b/charts/spiderpool/files/grafana-rdma-cluster.json index f786ea619..9ebacdc65 100644 --- a/charts/spiderpool/files/grafana-rdma-cluster.json +++ b/charts/spiderpool/files/grafana-rdma-cluster.json @@ -24,14 +24,14 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 4, + "id": 10, "links": [], "liveNow": false, "panels": [ { "datasource": { "type": "prometheus", - "uid": "husBV6iNz" + "uid": "${datasource}" }, "fieldConfig": { "defaults": { @@ -56,11 +56,76 @@ "overrides": [] }, "gridPos": { - "h": 3, - "w": 24, + "h": 4, + "w": 12, "x": 0, "y": 0 }, + "id": 9, + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "9.3.14", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "count(count(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\"}) by (node_name))", + "legendFormat": "__auto", + "range": true, + "refId": "A" + } + ], + "title": "Number of RDMA-Capable Nodes", + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 12, + "x": 12, + "y": 0 + }, "id": 2, "options": { "colorMode": "value", @@ -81,7 +146,7 @@ { "datasource": { "type": "prometheus", - "uid": "husBV6iNz" + "uid": "${datasource}" }, "editorMode": "code", "expr": "count(count(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\"}) by (pod_name))", @@ -110,7 +175,7 @@ "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 20, "gradientMode": "none", "hideFrom": { "legend": false, @@ -119,7 +184,7 @@ }, "lineInterpolation": "linear", "lineWidth": 1, - "pointSize": 5, + "pointSize": 3, "scaleDistribution": { "type": "linear" }, @@ -140,22 +205,49 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] }, "unit": "bytes" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "10-20-1-60" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "purple", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "10-20-1-50" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, "w": 12, "x": 0, - "y": 3 + "y": 4 }, "id": 7, "options": { @@ -177,13 +269,13 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum by (node_name) (rate(rdma_rx_vport_rdma_unicast_bytes_total{}[5m]))", + "expr": "sum by (node_name) (\n rate(rdma_rx_vport_rdma_unicast_bytes_total[5m]) +\n rate(rdma_rx_vport_rdma_multicast_bytes_total[5m])\n)", "legendFormat": "__auto", "range": true, "refId": "A" } ], - "title": "Bandwidth | Read", + "title": "Node Bandwidth | Read", "type": "timeseries" }, { @@ -203,7 +295,7 @@ "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -212,7 +304,7 @@ }, "lineInterpolation": "linear", "lineWidth": 1, - "pointSize": 5, + "pointSize": 3, "scaleDistribution": { "type": "linear" }, @@ -242,13 +334,44 @@ }, "unit": "bytes" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "10-20-1-50" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "10-20-1-60" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "purple", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 3 + "y": 4 }, "id": 8, "options": { @@ -270,13 +393,13 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum by (node_name) (rate(rdma_tx_vport_rdma_unicast_bytes_total{}[5m]))", + "expr": "sum by (node_name) (\n rate(rdma_tx_vport_rdma_unicast_bytes_total[5m]) +\n rate(rdma_tx_vport_rdma_multicast_bytes_total[5m])\n)", "legendFormat": "__auto", "range": true, "refId": "A" } ], - "title": "Bandwidth | Write", + "title": "Node Bandwidth | Write", "type": "timeseries" }, { @@ -296,7 +419,7 @@ "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -331,13 +454,44 @@ }, "unit": "percent" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "10-20-1-50" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "10-20-1-60" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "purple", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, "w": 12, "x": 0, - "y": 11 + "y": 12 }, "id": 4, "options": { @@ -359,13 +513,13 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum by (node_name) (\n rate(rdma_rx_vport_rdma_unicast_bytes_total{}[3m])\n)\n/ sum by (node_name) (rdma_vport_speed_mbps_total{is_root=\"true\"} * 1000000 / 8) * 100", + "expr": "sum by (node_name) (\n rate(rdma_rx_vport_rdma_unicast_bytes_total{}[3m]) + rate(rdma_rx_vport_rdma_multicast_bytes_total[3m])\n)\n/ sum by (node_name) (rdma_vport_speed_mbps_total{is_root=\"true\"} * 1000000 / 8) * 100", "legendFormat": "__auto", "range": true, "refId": "A" } ], - "title": "Bandwidth rate | Write", + "title": "Rate of Bandwidth | Node | Read", "type": "timeseries" }, { @@ -385,7 +539,7 @@ "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -420,13 +574,44 @@ }, "unit": "percent" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "10-20-1-50" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "10-20-1-60" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "purple", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 11 + "y": 12 }, "id": 5, "options": { @@ -448,16 +633,496 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum by (node_name) (\n rate(rdma_rx_vport_rdma_unicast_bytes_total{}[3m])\n)\n/ sum by (node_name) (rdma_vport_speed_mbps_total{is_root=\"true\"} * 1000000 / 8) * 100", + "expr": "sum by (node_name) (\n rate(rdma_tx_vport_rdma_unicast_bytes_total{}[3m]) + rate(rdma_tx_vport_rdma_multicast_bytes_total[3m])\n)\n/ sum by (node_name) (rdma_vport_speed_mbps_total{is_root=\"true\"} * 1000000 / 8) * 100", "legendFormat": "__auto", "range": true, "refId": "A" } ], - "title": "Bandwidth rate | Write", + "title": "Rate of Bandwidth | Node | Write", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 3, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "10-20-1-50" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "10-20-1-60" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "purple", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 20 + }, + "id": 11, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "topk(\n 10,\n sum by (node_name) (\n rate(rdma_rx_vport_rdma_unicast_bytes_total[5m]) +\n rate(rdma_rx_vport_rdma_multicast_bytes_total[5m])\n )\n)", + "legendFormat": "{{node_name}}", + "range": true, + "refId": "A" + } + ], + "title": "Node Top 10 | Bandwidth | Read", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 3, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "10-20-1-50" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "10-20-1-60" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "purple", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 20 + }, + "id": 12, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "topk(\n 10,\n sum by (node_name) (\n rate(rdma_tx_vport_rdma_unicast_bytes_total[5m]) +\n rate(rdma_tx_vport_rdma_multicast_bytes_total[5m])\n )\n)", + "legendFormat": "{{node_name}}", + "range": true, + "refId": "A" + } + ], + "title": "Node Top 10 | Bandwidth | Write", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 3, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "rdma-test-gpu-tool-jgt9t" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#73BF69", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "rdma-test-gpu-tool-n792j" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#ffc0cb", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 28 + }, + "id": 13, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "topk(\n 10,\n sum by (pod_name) (\n (\n rate(rdma_rx_vport_rdma_unicast_bytes_total{pod_name!=\"\"}[5m]) +\n rate(rdma_rx_vport_rdma_multicast_bytes_total{pod_name!=\"\"}[5m])\n )\n )\n)", + "legendFormat": "{{node_name}}", + "range": true, + "refId": "A" + } + ], + "title": "Pod Top 10 | Bandwidth | Read", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 3, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "rdma-test-gpu-tool-n792j" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#ffc0cb", + "mode": "fixed" + } + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 28 + }, + "id": 14, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "topk(\n 10,\n sum by (pod_name) (\n (\n rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\"}[5m]) +\n rate(rdma_tx_vport_rdma_multicast_bytes_total{pod_name!=\"\"}[5m])\n )\n )\n)", + "legendFormat": "{{node_name}}", + "range": true, + "refId": "A" + } + ], + "title": "Pod Top 10 | Bandwidth | Write", "type": "timeseries" } ], + "refresh": "", "schemaVersion": 37, "style": "dark", "tags": [], diff --git a/charts/spiderpool/files/grafana-rdma-node.json b/charts/spiderpool/files/grafana-rdma-node.json index aeda6315a..7e85a50b1 100644 --- a/charts/spiderpool/files/grafana-rdma-node.json +++ b/charts/spiderpool/files/grafana-rdma-node.json @@ -24,7 +24,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 5, + "id": 7, "links": [], "liveNow": false, "panels": [ @@ -38,7 +38,7 @@ }, "id": 11, "panels": [], - "title": "Summary", + "title": "Physical Network Card", "type": "row" }, { @@ -58,24 +58,27 @@ "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 17, "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, + "lineInterpolation": "smooth", + "lineStyle": { + "fill": "solid" + }, + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", - "mode": "none" + "mode": "normal" }, "thresholdsStyle": { "mode": "off" @@ -93,7 +96,23 @@ }, "unit": "bytes" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "ibp8s0" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, @@ -121,13 +140,13 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum by (rdma_parent_name) (rate(rdma_rx_vport_rdma_unicast_bytes_total{node_name=~\"$node\"}[1m]))", + "expr": "sum by (rdma_parent_name) (\n rate(rdma_rx_vport_rdma_unicast_bytes_total{node_name=~\"$node\"}[1m]) +\n rate(rdma_rx_vport_rdma_multicast_bytes_total{node_name=~\"$node\"}[1m])\n)", "legendFormat": "{{net_dev_name}}", "range": true, "refId": "A" } ], - "title": "Node bandwidth | Read", + "title": "Bandwidth | Read", "type": "timeseries" }, { @@ -147,24 +166,27 @@ "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 17, "gradientMode": "none", "hideFrom": { "legend": false, "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineWidth": 1, + "lineInterpolation": "smooth", + "lineStyle": { + "fill": "solid" + }, + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", - "mode": "none" + "mode": "normal" }, "thresholdsStyle": { "mode": "off" @@ -182,7 +204,23 @@ }, "unit": "bytes" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "ibp8s0" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, @@ -190,7 +228,7 @@ "x": 12, "y": 1 }, - "id": 21, + "id": 30, "options": { "legend": { "calcs": [], @@ -210,13 +248,13 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum by (rdma_parent_name) (rate(rdma_tx_vport_rdma_unicast_bytes_total{node_name=~\"$node\"}[1m]))", + "expr": "sum by (rdma_parent_name) (\n rate(rdma_tx_vport_rdma_unicast_bytes_total{node_name=~\"$node\"}[1m]) +\n rate(rdma_rx_vport_rdma_multicast_bytes_total{node_name=~\"$node\"}[1m])\n)", "legendFormat": "{{net_dev_name}}", "range": true, "refId": "A" } ], - "title": "Node bandwidth | Write", + "title": "Bandwidth | Write", "type": "timeseries" }, { @@ -244,7 +282,7 @@ "viz": false }, "lineInterpolation": "linear", - "lineWidth": 1, + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" @@ -260,6 +298,8 @@ } }, "mappings": [], + "max": 100, + "min": 0, "thresholds": { "mode": "absolute", "steps": [ @@ -305,7 +345,7 @@ "refId": "A" } ], - "title": "Bandwidth rate | Read", + "title": "Rate of Bandwidth | Read", "type": "timeseries" }, { @@ -313,6 +353,7 @@ "type": "prometheus", "uid": "${datasource}" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -333,7 +374,7 @@ "viz": false }, "lineInterpolation": "linear", - "lineWidth": 1, + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" @@ -349,6 +390,8 @@ } }, "mappings": [], + "max": 100, + "min": 0, "thresholds": { "mode": "absolute", "steps": [ @@ -394,7 +437,7 @@ "refId": "A" } ], - "title": "Bandwidth rate | Write", + "title": "Rate of Bandwidth | Write", "type": "timeseries" }, { @@ -435,7 +478,7 @@ "viz": false }, "lineInterpolation": "linear", - "lineWidth": 1, + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" @@ -464,25 +507,31 @@ }, "overrides": [ { - "__systemRef": "hideSeriesFrom", "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "ibp13s0" - ], - "prefix": "All except:", - "readOnly": true + "id": "byName", + "options": "ibp8s0v0" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "dark-green", + "mode": "fixed" + } } + ] + }, + { + "matcher": { + "id": "byName", + "options": "ibp8s0" }, "properties": [ { - "id": "custom.hideFrom", + "id": "color", "value": { - "legend": false, - "tooltip": false, - "viz": true + "fixedColor": "dark-blue", + "mode": "fixed" } } ] @@ -515,13 +564,13 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name=\"\", node_name=~\"$node\"}[$__rate_interval])", + "expr": "rate(rdma_rx_vport_rdma_unicast_bytes_total{pod_name=\"\", node_name=~\"$node\"}[$__rate_interval]) +\nrate(rdma_rx_vport_rdma_multicast_bytes_total{pod_name=\"\", node_name=~\"$node\"}[$__rate_interval])", "legendFormat": "{{net_dev_name}}", "range": true, "refId": "A" } ], - "title": "Host RDMA Devices | Write", + "title": "Host | Read", "type": "timeseries" }, { @@ -549,7 +598,7 @@ "viz": false }, "lineInterpolation": "linear", - "lineWidth": 1, + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" @@ -576,32 +625,7 @@ }, "unit": "binBps" }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "ibp13s0" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, @@ -629,13 +653,13 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name=\"\", node_name=~\"$node\"}[$__rate_interval])", + "expr": "rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name=\"\", node_name=~\"$node\"}[$__rate_interval]) +\nrate(rdma_rx_vport_rdma_multicast_bytes_total{pod_name=\"\", node_name=~\"$node\"}[$__rate_interval])", "legendFormat": "{{net_dev_name}}", "range": true, "refId": "A" } ], - "title": "Host RDMA Devices | Write", + "title": "Host | Write", "type": "timeseries" }, { @@ -676,7 +700,7 @@ "viz": false }, "lineInterpolation": "linear", - "lineWidth": 1, + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" @@ -696,39 +720,13 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, "unit": "binBps" }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "ibp13s0" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 8, @@ -762,7 +760,7 @@ "refId": "A" } ], - "title": "Pod RDMA Devices | Read", + "title": "Pod Bandwidth | Read", "type": "timeseries" }, { @@ -790,7 +788,7 @@ "viz": false }, "lineInterpolation": "linear", - "lineWidth": 1, + "lineWidth": 2, "pointSize": 5, "scaleDistribution": { "type": "linear" @@ -810,52 +808,210 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, "unit": "binBps" }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "ibp13s0" - ], - "prefix": "All except:", - "readOnly": true + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 27 + }, + "id": 29, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\", node_name=~\"$node\"}[$__rate_interval]) +\nrate(rdma_rx_vport_rdma_multicast_bytes_total{pod_name!=\"\", node_name=~\"$node\"}[$__rate_interval])", + "legendFormat": "{{ifname}}", + "range": true, + "refId": "A" + } + ], + "title": "Pod Bandwidth Write", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + }, + { + "color": "red", + "value": 80 } + ] + }, + "unit": "bytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 35 + }, + "id": 32, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "right", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "topk(\n 10,\n sum by (pod_name, pod_namespace) (\n rate(rdma_rx_vport_rdma_unicast_bytes_total{pod_name!=\"\", node_name=~\"$node\"}[$__rate_interval]) +\n rate(rdma_rx_vport_rdma_multicast_bytes_total{pod_name!=\"\", node_name=~\"$node\"}[$__rate_interval])\n )\n)", + "legendFormat": "{{pod_namespace}}/{{pod_name}}", + "range": true, + "refId": "A" + } + ], + "title": "Pod Top 10 | Bandwidth | Read", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false }, - "properties": [ + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } + "color": "green" + }, + { + "color": "red", + "value": 80 } ] - } - ] + }, + "unit": "bytes" + }, + "overrides": [] }, "gridPos": { "h": 8, "w": 12, "x": 12, - "y": 27 + "y": 35 }, - "id": 29, + "id": 33, "options": { "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom", + "placement": "right", "showLegend": true }, "tooltip": { @@ -870,17 +1026,17 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\", node_name=~\"$node\"}[$__rate_interval])", - "legendFormat": "{{ifname}}", + "expr": "topk(\n 10, \n sum by (pod_name, pod_namespace) (\n rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\", node_name=~\"$node\"}[$__rate_interval]) +\n rate(rdma_rx_vport_rdma_multicast_bytes_total{pod_name!=\"\", node_name=~\"$node\"}[$__rate_interval])\n )\n)", + "legendFormat": "{{pod_namespace}}/{{pod_name}}", "range": true, "refId": "A" } ], - "title": "Host RDMA Devices | Write", + "title": "Pod Top 10 | Bandwidth | Write", "type": "timeseries" } ], - "refresh": "5s", + "refresh": false, "schemaVersion": 37, "style": "dark", "tags": [], @@ -938,8 +1094,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Spiderpool RDMA Dashboard | Node", + "title": "spiderpool RDMA Dashboard | Node", "uid": "A0T4f2ZNz", - "version": 2, + "version": 20, "weekStart": "" } \ No newline at end of file diff --git a/charts/spiderpool/files/grafana-rdma-pod.json b/charts/spiderpool/files/grafana-rdma-pod.json index d7ba00e22..6a1cb5e6e 100644 --- a/charts/spiderpool/files/grafana-rdma-pod.json +++ b/charts/spiderpool/files/grafana-rdma-pod.json @@ -24,7 +24,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 1, + "id": 6, "links": [], "liveNow": false, "panels": [ @@ -60,7 +60,7 @@ "axisSoftMin": 0, "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -95,7 +95,38 @@ }, "unit": "binBps" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "net3 - mlx5_19" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "net2 - mlx5_16" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, @@ -125,7 +156,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "rate(rdma_rx_vport_rdma_unicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval])", + "expr": "rate(rdma_rx_vport_rdma_unicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval]) + rate(rdma_rx_vport_rdma_multicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval]) ", "format": "time_series", "instant": false, "interval": "", @@ -134,7 +165,7 @@ "refId": "A" } ], - "title": "Throughput | Read", + "title": "Bandwidth | Read", "type": "timeseries" }, { @@ -156,7 +187,7 @@ "axisSoftMin": 0, "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -191,7 +222,38 @@ }, "unit": "binBps" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "net3 - mlx5_19" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "net2 - mlx5_16" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, @@ -221,7 +283,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval])", + "expr": "rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval]) + rate(rdma_tx_vport_rdma_multicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval]) ", "format": "time_series", "instant": false, "interval": "", @@ -230,7 +292,7 @@ "refId": "A" } ], - "title": "Throughput | Write", + "title": "Bandwidth | Write", "type": "timeseries" }, { @@ -252,7 +314,7 @@ "axisSoftMin": 0, "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -287,7 +349,38 @@ }, "unit": "percent" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "net3 - mlx5_19" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "net2 - mlx5_16" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, @@ -317,7 +410,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "rate(rdma_rx_vport_rdma_unicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval])/(rdma_vport_speed_mbps_total{pod_name!=\"\"}*1000000/8)", + "expr": "(rate(rdma_rx_vport_rdma_unicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval]) +\n rate(rdma_rx_vport_rdma_multicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval])\n)\n/\n(rdma_vport_speed_mbps_total{pod_name!=\"\"} * 1000000 / 8)", "format": "time_series", "instant": false, "interval": "", @@ -326,7 +419,7 @@ "refId": "A" } ], - "title": "Bandwidth rate | Read", + "title": "Rate of Bandwidth | Read", "type": "timeseries" }, { @@ -348,7 +441,7 @@ "axisSoftMin": 0, "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -383,7 +476,38 @@ }, "unit": "percent" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "net2 - mlx5_16" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "net3 - mlx5_19" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", + "mode": "fixed" + } + } + ] + } + ] }, "gridPos": { "h": 8, @@ -413,7 +537,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval])/(rdma_vport_speed_mbps_total{pod_name!=\"\"}*1000000/8)", + "expr": "(rate(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval]) +\n rate(rdma_tx_vport_rdma_multicast_bytes_total{pod_name!=\"\", pod_namespace=~\"$namespace\", pod_name=~\"$pod\"}[$__rate_interval])\n)\n/\n(rdma_vport_speed_mbps_total{pod_name!=\"\"} * 1000000 / 8)", "format": "time_series", "instant": false, "interval": "", @@ -422,7 +546,7 @@ "refId": "A" } ], - "title": "Bandwidth rate | Write", + "title": "Rate of Bandwidth | Write", "type": "timeseries" }, { @@ -985,7 +1109,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "irate(rdma_tx_vport_rdma_multicast_packets_total{pod_namespace!=\"\"}[1m])", + "expr": "irate(rdma_tx_vport_rdma_multicast_packets_total{pod_namespace!=\"\", pod_name=~\"$pod\"}[1m])", "format": "time_series", "instant": false, "interval": "", @@ -1081,7 +1205,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "rate(rdma_tx_vport_rdma_multicast_bytes_total{pod_name!=\"\"}[1m]) * 8 / 1000000", + "expr": "rate(rdma_tx_vport_rdma_multicast_bytes_total{pod_name!=\"\", pod_name=~\"$pod\"}[1m]) * 8 / 1000000", "format": "time_series", "instant": false, "interval": "", @@ -1191,7 +1315,7 @@ { "datasource": { "type": "prometheus", - "uid": "husBV6iNz" + "uid": "${datasource}" }, "description": "", "fieldConfig": { @@ -1235,8 +1359,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] } @@ -1266,7 +1389,7 @@ { "datasource": { "type": "prometheus", - "uid": "husBV6iNz" + "uid": "${datasource}" }, "editorMode": "code", "exemplar": false, @@ -1285,7 +1408,7 @@ { "datasource": { "type": "prometheus", - "uid": "husBV6iNz" + "uid": "${datasource}" }, "description": "", "fieldConfig": { @@ -1329,8 +1452,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] } @@ -1360,11 +1482,11 @@ { "datasource": { "type": "prometheus", - "uid": "husBV6iNz" + "uid": "${datasource}" }, "editorMode": "code", "exemplar": false, - "expr": "irate(rdma_duplicate_request_total{pod_namespace!=\"\"}[1m])", + "expr": "irate(rdma_duplicate_request_total{pod_namespace!=\"\", pod_name=~\"$pod\"}[1m])", "format": "time_series", "instant": false, "interval": "", @@ -1423,8 +1545,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] } @@ -1517,8 +1638,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] } @@ -1924,7 +2044,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "rdma_duplicate_request_total{pod_namespace!=\"\"}", + "expr": "rate(rdma_duplicate_request_total{pod_namespace!=\"\",pod_name=~\"$pod\"}[$__rate_interval])", "format": "time_series", "instant": false, "interval": "", @@ -3944,25 +4064,24 @@ { "current": { "selected": false, - "text": "rdma-test-gpu-tool-8zrh6", - "value": "rdma-test-gpu-tool-8zrh6" + "text": "10-20-1-50", + "value": "10-20-1-50" }, "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(rdma_tx_vport_rdma_unicast_bytes_total{pod_namespace=~\"$namespace\"}, pod_name)", + "definition": "label_values(rdma_tx_vport_rdma_unicast_bytes_total{}, node_name)", "hide": 0, - "includeAll": false, - "label": "pod", + "includeAll": true, "multi": false, - "name": "pod", + "name": "node", "options": [], "query": { - "query": "label_values(rdma_tx_vport_rdma_unicast_bytes_total{pod_namespace=~\"$namespace\"}, pod_name)", + "query": "label_values(rdma_tx_vport_rdma_unicast_bytes_total{}, node_name)", "refId": "StandardVariableQuery" }, - "refresh": 2, + "refresh": 1, "regex": "", "skipUrlSync": false, "sort": 1, @@ -3971,24 +4090,25 @@ { "current": { "selected": false, - "text": "10-20-1-50", - "value": "10-20-1-50" + "text": "rdma-test-gpu-tool-jgt9t", + "value": "rdma-test-gpu-tool-jgt9t" }, "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(rdma_tx_vport_rdma_unicast_bytes_total{}, node_name)", + "definition": "label_values(rdma_tx_vport_rdma_unicast_bytes_total{pod_namespace=~\"$namespace\"}, pod_name)", "hide": 0, "includeAll": false, + "label": "pod", "multi": false, - "name": "node", + "name": "pod", "options": [], "query": { - "query": "label_values(rdma_tx_vport_rdma_unicast_bytes_total{}, node_name)", + "query": "label_values(rdma_tx_vport_rdma_unicast_bytes_total{pod_namespace=~\"$namespace\"}, pod_name)", "refId": "StandardVariableQuery" }, - "refresh": 1, + "refresh": 2, "regex": "", "skipUrlSync": false, "sort": 1, @@ -4002,8 +4122,8 @@ }, "timepicker": {}, "timezone": "", - "title": "Spiderpool RDMA Dashboard | Pod", + "title": "Spiderpool RDMA Dashboard | Sriov - Pod", "uid": "DenUibiNk", - "version": 158, + "version": 13, "weekStart": "" } \ No newline at end of file diff --git a/charts/spiderpool/templates/grafanaDashboardRdmaCluster.yaml b/charts/spiderpool/templates/grafanaDashboardRdmaCluster.yaml index f07c839bd..f01125de0 100644 --- a/charts/spiderpool/templates/grafanaDashboardRdmaCluster.yaml +++ b/charts/spiderpool/templates/grafanaDashboardRdmaCluster.yaml @@ -21,6 +21,5 @@ metadata: {{- end }} {{- end }} spec: - json: |- - {{ .Files.Get "files/grafana-rdma-cluster.json" | toJson | indent 4 }} + json: {{ .Files.Get "files/grafana-rdma-cluster.json" | toJson }} {{- end }} \ No newline at end of file diff --git a/charts/spiderpool/templates/grafanaDashboardRdmaNode.yaml b/charts/spiderpool/templates/grafanaDashboardRdmaNode.yaml index 85ae18ec3..5870b9738 100644 --- a/charts/spiderpool/templates/grafanaDashboardRdmaNode.yaml +++ b/charts/spiderpool/templates/grafanaDashboardRdmaNode.yaml @@ -21,6 +21,5 @@ metadata: {{- end }} {{- end }} spec: - json: |- - {{ .Files.Get "files/grafana-rdma-node.json" | toJson | indent 4 }} + json: {{ .Files.Get "files/grafana-rdma-node.json" | toJson }} {{- end }} diff --git a/charts/spiderpool/templates/grafanaDashboardRdmaPod.yaml b/charts/spiderpool/templates/grafanaDashboardRdmaPod.yaml index 5efceaa69..7ef3afccb 100644 --- a/charts/spiderpool/templates/grafanaDashboardRdmaPod.yaml +++ b/charts/spiderpool/templates/grafanaDashboardRdmaPod.yaml @@ -21,6 +21,5 @@ metadata: {{- end }} {{- end }} spec: - json: |- - {{ .Files.Get "files/grafana-rdma-pod.json" | toJson | indent 4 }} + json: {{ .Files.Get "files/grafana-rdma-pod.json" | toJson }} {{- end }}