From 8889eba6ff05eddcf4c8c0cff46f39d4f8610849 Mon Sep 17 00:00:00 2001 From: linfengjun Date: Mon, 8 May 2023 16:14:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/charts/octopus/templates/grafana.yaml | 1455 +++--------------- 1 file changed, 219 insertions(+), 1236 deletions(-) diff --git a/deploy/charts/octopus/templates/grafana.yaml b/deploy/charts/octopus/templates/grafana.yaml index fb69ab24..c79e1b67 100644 --- a/deploy/charts/octopus/templates/grafana.yaml +++ b/deploy/charts/octopus/templates/grafana.yaml @@ -761,183 +761,6 @@ data: "alignLevel": null } }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fill": 1, - "gridPos": { - "h": 7, - "w": 12, - "x": 0, - "y": 30 - }, - "id": 10, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": {}, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "enflame_vgcu_usage{pod_name=\"$pod_name\"} or enflame_vgcu_usage{pod=\"$pod\"}", - "format": "time_series", - "hide": false, - "intervalFactor": 2, - "legendFormat": "VGCU utilization", - "metric": "enflame_vgcu_utilization", - "refId": "A", - "step": 2 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "VGCU utilization", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fill": 1, - "gridPos": { - "h": 7, - "w": 12, - "x": 12, - "y": 30 - }, - "id": 11, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": {}, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "enflame_vgcu_memory_usage{pod_name=\"$pod_name\"} * 100 or enflame_vgcu_memory_usage{pod=\"$pod\"} * 100", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "VGCU memory utilization", - "metric": "enflame_vgcu_mem_utilization", - "refId": "A", - "step": 2 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "VGCU memory utilization", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "label": "", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, { "aliasColors": {}, "bars": false, @@ -2910,9 +2733,9 @@ data: "h": 6, "w": 8, "x": 0, - "y": 22 + "y": 28 }, - "id": 20, + "id": 25, "legend": { "avg": false, "current": false, @@ -2937,10 +2760,10 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum((sum(enflame_vgcu_usage) / count(enflame_vgcu_usage)) or vector(0))", + "expr": "sum((sum(mlu_utilization) / count(mlu_utilization)) or vector(0))", "format": "time_series", "intervalFactor": 1, - "legendFormat": "Cluster VGCU utilization (avg)", + "legendFormat": "Cluster MLU utilization (avg)", "refId": "A" } ], @@ -2948,7 +2771,7 @@ data: "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Cluster VGCU utilization (avg)", + "title": "Cluster MLU utilization (avg)", "tooltip": { "shared": true, "sort": 0, @@ -2996,9 +2819,9 @@ data: "h": 6, "w": 8, "x": 8, - "y": 22 + "y": 28 }, - "id": 21, + "id": 26, "legend": { "avg": false, "current": false, @@ -3023,10 +2846,10 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum((sum(enflame_vgcu_memory_usage) / count(enflame_vgcu_memory_usage))*100 or vector(0))", + "expr": "sum((sum(mlu_memory_utilization) / count(mlu_memory_utilization)) or vector(0))", "format": "time_series", "intervalFactor": 1, - "legendFormat": "Cluster VGCU memory utilization(avg)", + "legendFormat": "Cluster MLU memory utilization(avg)", "refId": "A" } ], @@ -3034,7 +2857,7 @@ data: "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Cluster VGCU memory utilization (avg)", + "title": "Cluster MLU memory utilization (avg)", "tooltip": { "shared": true, "sort": 0, @@ -3093,9 +2916,9 @@ data: "h": 4, "w": 8, "x": 16, - "y": 24 + "y": 30 }, - "id": 22, + "id": 27, "interval": null, "links": [], "mappingType": 1, @@ -3134,7 +2957,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "count(enflame_vgcu_usage{pod_name=~\".+\"}) / sum(enflame_vgcu_count) * 100 or vector(0)", + "expr": "sum(mlu_allocated) / count(mlu_usage) * 100 or vector(0)", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -3143,7 +2966,7 @@ data: "thresholds": "65,90", "timeFrom": null, "timeShift": null, - "title": "VGCU Usage", + "title": "MLU Usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -3177,9 +3000,9 @@ data: "h": 2, "w": 4, "x": 16, - "y": 26 + "y": 32 }, - "id": 23, + "id": 28, "interval": null, "links": [], "mappingType": 1, @@ -3217,14 +3040,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "count(enflame_vgcu_usage{pod_name=~\".+\"} or vector(0))-1", + "expr": "sum(mlu_allocated)", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], "thresholds": "100000000000000", - "title": "Used VGCUs", + "title": "Used MLUs", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -3258,9 +3081,9 @@ data: "h": 2, "w": 4, "x": 20, - "y": 26 + "y": 32 }, - "id": 24, + "id": 29, "interval": null, "links": [], "mappingType": 1, @@ -3298,14 +3121,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum(enflame_vgcu_count)", + "expr": "count(mlu_usage)", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], "thresholds": "100000000000000", - "title": "VGCU Count", + "title": "MLU Count", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -3318,452 +3141,34 @@ data: "valueName": "current" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], "datasource": "Prometheus", - "fill": 1, + "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": true, + "thresholdLabels": false, + "thresholdMarkers": true + }, "gridPos": { - "h": 6, + "h": 4, "w": 8, "x": 0, - "y": 28 - }, - "id": 25, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false + "y": 36 }, - "lines": true, - "linewidth": 1, + "id": 30, + "interval": null, "links": [], - "nullPointMode": "null", - "options": {}, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum((sum(mlu_utilization) / count(mlu_utilization)) or vector(0))", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "Cluster MLU utilization (avg)", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Cluster MLU utilization (avg)", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fill": 1, - "gridPos": { - "h": 6, - "w": 8, - "x": 8, - "y": 28 - }, - "id": 26, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": {}, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum((sum(mlu_memory_utilization) / count(mlu_memory_utilization)) or vector(0))", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "Cluster MLU memory utilization(avg)", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Cluster MLU memory utilization (avg)", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 4, - "w": 8, - "x": 16, - "y": 30 - }, - "id": 27, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "pluginVersion": "6.2.0", - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(mlu_allocated) / count(mlu_usage) * 100 or vector(0)", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "65,90", - "timeFrom": null, - "timeShift": null, - "title": "MLU Usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 16, - "y": 32 - }, - "id": 28, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(mlu_allocated)", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "100000000000000", - "title": "Used MLUs", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 20, - "y": 32 - }, - "id": 29, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(mlu_usage)", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "100000000000000", - "title": "MLU Count", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 4, - "w": 8, - "x": 0, - "y": 36 - }, - "id": 30, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ + "mappingType": 1, + "mappingTypes": [ { "name": "value to text", "value": 1 @@ -3879,260 +3284,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"}) * 100", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "65,90", - "title": "Cluster memory usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "decimals": null, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 4, - "w": 8, - "x": 16, - "y": 36 - }, - "id": 32, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum (container_fs_usage_bytes{device=~\"^/dev/.*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (container_fs_limit_bytes{device=~\"^/dev/.*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) * 100", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "65,90", - "title": "Cluster filesystem usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "decimals": 2, - "format": "short", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": true, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 0, - "y": 40 - }, - "id": 33, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": " cores", - "postfixFontSize": "30%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m]))", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "thresholds": "", - "title": "Used", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "decimals": 2, - "format": "short", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 4, - "y": 40 - }, - "id": 34, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": " cores", - "postfixFontSize": "30%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"})", + "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"}) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], - "thresholds": "100000000000000", - "title": "Total", + "thresholds": "65,90", + "title": "Cluster memory usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -4154,22 +3313,22 @@ data: "#d44a3a" ], "datasource": "Prometheus", - "decimals": 2, - "format": "decbytes", + "decimals": null, + "format": "percent", "gauge": { "maxValue": 100, "minValue": 0, - "show": false, + "show": true, "thresholdLabels": false, "thresholdMarkers": true }, "gridPos": { - "h": 2, - "w": 4, - "x": 8, - "y": 40 + "h": 4, + "w": 8, + "x": 16, + "y": 36 }, - "id": 35, + "id": 32, "interval": null, "links": [], "mappingType": 1, @@ -4207,14 +3366,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})", + "expr": "sum (container_fs_usage_bytes{device=~\"^/dev/.*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (container_fs_limit_bytes{device=~\"^/dev/.*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], - "thresholds": "", - "title": "Used", + "thresholds": "65,90", + "title": "Cluster filesystem usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -4237,21 +3396,21 @@ data: ], "datasource": "Prometheus", "decimals": 2, - "format": "decbytes", + "format": "short", "gauge": { "maxValue": 100, "minValue": 0, "show": false, - "thresholdLabels": false, + "thresholdLabels": true, "thresholdMarkers": true }, "gridPos": { "h": 2, "w": 4, - "x": 12, + "x": 0, "y": 40 }, - "id": 36, + "id": 33, "interval": null, "links": [], "mappingType": 1, @@ -4269,8 +3428,8 @@ data: "nullPointMode": "connected", "nullText": null, "options": {}, - "postfix": "", - "postfixFontSize": "50%", + "postfix": " cores", + "postfixFontSize": "30%", "prefix": "", "prefixFontSize": "50%", "rangeMaps": [ @@ -4289,14 +3448,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"})", + "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m]))", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], - "thresholds": "100000000000000", - "title": "Total", + "thresholds": "", + "title": "Used", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -4319,7 +3478,7 @@ data: ], "datasource": "Prometheus", "decimals": 2, - "format": "decbytes", + "format": "short", "gauge": { "maxValue": 100, "minValue": 0, @@ -4330,10 +3489,10 @@ data: "gridPos": { "h": 2, "w": 4, - "x": 16, + "x": 4, "y": 40 }, - "id": 37, + "id": 34, "interval": null, "links": [], "mappingType": 1, @@ -4351,8 +3510,8 @@ data: "nullPointMode": "connected", "nullText": null, "options": {}, - "postfix": "", - "postfixFontSize": "50%", + "postfix": " cores", + "postfixFontSize": "30%", "prefix": "", "prefixFontSize": "50%", "rangeMaps": [ @@ -4371,14 +3530,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (container_fs_usage_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})", + "expr": "sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"})", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], - "thresholds": "", - "title": "Used", + "thresholds": "100000000000000", + "title": "Total", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -4412,10 +3571,10 @@ data: "gridPos": { "h": 2, "w": 4, - "x": 20, + "x": 8, "y": 40 }, - "id": 38, + "id": 35, "interval": null, "links": [], "mappingType": 1, @@ -4453,14 +3612,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (container_fs_limit_bytes{device=~\"^/dev/.*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})", + "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], - "thresholds": "100000000000000", - "title": "Total", + "thresholds": "", + "title": "Used", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -4471,96 +3630,7 @@ data: } ], "valueName": "current" - } - ], - "refresh": "10s", - "schemaVersion": 18, - "style": "dark", - "tags": [], - "templating": { - "list": [ - { - "allValue": ".*", - "current": { - "text": "All", - "value": "$__all" - }, - "datasource": "Prometheus", - "definition": "", - "hide": 2, - "includeAll": true, - "label": null, - "multi": false, - "name": "Node", - "options": [], - "query": "label_values(kubernetes_io_hostname)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "from": "now-5m", - "to": "now" - }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "timezone": "", - "title": "ClusterMetrics", - "uid": "ft1oaQnWk", - "version": 1 - } - openinodes.json: | - { - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 0, - "iteration": 1575963441215, - "links": [], - "panels": [ + }, { "cacheTimeout": null, "colorBackground": false, @@ -4571,21 +3641,22 @@ data: "#d44a3a" ], "datasource": "Prometheus", - "format": "percent", + "decimals": 2, + "format": "decbytes", "gauge": { "maxValue": 100, "minValue": 0, - "show": true, + "show": false, "thresholdLabels": false, "thresholdMarkers": true }, "gridPos": { - "h": 4, - "w": 8, - "x": 16, - "y": 0 + "h": 2, + "w": 4, + "x": 12, + "y": 40 }, - "id": 3, + "id": 36, "interval": null, "links": [], "mappingType": 1, @@ -4623,16 +3694,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "(count(dcgm_gpu_utilization{container_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1)/ (count(dcgm_gpu_temp{uuid=~\".+\",name=~\"^$Node$\"} or vector(0)) - 1) * 100", + "expr": "sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"})", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], - "thresholds": "65,90", - "timeFrom": null, - "timeShift": null, - "title": "Node GPU usage", + "thresholds": "100000000000000", + "title": "Total", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -4654,7 +3723,8 @@ data: "#d44a3a" ], "datasource": "Prometheus", - "format": "none", + "decimals": 2, + "format": "decbytes", "gauge": { "maxValue": 100, "minValue": 0, @@ -4666,9 +3736,9 @@ data: "h": 2, "w": 4, "x": 16, - "y": 0 + "y": 40 }, - "id": 4, + "id": 37, "interval": null, "links": [], "mappingType": 1, @@ -4706,16 +3776,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "count(dcgm_gpu_utilization{container_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1", + "expr": "sum (container_fs_usage_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Used GPUs", + "title": "Used", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -4737,8 +3805,8 @@ data: "#d44a3a" ], "datasource": "Prometheus", - "decimals": null, - "format": "none", + "decimals": 2, + "format": "decbytes", "gauge": { "maxValue": 100, "minValue": 0, @@ -4750,9 +3818,9 @@ data: "h": 2, "w": 4, "x": 20, - "y": 0 + "y": 40 }, - "id": 5, + "id": 38, "interval": null, "links": [], "mappingType": 1, @@ -4790,16 +3858,14 @@ data: "tableColumn": "", "targets": [ { - "expr": "count(dcgm_gpu_temp{uuid=~\".+\",name=~\"^$Node$\"} or vector(0)) - 1", + "expr": "sum (container_fs_limit_bytes{device=~\"^/dev/.*$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], - "thresholds": "100000000000", - "timeFrom": null, - "timeShift": null, - "title": "Total GPUs", + "thresholds": "100000000000000", + "title": "Total", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -4810,7 +3876,96 @@ data: } ], "valueName": "current" - }, + } + ], + "refresh": "10s", + "schemaVersion": 18, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "allValue": ".*", + "current": { + "text": "All", + "value": "$__all" + }, + "datasource": "Prometheus", + "definition": "", + "hide": 2, + "includeAll": true, + "label": null, + "multi": false, + "name": "Node", + "options": [], + "query": "label_values(kubernetes_io_hostname)", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + } + ] + }, + "time": { + "from": "now-5m", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ] + }, + "timezone": "", + "title": "ClusterMetrics", + "uid": "ft1oaQnWk", + "version": 1 + } + openinodes.json: | + { + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "editable": true, + "gnetId": null, + "graphTooltip": 0, + "iteration": 1575963441215, + "links": [], + "panels": [ { "cacheTimeout": null, "colorBackground": false, @@ -4833,9 +3988,9 @@ data: "h": 4, "w": 8, "x": 16, - "y": 12 + "y": 0 }, - "id": 13, + "id": 3, "interval": null, "links": [], "mappingType": 1, @@ -4873,7 +4028,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "(count(enflame_gcu_usage{pod_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1)/ (count(enflame_gcu_usage{uuid=~\".+\",name=~\"^$Node$\"} or vector(0))-1) * 100", + "expr": "(count(dcgm_gpu_utilization{container_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1)/ (count(dcgm_gpu_temp{uuid=~\".+\",name=~\"^$Node$\"} or vector(0)) - 1) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -4882,7 +4037,7 @@ data: "thresholds": "65,90", "timeFrom": null, "timeShift": null, - "title": "Node GCU usage", + "title": "Node GPU usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -4916,9 +4071,9 @@ data: "h": 2, "w": 4, "x": 16, - "y": 16 + "y": 0 }, - "id": 14, + "id": 4, "interval": null, "links": [], "mappingType": 1, @@ -4956,7 +4111,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "count(enflame_gcu_usage{pod_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1", + "expr": "count(dcgm_gpu_utilization{container_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -4965,7 +4120,7 @@ data: "thresholds": "", "timeFrom": null, "timeShift": null, - "title": "Used GCUs", + "title": "Used GPUs", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -5000,9 +4155,9 @@ data: "h": 2, "w": 4, "x": 20, - "y": 16 + "y": 0 }, - "id": 15, + "id": 5, "interval": null, "links": [], "mappingType": 1, @@ -5040,7 +4195,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum(enflame_gcu_count{name=~\"^$Node$\"} or vector(0))", + "expr": "count(dcgm_gpu_temp{uuid=~\".+\",name=~\"^$Node$\"} or vector(0)) - 1", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -5049,7 +4204,7 @@ data: "thresholds": "100000000000", "timeFrom": null, "timeShift": null, - "title": "Total GCUs", + "title": "Total GPUs", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -5083,9 +4238,9 @@ data: "h": 4, "w": 8, "x": 16, - "y": 18 + "y": 12 }, - "id": 18, + "id": 13, "interval": null, "links": [], "mappingType": 1, @@ -5123,7 +4278,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "(count(enflame_vgcu_usage{pod_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1)/ (count(enflame_vgcu_usage{uuid=~\".+\",name=~\"^$Node$\"} or vector(0))-1) * 100", + "expr": "(count(enflame_gcu_usage{pod_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1)/ (count(enflame_gcu_usage{uuid=~\".+\",name=~\"^$Node$\"} or vector(0))-1) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -5132,7 +4287,7 @@ data: "thresholds": "65,90", "timeFrom": null, "timeShift": null, - "title": "Node VGCU usage", + "title": "Node GCU usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -5166,9 +4321,9 @@ data: "h": 2, "w": 4, "x": 16, - "y": 18 + "y": 16 }, - "id": 19, + "id": 14, "interval": null, "links": [], "mappingType": 1, @@ -5206,7 +4361,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "count(enflame_vgcu_usage{pod_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1", + "expr": "count(enflame_gcu_usage{pod_name=~\".+\",name=~\"^$Node$\"} or vector(0))-1", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -5215,7 +4370,7 @@ data: "thresholds": "", "timeFrom": null, "timeShift": null, - "title": "Used VGCUs", + "title": "Used GCUs", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -5250,9 +4405,9 @@ data: "h": 2, "w": 4, "x": 20, - "y": 18 + "y": 16 }, - "id": 20, + "id": 15, "interval": null, "links": [], "mappingType": 1, @@ -5290,7 +4445,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum(enflame_vgcu_count{name=~\"^$Node$\"} or vector(0))", + "expr": "sum(enflame_gcu_count{name=~\"^$Node$\"} or vector(0))", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -5299,7 +4454,7 @@ data: "thresholds": "100000000000", "timeFrom": null, "timeShift": null, - "title": "Total VGCUs", + "title": "Total GCUs", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -6328,178 +5483,6 @@ data: "alignLevel": null } }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fill": 1, - "gridPos": { - "h": 6, - "w": 8, - "x": 0, - "y": 18 - }, - "id": 16, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": {}, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum((sum(enflame_vgcu_usage{name=~\"^$Node$\"}) / count(enflame_vgcu_usage{name=~\"^$Node$\"}) ) or vector(0))", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "Node VGCU utilization (avg)", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Node VGCU utilization (avg)", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fill": 1, - "gridPos": { - "h": 6, - "w": 8, - "x": 8, - "y": 18 - }, - "id": 17, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": {}, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum((sum(enflame_vgcu_memory_usage{name=~\"^$Node$\"}) / count(enflame_vgcu_memory_usage{name=~\"^$Node$\"})) * 100 or vector(0))", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "Node VGCU memory utilization(avg)", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Node VGCU memory utilization (avg)", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, { "aliasColors": {}, "bars": false, -- 2.34.1 From 1e7b4109550f2e323596b49720c696ce85de005a Mon Sep 17 00:00:00 2001 From: linfengjun Date: Tue, 9 May 2023 17:50:50 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/charts/octopus/templates/grafana.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/charts/octopus/templates/grafana.yaml b/deploy/charts/octopus/templates/grafana.yaml index c79e1b67..e8f3c129 100644 --- a/deploy/charts/octopus/templates/grafana.yaml +++ b/deploy/charts/octopus/templates/grafana.yaml @@ -2088,7 +2088,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum(npu_chip_info_hbm_used_memory) / sum(npu_chip_info_hbm_total_memory) or vector(0)", + "expr": "sum(npu_chip_info_hbm_used_memory) / sum(npu_chip_info_hbm_total_memory) * 100 or vector(0)", "format": "time_series", "intervalFactor": 1, "legendFormat": "Cluster NPU memory utilization(avg)", @@ -5262,7 +5262,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum(npu_chip_info_hbm_used_memory{name=\"$Node\"}) / sum(npu_chip_info_hbm_total_memory{name=\"$Node\"})", + "expr": "sum(npu_chip_info_hbm_used_memory{name=\"$Node\"}) / sum(npu_chip_info_hbm_total_memory{name=\"$Node\"}) * 100", "format": "time_series", "intervalFactor": 1, "legendFormat": "Node NPU hbm memory utilization(avg)", -- 2.34.1 From b5873330a5bb0bef1415ce684573fa60ce0f0ed4 Mon Sep 17 00:00:00 2001 From: linfengjun Date: Wed, 10 May 2023 10:45:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/charts/octopus/templates/grafana.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/charts/octopus/templates/grafana.yaml b/deploy/charts/octopus/templates/grafana.yaml index e8f3c129..ff6e7cb9 100644 --- a/deploy/charts/octopus/templates/grafana.yaml +++ b/deploy/charts/octopus/templates/grafana.yaml @@ -3202,7 +3202,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"}) * 100", + "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum(count without(cpu, mode) (node_cpu_seconds_total{mode="idle"})) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -3284,7 +3284,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"}) * 100", + "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum(node_memory_MemTotal_bytes) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -3530,7 +3530,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"})", + "expr": "sum(count without(cpu, mode) (node_cpu_seconds_total{mode="idle"}))", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -3694,7 +3694,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"})", + "expr": "sum(node_memory_MemTotal_bytes)", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -5717,7 +5717,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"}) * 100", + "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum(count without(cpu, mode) (node_cpu_seconds_total{mode="idle",name=~"^$Node$"})) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -5801,7 +5801,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"}) * 100", + "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum(node_memory_MemTotal_bytes{name=~\"^$Node$\"}) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -6052,7 +6052,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"})", + "expr": "sum(count without(cpu, mode) (node_cpu_seconds_total{mode="idle",name=~"^$Node$"}))", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -6219,7 +6219,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"})", + "expr": "sum(node_memory_MemTotal_bytes{name=~\"^$Node$\"})", "format": "time_series", "intervalFactor": 1, "refId": "A" -- 2.34.1 From 042327139c9b088cce87a11bc6d7e80629c54f99 Mon Sep 17 00:00:00 2001 From: linfengjun Date: Wed, 10 May 2023 10:59:10 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/charts/octopus/templates/grafana.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/charts/octopus/templates/grafana.yaml b/deploy/charts/octopus/templates/grafana.yaml index ff6e7cb9..835f03f1 100644 --- a/deploy/charts/octopus/templates/grafana.yaml +++ b/deploy/charts/octopus/templates/grafana.yaml @@ -3202,7 +3202,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum(count without(cpu, mode) (node_cpu_seconds_total{mode="idle"})) * 100", + "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum(count without(cpu, mode) (node_cpu_seconds_total{mode=\"idle\"})) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -3530,7 +3530,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum(count without(cpu, mode) (node_cpu_seconds_total{mode="idle"}))", + "expr": "sum(count without(cpu, mode) (node_cpu_seconds_total{mode=\"idle\"}))", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -5717,7 +5717,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum(count without(cpu, mode) (node_cpu_seconds_total{mode="idle",name=~"^$Node$"})) * 100", + "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum(count without(cpu, mode) (node_cpu_seconds_total{mode=\"idle\",name=~\"^$Node$\"})) * 100", "format": "time_series", "intervalFactor": 1, "refId": "A" @@ -6052,7 +6052,7 @@ data: "tableColumn": "", "targets": [ { - "expr": "sum(count without(cpu, mode) (node_cpu_seconds_total{mode="idle",name=~"^$Node$"}))", + "expr": "sum(count without(cpu, mode) (node_cpu_seconds_total{mode=\"idle\",name=~\"^$Node$\"}))", "format": "time_series", "intervalFactor": 1, "refId": "A" -- 2.34.1 From 000634afbec234150e56615a01e09992f55506bd Mon Sep 17 00:00:00 2001 From: linfengjun Date: Wed, 10 May 2023 11:08:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9k8s=E9=AB=98=E7=89=88?= =?UTF-8?q?=E6=9C=ACcpu=E5=92=8C=E5=86=85=E5=AD=98=E6=80=BB=E9=87=8F?= =?UTF-8?q?=E6=97=A0=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charts/prometheus-node-exporter-4.17.2.tgz | Bin 0 -> 12018 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 deploy/charts/octopus/charts/prometheus-node-exporter-4.17.2.tgz diff --git a/deploy/charts/octopus/charts/prometheus-node-exporter-4.17.2.tgz b/deploy/charts/octopus/charts/prometheus-node-exporter-4.17.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..4ee7d9349625203c0f48b0631613e6b53f2400b3 GIT binary patch literal 12018 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 Q3jhHB|ALmgCjbfo0BA> Date: Thu, 11 May 2023 17:12:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D#740?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-portal/src/views/timeManager/component/consumption.vue | 2 +- admin-portal/src/views/timeManager/component/recharge.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-portal/src/views/timeManager/component/consumption.vue b/admin-portal/src/views/timeManager/component/consumption.vue index ff5837e5..d13627c5 100644 --- a/admin-portal/src/views/timeManager/component/consumption.vue +++ b/admin-portal/src/views/timeManager/component/consumption.vue @@ -145,7 +145,7 @@ }, getSearchData(val) { let data = {} - data = Object.assign(val, { pageIndex: this.searchData.pageIndex, pageSize: this.searchData.pageSize }) + data = Object.assign(val, { pageIndex: 1, pageSize: this.searchData.pageSize }) this.getPay(data) if (val.searchKey) { this.searchKey = val.searchKey diff --git a/admin-portal/src/views/timeManager/component/recharge.vue b/admin-portal/src/views/timeManager/component/recharge.vue index 82c92c4d..57457805 100644 --- a/admin-portal/src/views/timeManager/component/recharge.vue +++ b/admin-portal/src/views/timeManager/component/recharge.vue @@ -114,7 +114,7 @@ }, getSearchData(val) { let data = {} - data = Object.assign(val, { pageIndex: this.searchData.pageIndex, pageSize: this.searchData.pageSize }) + data = Object.assign(val, { pageIndex: 1, pageSize: this.searchData.pageSize }) this.Recharge(data) if (val.searchKey) { this.searchKey = val.searchKey -- 2.34.1