From 26367dedc86642a9877c9b35632ae5e3cb1697c0 Mon Sep 17 00:00:00 2001 From: rahulguptajss Date: Mon, 13 May 2024 16:27:09 +0530 Subject: [PATCH] feat: remove hidden topk variables from dashboards --- .../dashboards/cmode/external_service_op.json | 234 ++++-------------- grafana/dashboards/cmode/node.json | 110 +++----- grafana/dashboards/cmode/power.json | 41 +-- grafana/dashboards/cmode/snapmirror.json | 29 +-- 4 files changed, 93 insertions(+), 321 deletions(-) diff --git a/grafana/dashboards/cmode/external_service_op.json b/grafana/dashboards/cmode/external_service_op.json index 5f3649315..d5072afa5 100644 --- a/grafana/dashboards/cmode/external_service_op.json +++ b/grafana/dashboards/cmode/external_service_op.json @@ -16,6 +16,12 @@ "type": "grafana", "version": "8.1.8" }, + { + "id": "heatmap", + "name": "Heatmap", + "type": "panel", + "version": "" + }, { "id": "prometheus", "name": "Prometheus", @@ -23,14 +29,8 @@ "version": "1.0.0" }, { - "id": "stat", - "name": "Stat", - "type": "panel", - "version": "" - }, - { - "id": "table", - "name": "Table", + "id": "text", + "name": "Text", "type": "panel", "version": "" }, @@ -62,11 +62,10 @@ }, "description": "", "editable": true, - "fiscalYearStartMonth": 0, "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1681729577481, + "iteration": 1715584267832, "links": [ { "asDropdown": true, @@ -83,7 +82,6 @@ "url": "" } ], - "liveNow": false, "panels": [ { "datasource": "${DS_PROMETHEUS}", @@ -192,7 +190,7 @@ "targets": [ { "exemplar": false, - "expr": "topk($TopResources, avg by (operation, service_name, svm, cluster) (external_service_op_request_latency{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\",key=~\"$TopRequestLatency\"}))", + "expr": "avg by (datacenter, cluster, svm, operation, service_name) (external_service_op_request_latency{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"})\nand \ntopk(\n $TopResources,\n avg by (datacenter, cluster, svm, operation, service_name) (avg_over_time(external_service_op_request_latency{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))\n)", "interval": "", "legendFormat": "{{cluster}} - {{svm}} - {{operation}}", "refId": "A" @@ -202,7 +200,10 @@ "type": "timeseries" }, { - "cards": {}, + "cards": { + "cardPadding": null, + "cardRound": null + }, "color": { "cardColor": "#b4ff00", "colorScale": "sqrt", @@ -250,12 +251,20 @@ "xAxis": { "show": true }, + "xBucketNumber": null, + "xBucketSize": null, "yAxis": { + "decimals": null, "format": "µs", "logBase": 1, - "show": true + "max": null, + "min": null, + "show": true, + "splitFactor": null }, - "yBucketBound": "auto" + "yBucketBound": "auto", + "yBucketNumber": null, + "yBucketSize": null }, { "datasource": "${DS_PROMETHEUS}", @@ -335,7 +344,7 @@ "targets": [ { "exemplar": false, - "expr": "topk($TopResources, sum by (operation, service_name, svm, cluster) (external_service_op_num_not_found_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\",key=~\"$TopNotFoundResponse\"}))", + "expr": "avg by (datacenter, cluster, svm, operation, service_name) (external_service_op_num_not_found_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"})\nand \ntopk(\n $TopResources,\n avg by (datacenter, cluster, svm, operation, service_name) (avg_over_time(external_service_op_num_not_found_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))\n)", "interval": "", "legendFormat": "{{cluster}} - {{svm}} - {{operation}}", "refId": "A" @@ -422,7 +431,7 @@ "targets": [ { "exemplar": false, - "expr": "topk($TopResources, sum by (operation, service_name, svm, cluster) (external_service_op_num_request_failures{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\",key=~\"$TopRequestFailed\"}))", + "expr": "avg by (datacenter, cluster, svm, operation, service_name) (external_service_op_num_request_failures{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"})\nand \ntopk(\n $TopResources,\n avg by (datacenter, cluster, svm, operation, service_name) (avg_over_time(external_service_op_num_request_failures{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))\n)", "interval": "", "legendFormat": "{{cluster}} - {{svm}} - {{operation}}", "refId": "A" @@ -509,7 +518,7 @@ "targets": [ { "exemplar": false, - "expr": "topk($TopResources, sum by (operation, service_name, svm, cluster) (external_service_op_num_requests_sent{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\",key=~\"$TopRequestSent\"}))", + "expr": "avg by (datacenter, cluster, svm, operation, service_name) (external_service_op_num_requests_sent{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"})\nand \ntopk(\n $TopResources,\n avg by (datacenter, cluster, svm, operation, service_name) (avg_over_time(external_service_op_num_requests_sent{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))\n)", "interval": "", "legendFormat": "{{cluster}} - {{svm}} - {{operation}}", "refId": "A" @@ -596,7 +605,7 @@ "targets": [ { "exemplar": false, - "expr": "topk($TopResources, sum by (operation, service_name, svm, cluster) (external_service_op_num_responses_received{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\",key=~\"$TopRequestReceived\"}))", + "expr": "avg by (datacenter, cluster, svm, operation, service_name) (external_service_op_num_responses_received{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"})\nand \ntopk(\n $TopResources,\n avg by (datacenter, cluster, svm, operation, service_name) (avg_over_time(external_service_op_num_responses_received{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))\n)", "interval": "", "legendFormat": "{{cluster}} - {{svm}} - {{operation}}", "refId": "A" @@ -683,7 +692,7 @@ "targets": [ { "exemplar": false, - "expr": "topk($TopResources, sum by (operation, service_name, svm, cluster) (external_service_op_num_successful_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\",key=~\"$TopSuccessResponse\"}))", + "expr": "avg by (datacenter, cluster, svm, operation, service_name) (external_service_op_num_successful_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"})\nand \ntopk(\n $TopResources,\n avg by (datacenter, cluster, svm, operation, service_name) (avg_over_time(external_service_op_num_successful_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))\n)", "interval": "", "legendFormat": "{{cluster}} - {{svm}} - {{operation}}", "refId": "A" @@ -770,7 +779,7 @@ "targets": [ { "exemplar": false, - "expr": "topk($TopResources, sum by (operation, service_name, svm, cluster) (external_service_op_num_timeouts{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\",key=~\"$TopTimeout\"}))", + "expr": "avg by (datacenter, cluster, svm, operation, service_name) (external_service_op_num_timeouts{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"})\nand \ntopk(\n $TopResources,\n avg by (datacenter, cluster, svm, operation, service_name) (avg_over_time(external_service_op_num_timeouts{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))\n)", "interval": "", "legendFormat": "{{cluster}} - {{svm}} - {{operation}}", "refId": "A" @@ -781,7 +790,7 @@ } ], "refresh": "", - "schemaVersion": 35, + "schemaVersion": 30, "style": "dark", "tags": [ "harvest", @@ -796,6 +805,8 @@ "text": "Prometheus", "value": "Prometheus" }, + "description": null, + "error": null, "hide": 2, "includeAll": false, "label": "Data Source", @@ -813,8 +824,11 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "label_values(external_service_op_request_latency{system_type!=\"7mode\"}, datacenter)", + "description": null, + "error": null, "hide": 0, "includeAll": false, + "label": null, "multi": true, "name": "Datacenter", "options": [], @@ -836,8 +850,11 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "label_values(external_service_op_request_latency{system_type!=\"7mode\",datacenter=~\"$Datacenter\"}, cluster)", + "description": null, + "error": null, "hide": 0, "includeAll": true, + "label": null, "multi": true, "name": "Cluster", "options": [], @@ -859,8 +876,11 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "label_values(external_service_op_request_latency{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"}, svm)", + "description": null, + "error": null, "hide": 0, "includeAll": true, + "label": null, "multi": true, "name": "SVM", "options": [], @@ -882,8 +902,11 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "label_values(external_service_op_request_latency{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}, service_name)", + "description": null, + "error": null, "hide": 0, "includeAll": true, + "label": null, "multi": true, "name": "ServiceName", "options": [], @@ -905,8 +928,11 @@ "current": {}, "datasource": "${DS_PROMETHEUS}", "definition": "label_values(external_service_op_request_latency{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\"}, operation)", + "description": null, + "error": null, "hide": 0, "includeAll": true, + "label": null, "multi": true, "name": "Operation", "options": [], @@ -1013,167 +1039,6 @@ "queryValue": "", "skipUrlSync": false, "type": "custom" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, avg by (key) (avg_over_time(external_service_op_request_latency{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopRequestLatency", - "options": [], - "query": { - "query": "query_result(topk($TopResources, avg by (key) (avg_over_time(external_service_op_request_latency{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*key=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_not_found_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopNotFoundResponse", - "options": [], - "query": { - "query": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_not_found_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*key=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_request_failures{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopRequestFailed", - "options": [], - "query": { - "query": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_request_failures{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*key=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_requests_sent{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopRequestSent", - "options": [], - "query": { - "query": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_requests_sent{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*key=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_responses_received{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopRequestReceived", - "options": [], - "query": { - "query": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_responses_received{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*key=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_successful_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopSuccessResponse", - "options": [], - "query": { - "query": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_successful_responses{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*key=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_timeouts{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopTimeout", - "options": [], - "query": { - "query": "query_result(topk($TopResources, sum by (key) (avg_over_time(external_service_op_num_timeouts{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",service_name=~\"$ServiceName\",operation=~\"$Operation\"}[3h]))))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*key=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" } ] }, @@ -1197,6 +1062,5 @@ "timezone": "", "title": "ONTAP: External Service Operation", "uid": "", - "version": 1, - "weekStart": "" + "version": 2 } diff --git a/grafana/dashboards/cmode/node.json b/grafana/dashboards/cmode/node.json index 5cfd7148d..5e7c54fcb 100644 --- a/grafana/dashboards/cmode/node.json +++ b/grafana/dashboards/cmode/node.json @@ -77,7 +77,7 @@ "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1715328794817, + "iteration": 1715581200639, "links": [ { "asDropdown": true, @@ -1057,7 +1057,7 @@ ] }, "gridPos": { - "h": 14, + "h": 12, "w": 24, "x": 0, "y": 17 @@ -1207,7 +1207,7 @@ "h": 1, "w": 24, "x": 0, - "y": 31 + "y": 29 }, "id": 131, "panels": [ @@ -1496,7 +1496,7 @@ "h": 1, "w": 24, "x": 0, - "y": 32 + "y": 30 }, "id": 57, "panels": [ @@ -1729,7 +1729,7 @@ "h": 1, "w": 24, "x": 0, - "y": 33 + "y": 31 }, "id": 107, "panels": [ @@ -1794,7 +1794,7 @@ "h": 8, "w": 12, "x": 0, - "y": 23 + "y": 32 }, "id": 109, "options": { @@ -1887,7 +1887,7 @@ "h": 8, "w": 12, "x": 12, - "y": 23 + "y": 32 }, "id": 110, "options": { @@ -1977,7 +1977,7 @@ "h": 8, "w": 12, "x": 0, - "y": 31 + "y": 40 }, "id": 111, "options": { @@ -1998,9 +1998,9 @@ "targets": [ { "exemplar": false, - "expr": "topk($TopResources, nic_rx_bytes+nic_tx_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\",nic=~\"$TopNicXPut\"})", + "expr": "(\n nic_rx_bytes{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"} \n +\n nic_tx_bytes{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}\n)\nand on(datacenter,cluster, nic, node)\ntopk(\n $TopResources,\n (\n avg_over_time(nic_rx_bytes{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}[3h])\n + avg_over_time(nic_tx_bytes{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}[3h])\n )\n)", "interval": "", - "legendFormat": "{{cluster}} - {{svm}} - {{node}} - {{nic}}", + "legendFormat": "{{cluster}} - {{node}} - {{nic}}", "refId": "A" } ], @@ -2067,7 +2067,7 @@ "h": 8, "w": 12, "x": 12, - "y": 31 + "y": 40 }, "id": 112, "options": { @@ -2088,9 +2088,9 @@ "targets": [ { "exemplar": false, - "expr": "topk($TopResources, fcp_read_data+fcp_write_data+fcp_nvmf_read_data+fcp_nvmf_write_data{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\",port=~\"$TopFCUtilXPut\"})", + "expr": "(\n fcp_read_data{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"} \n +\n fcp_write_data{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}\n +\n fcp_nvmf_read_data{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}\n +\n fcp_nvmf_write_data{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}\n)\nand on(datacenter,cluster, port, node)\ntopk(\n $TopResources,\n (\n avg_over_time(fcp_read_data{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}[3h])\n + avg_over_time(fcp_write_data{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}[3h])\n + avg_over_time(fcp_nvmf_read_data{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}[3h])\n + avg_over_time(fcp_nvmf_write_data{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\",node=~\"$Node\"}[3h])\n )\n)", "interval": "", - "legendFormat": "{{cluster}} - {{svm}} - {{node}} - {{port}}", + "legendFormat": "{{cluster}} - {{node}} - {{port}}", "refId": "A" } ], @@ -2110,7 +2110,7 @@ "h": 1, "w": 24, "x": 0, - "y": 34 + "y": 32 }, "id": 28, "panels": [ @@ -2168,7 +2168,7 @@ "h": 9, "w": 8, "x": 0, - "y": 47 + "y": 51 }, "id": 30, "options": { @@ -2273,7 +2273,7 @@ "h": 9, "w": 8, "x": 8, - "y": 47 + "y": 51 }, "id": 31, "options": { @@ -2374,7 +2374,7 @@ "h": 9, "w": 8, "x": 16, - "y": 47 + "y": 51 }, "id": 32, "options": { @@ -2486,7 +2486,7 @@ "h": 9, "w": 8, "x": 0, - "y": 56 + "y": 60 }, "id": 41, "options": { @@ -2605,7 +2605,7 @@ "h": 9, "w": 8, "x": 8, - "y": 56 + "y": 60 }, "id": 43, "options": { @@ -2724,7 +2724,7 @@ "h": 9, "w": 8, "x": 16, - "y": 56 + "y": 60 }, "id": 42, "options": { @@ -2807,7 +2807,7 @@ "h": 1, "w": 24, "x": 0, - "y": 35 + "y": 33 }, "id": 88, "panels": [ @@ -3559,7 +3559,7 @@ "h": 1, "w": 24, "x": 0, - "y": 36 + "y": 34 }, "id": 59, "panels": [ @@ -3904,7 +3904,7 @@ "h": 1, "w": 24, "x": 0, - "y": 37 + "y": 35 }, "id": 67, "panels": [ @@ -3941,7 +3941,7 @@ "h": 5, "w": 3, "x": 0, - "y": 27 + "y": 38 }, "id": 84, "options": { @@ -3998,7 +3998,7 @@ "h": 5, "w": 3, "x": 3, - "y": 27 + "y": 38 }, "id": 69, "options": { @@ -4089,7 +4089,7 @@ "h": 9, "w": 6, "x": 6, - "y": 27 + "y": 38 }, "id": 72, "options": { @@ -4181,7 +4181,7 @@ "h": 9, "w": 6, "x": 12, - "y": 27 + "y": 38 }, "id": 73, "options": { @@ -4274,7 +4274,7 @@ "h": 9, "w": 6, "x": 18, - "y": 27 + "y": 38 }, "id": 74, "options": { @@ -4319,7 +4319,7 @@ "h": 1, "w": 24, "x": 0, - "y": 38 + "y": 36 }, "id": 118, "panels": [ @@ -4736,7 +4736,7 @@ "h": 1, "w": 24, "x": 0, - "y": 39 + "y": 37 }, "id": 76, "panels": [ @@ -5151,7 +5151,7 @@ "h": 1, "w": 24, "x": 0, - "y": 40 + "y": 38 }, "id": 38, "panels": [ @@ -5924,52 +5924,6 @@ "queryValue": "", "skipUrlSync": false, "type": "custom" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, avg_over_time(nic_rx_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])+avg_over_time(nic_tx_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopNicXPut", - "options": [], - "query": { - "query": "query_result(topk($TopResources, avg_over_time(nic_rx_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])+avg_over_time(nic_tx_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*nic=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, avg_over_time(fcp_read_data{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])+avg_over_time(fcp_write_data{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])+avg_over_time(fcp_nvmf_read_data{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])+avg_over_time(fcp_nvmf_write_data{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopFCUtilXPut", - "options": [], - "query": { - "query": "query_result(topk($TopResources, avg_over_time(fcp_read_data{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])+avg_over_time(fcp_write_data{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])+avg_over_time(fcp_nvmf_read_data{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])+avg_over_time(fcp_nvmf_write_data{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}[3h])))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*port=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" } ] }, @@ -5993,5 +5947,5 @@ "timezone": "", "title": "ONTAP: Node", "uid": "", - "version": 13 + "version": 14 } diff --git a/grafana/dashboards/cmode/power.json b/grafana/dashboards/cmode/power.json index 3f7e82247..f62c684db 100644 --- a/grafana/dashboards/cmode/power.json +++ b/grafana/dashboards/cmode/power.json @@ -71,7 +71,7 @@ "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1705065859515, + "iteration": 1715582801657, "links": [ { "asDropdown": true, @@ -1330,7 +1330,7 @@ "overrides": [] }, "gridPos": { - "h": 8, + "h": 9, "w": 13, "x": 0, "y": 48 @@ -1354,7 +1354,7 @@ "targets": [ { "exemplar": false, - "expr": "sum(aggr_disk_user_reads{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",aggr=~\"$TopAggrPower\"}) by (aggr,cluster,node)", + "expr": "(\n sum by (datacenter,cluster, aggr) (aggr_disk_user_reads{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\"})\n)\nand on(datacenter,cluster, aggr)\ntopk(\n $TopResources,\n sum by (datacenter,cluster, aggr) (\n avg_over_time(aggr_disk_user_reads{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\"}[3h])\n )\n)", "hide": false, "interval": "", "legendFormat": "Reads - {{cluster}} - {{aggr}}", @@ -1362,7 +1362,7 @@ }, { "exemplar": false, - "expr": "sum(aggr_disk_user_writes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",aggr=~\"$TopAggrPower\"}) by (aggr,cluster,node)", + "expr": "(\n sum by (datacenter,cluster, aggr) (aggr_disk_user_writes{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\"})\n)\nand on(datacenter,cluster, aggr)\ntopk(\n $TopResources,\n sum by (datacenter,cluster, aggr) (\n avg_over_time(aggr_disk_user_writes{datacenter=~\"$Datacenter\", cluster=~\"$Cluster\"}[3h])\n )\n)", "hide": false, "interval": "", "legendFormat": "Writes - {{cluster}} - {{aggr}}", @@ -1381,7 +1381,7 @@ "h": 1, "w": 24, "x": 0, - "y": 56 + "y": 57 }, "id": 93, "panels": [ @@ -1729,7 +1729,7 @@ "h": 1, "w": 24, "x": 0, - "y": 57 + "y": 58 }, "id": 84, "panels": [ @@ -1854,7 +1854,7 @@ "h": 1, "w": 24, "x": 0, - "y": 58 + "y": 59 }, "id": 76, "panels": [ @@ -2391,7 +2391,7 @@ "h": 1, "w": 24, "x": 0, - "y": 59 + "y": 60 }, "id": 78, "panels": [ @@ -3212,29 +3212,6 @@ "queryValue": "", "skipUrlSync": false, "type": "custom" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, avg_over_time(aggr_power{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"}[${__range}])))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopAggrPower", - "options": [], - "query": { - "query": "query_result(topk($TopResources, avg_over_time(aggr_power{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"}[${__range}])))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*aggr=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" } ] }, @@ -3269,5 +3246,5 @@ "timezone": "", "title": "ONTAP: Power", "uid": "", - "version": 13 + "version": 14 } diff --git a/grafana/dashboards/cmode/snapmirror.json b/grafana/dashboards/cmode/snapmirror.json index 72757dbf7..9ac814366 100644 --- a/grafana/dashboards/cmode/snapmirror.json +++ b/grafana/dashboards/cmode/snapmirror.json @@ -77,7 +77,7 @@ "gnetId": null, "graphTooltip": 1, "id": null, - "iteration": 1705492466249, + "iteration": 1715583786669, "links": [ { "asDropdown": true, @@ -707,7 +707,7 @@ }, { "exemplar": false, - "expr": "snapmirror_last_transfer_size{source_cluster=~\"$SourceCluster\",source_volume=~\"$SourceVolume\",destination_volume=~\"$DestinationVolume\",source_vserver=~\"$SourceSVM\",destination_vserver=~\"$DestinationSVM\",relationship_id=~\"$TopTransferDataById\"}", + "expr": "snapmirror_last_transfer_size{source_cluster=~\"$SourceCluster\",source_volume=~\"$SourceVolume\",destination_volume=~\"$DestinationVolume\",source_vserver=~\"$SourceSVM\",destination_vserver=~\"$DestinationSVM\"}\nand\ntopk(\n $TopResources,\n avg_over_time(snapmirror_last_transfer_size{source_cluster=~\"$SourceCluster\", source_volume=~\"$SourceVolume\", destination_volume=~\"$DestinationVolume\", source_vserver=~\"$SourceSVM\", destination_vserver=~\"$DestinationSVM\"}[3h])\n)", "format": "table", "instant": true, "interval": "", @@ -4330,29 +4330,6 @@ "queryValue": "", "skipUrlSync": false, "type": "custom" - }, - { - "allValue": null, - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "query_result(topk($TopResources, avg_over_time(snapmirror_last_transfer_size{source_cluster=~\"$SourceCluster\",source_volume=~\"$SourceVolume\",destination_volume=~\"$DestinationVolume\",source_vserver=~\"$SourceSVM\",destination_vserver=~\"$DestinationSVM\"}[3h])))", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": null, - "multi": true, - "name": "TopTransferDataById", - "options": [], - "query": { - "query": "query_result(topk($TopResources, avg_over_time(snapmirror_last_transfer_size{source_cluster=~\"$SourceCluster\",source_volume=~\"$SourceVolume\",destination_volume=~\"$DestinationVolume\",source_vserver=~\"$SourceSVM\",destination_vserver=~\"$DestinationSVM\"}[3h])))", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": ".*relationship_id=\\\"(.*?)\\\".*", - "skipUrlSync": false, - "sort": 0, - "type": "query" } ] }, @@ -4387,5 +4364,5 @@ "timezone": "", "title": "ONTAP: SnapMirror", "uid": "", - "version": 5 + "version": 6 }