From 9293c44882c7acd45a4e84d307206017754a8d65 Mon Sep 17 00:00:00 2001 From: Yash Sartanpara Date: Tue, 13 Jun 2023 12:37:35 +0530 Subject: [PATCH 1/6] PMM-12070 Add Table plugin on DB cluster Summary --- .../Experimental/DB_Cluster_Summary.json | 815 ++++++++---------- 1 file changed, 355 insertions(+), 460 deletions(-) diff --git a/dashboards/Experimental/DB_Cluster_Summary.json b/dashboards/Experimental/DB_Cluster_Summary.json index db77fb536d..463c4eb763 100644 --- a/dashboards/Experimental/DB_Cluster_Summary.json +++ b/dashboards/Experimental/DB_Cluster_Summary.json @@ -552,194 +552,150 @@ "type": "row" }, { - "activePatternIndex": 1, - "defaultPattern": { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "transparent", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": false, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" - }, - "format": "decbytes", - "name": "Default Pattern", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": "*", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "red|orange|green", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "70,90", - "time_based_thresholds": [], - "tooltipTemplate": "", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "current" - }, - "default_title_for_rows": "Pod", + "id": 1031, "gridPos": { "h": 13, "w": 12, "x": 0, "y": 6 }, - "id": 1031, - "patterns": [ - { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": false, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" + "type": "table", + "title": "RAM", + "default_title_for_rows": "Pod", + "datasource": "Metrics", + "pluginVersion": "9.2.13", + "description": "", + "options": { + "showHeader": true, + "footer": { + "show": false + } + }, + "fieldConfig": { + "defaults": { + "custom": { + "align": "left", + "displayMode": "auto", + "inspect": false, + "width": 85 + }, + "mappings": [ + { + "options": { + "0": { + "color": "text", + "index": 0, + "text": "-" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "green", + "value": 80 + } + ] + }, + "color": { + "mode": "fixed" }, - "format": "decbytes", - "name": "Used", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": ".* Used", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "red|orange|green", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "70,90", - "time_based_thresholds": [], - "tooltipTemplate": "Series : _series_
Row Name : _row_name_
Col Name : _col_name_
Value : _value_", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "current" - }, - { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", "decimals": 2, - "defaultBGColor": "", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": true, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" + "noValue": "-", + "unit": "decbytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Value #C" + }, + "properties": [ + { + "id": "unit", + "value": "percent" + }, + { + "id": "custom.displayMode", + "value": "color-text" + }, + { + "id": "color" + } + ] }, - "format": "percent", - "name": "Free RAM", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": ".* Free RAM", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "red|orange|green", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "40,80", - "time_based_thresholds": [], - "tooltipTemplate": "Series : _series_
Row Name : _row_name_
Col Name : _col_name_
Value : _value_", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "current" + { + "matcher": { + "id": "byName", + "options": "pod" + }, + "properties": [ + { + "id": "custom.width" + } + ] + } + ] + }, + "transformations": [ + { + "id": "merge", + "options": {} }, { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": false, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" - }, - "format": "decbytes", - "name": "Swap Limit", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": ".* Swap Limit", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "red|orange|green", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "70,90", - "time_based_thresholds": [], - "tooltipTemplate": "Series : _series_
Row Name : _row_name_
Col Name : _col_name_
Value : _value_", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "avg" + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "agent_id": true, + "agent_type": true, + "environment": true, + "instance": true, + "job": true, + "machine_id": true, + "node_id": true, + "node_name": true, + "node_type": true + }, + "indexByName": { + "Time": 0, + "pod": 1, + "Value #C": 2, + "Value #A": 3, + "Value #B": 4 + }, + "renameByName": { + "Value #A": "RAM Limit", + "Value #B": "Used", + "Value #C": "Free RAM", + "pod": "Pod" + } + } } ], - "pluginVersion": "7.5.6", - "row_col_wrapper": "_", - "sorting_props": { - "col_index": -1, - "direction": "desc" - }, "targets": [ { - "datasource": "Metrics", + "editorMode": "code", "exemplar": false, "expr": "avg by (pod)(container_spec_memory_limit_bytes{pod=~\"$pod\"})", - "format": "time_series", + "format": "table", "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | RAM Limit", "refId": "A" }, { - "datasource": "Metrics", + "editorMode": "code", "exemplar": false, "expr": "avg by (pod)(container_memory_usage_bytes{pod=~\"$pod\"})", + "format": "table", "hide": false, "instant": true, "interval": "$interval", @@ -747,9 +703,10 @@ "refId": "B" }, { - "datasource": "Metrics", + "editorMode": "code", "exemplar": false, "expr": "100 - clamp_max((avg by (pod) (container_memory_usage_bytes{pod=~\"$pod\"}) * 100) / avg by (pod) (container_spec_memory_limit_bytes{pod=~\"$pod\"}),100)", + "format": "table", "hide": false, "instant": true, "interval": "$interval", @@ -757,198 +714,147 @@ "refId": "C" }, { - "datasource": "Metrics", + "editorMode": "code", "exemplar": false, "expr": "avg by (pod)(container_spec_memory_swap_limit_bytes{pod=~\"$pod\"})", - "format": "time_series", + "format": "table", "hide": true, "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Swap Limit", "refId": "D" } - ], - "title": "RAM", - "type": "yesoreyeram-boomtable-panel" + ] }, { - "activePatternIndex": 1, - "defaultPattern": { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "transparent", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": false, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" - }, - "format": "decbytes", - "name": "Default Pattern", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": "*", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "red|orange|green", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "70,90", - "time_based_thresholds": [], - "tooltipTemplate": "", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "current" - }, - "default_title_for_rows": "Pod", + "id": 1032, "gridPos": { "h": 13, "w": 12, "x": 12, "y": 6 }, - "id": 1032, - "patterns": [ - { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": false, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" + "type": "table", + "title": "Swap", + "default_title_for_rows": "Pod", + "datasource": "Metrics", + "pluginVersion": "9.2.13", + "options": { + "showHeader": true, + "footer": { + "show": false + } + }, + "fieldConfig": { + "defaults": { + "custom": { + "align": "left", + "displayMode": "auto", + "inspect": false, + "width": 90 + }, + "mappings": [ + { + "options": { + "0": { + "color": "text", + "index": 0, + "text": "-" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "dark-red", + "value": null + }, + { + "color": "green", + "value": 80 + } + ] + }, + "color": { + "mode": "fixed" }, - "format": "decbytes", - "name": "Used", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": ".* Used", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "red|orange|green", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "70,90", - "time_based_thresholds": [], - "tooltipTemplate": "Series : _series_
Row Name : _row_name_
Col Name : _col_name_
Value : _value_", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "current" + "noValue": "-", + "unit": "decbytes" }, - { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": true, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "pod" + }, + "properties": [ + { + "id": "custom.width" + } + ] }, - "format": "percent", - "name": "Free SWAP", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": ".* Free Swap", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "red|orange|green", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "40,80", - "time_based_thresholds": [], - "tooltipTemplate": "Series : _series_
Row Name : _row_name_
Col Name : _col_name_
Value : _value_", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "current" + { + "matcher": { + "id": "byName", + "options": "Value #D" + }, + "properties": [ + { + "id": "custom.displayMode", + "value": "color-text" + }, + { + "id": "unit", + "value": "percent" + } + ] + } + ] + }, + "transformations": [ + { + "id": "merge", + "options": {} }, { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": false, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" - }, - "format": "decbytes", - "name": "Swap Limit", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": ".* Swap Limit", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "red|orange|green", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "70,90", - "time_based_thresholds": [], - "tooltipTemplate": "Series : _series_
Row Name : _row_name_
Col Name : _col_name_
Value : _value_", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "avg" + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "agent_id": true, + "agent_type": true, + "environment": true, + "instance": true, + "job": true, + "machine_id": true, + "node_id": true, + "node_name": true, + "node_type": true + }, + "indexByName": { + "Time": 0, + "Value #B": 3, + "Value #D": 2, + "pod": 1 + }, + "renameByName": { + "Value #A": "", + "Value #B": "Used", + "Value #D": "Swap Limit", + "pod": "Pod" + } + } } ], - "pluginVersion": "7.5.6", - "row_col_wrapper": "_", - "sorting_props": { - "col_index": -1, - "direction": "desc" - }, "targets": [ { + "editorMode": "code", "exemplar": true, "expr": "avg by (pod)(container_memory_swap{pod=~\"$pod\"})", + "format": "table", "hide": false, "instant": true, "interval": "$interval", @@ -956,8 +862,10 @@ "refId": "B" }, { + "editorMode": "code", "exemplar": true, "expr": "100 - clamp_max((avg by (pod) (container_memory_swap{pod=~\"$pod\"}) * 100) / avg by (pod) (container_spec_memory_swap_limit_bytes{pod=~\"$pod\"}),100)", + "format": "table", "hide": false, "instant": true, "interval": "$interval", @@ -965,9 +873,10 @@ "refId": "C" }, { + "editorMode": "code", "exemplar": true, "expr": "avg by (pod)(container_spec_memory_swap_limit_bytes{pod=~\"$pod\"})", - "format": "time_series", + "format": "table", "hide": false, "instant": true, "interval": "$interval", @@ -975,8 +884,8 @@ "refId": "D" } ], - "title": "Swap", - "type": "yesoreyeram-boomtable-panel" + "description": "", + "repeat": null }, { "collapsed": true, @@ -1131,154 +1040,140 @@ "type": "row" }, { - "activePatternIndex": 1, - "defaultPattern": { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "transparent", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": false, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" - }, - "format": "decbytes", - "name": "Default Pattern", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": "*", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "red|orange|green", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "70,90", - "time_based_thresholds": [], - "tooltipTemplate": "", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "current" - }, - "default_title_for_rows": "Pod", - "description": "", + "id": 1081, "gridPos": { "h": 14, "w": 12, "x": 0, "y": 21 }, - "id": 1081, - "patterns": [ - { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": true, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" + "type": "table", + "title": "CPU", + "default_title_for_rows": "Pod", + "datasource": "Metrics", + "pluginVersion": "9.2.13", + "options": { + "showHeader": true, + "footer": { + "show": false + } + }, + "fieldConfig": { + "defaults": { + "custom": { + "align": "left", + "displayMode": "auto", + "inspect": false, + "width": 90 + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "color": { + "mode": "continuous-GrYlRd" }, - "format": "percent", - "name": "System Usage", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": ".*System Usage", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "green|orange|red", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "40,80", - "time_based_thresholds": [], - "tooltipTemplate": "Series : _series_
Row Name : _row_name_
Col Name : _col_name_
Value : _value_", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "current" + "noValue": "-", + "unit": "percent", + "decimals": 2 }, - { - "bgColors": "green|orange|red", - "bgColors_overrides": "0->green|2->red|1->yellow", - "clickable_cells_link": "", - "col_name": "_1_", - "decimals": 2, - "defaultBGColor": "", - "defaultTextColor": "", - "delimiter": "|", - "displayTemplate": "_value_", - "enable_bgColor": false, - "enable_bgColor_overrides": false, - "enable_clickable_cells": false, - "enable_textColor": true, - "enable_textColor_overrides": false, - "enable_time_based_thresholds": false, - "enable_transform": false, - "enable_transform_overrides": false, - "filter": { - "value_above": "", - "value_below": "" + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Pod" + }, + "properties": [ + { + "id": "custom.width" + } + ] }, - "format": "percent", - "name": "User Usage", - "null_color": "", - "null_textcolor": "white", - "null_value": "-", - "pattern": ".*User Usage", - "row_col_wrapper": "_", - "row_name": "_0_", - "textColors": "green|orange|red", - "textColors_overrides": "0->red|2->green|1->yellow", - "thresholds": "40,80", - "time_based_thresholds": [], - "tooltipTemplate": "Series : _series_
Row Name : _row_name_
Col Name : _col_name_
Value : _value_", - "transform_values": "_value_|_value_|_value_", - "transform_values_overrides": "0->down|1->up", - "valueName": "current" + { + "matcher": { + "id": "byName", + "options": "Value #A" + }, + "properties": [ + { + "id": "custom.width", + "value": 110 + }, + { + "id": "custom.displayMode", + "value": "color-text" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Value #B" + }, + "properties": [ + { + "id": "custom.displayMode", + "value": "color-text" + } + ] + } + ] + }, + "transformations": [ + { + "id": "merge", + "options": {} + }, + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "agent_id": true, + "agent_type": true, + "environment": true, + "instance": true, + "job": true, + "machine_id": true, + "node_id": true, + "node_name": true, + "node_type": true + }, + "indexByName": {}, + "renameByName": { + "Value #A": "System Usage", + "Value #B": "User Usage", + "pod": "Pod" + } + } } ], - "pluginVersion": "7.5.6", - "row_col_wrapper": "_", - "sorting_props": { - "col_index": -1, - "direction": "desc" - }, "targets": [ { + "editorMode": "code", "exemplar": true, "expr": "avg by (pod)(container_cpu_system_seconds_total{pod=~\"$pod\"} * 100) / avg by (pod) (container_cpu_usage_seconds_total{pod=~\"$pod\"})", - "format": "time_series", + "format": "table", "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | System Usage", "refId": "A" }, { + "editorMode": "code", "exemplar": true, "expr": "avg by (pod)(container_cpu_user_seconds_total{pod=~\"$pod\"} * 100) / avg by (pod) (container_cpu_usage_seconds_total{pod=~\"$pod\"})", + "format": "table", "hide": false, "instant": true, "interval": "$interval", @@ -1286,9 +1181,10 @@ "refId": "B" }, { + "editorMode": "code", "exemplar": true, "expr": "avg by (pod)(container_spec_memory_swap_limit_bytes{pod=~\"$pod\"})", - "format": "time_series", + "format": "table", "hide": true, "instant": true, "interval": "$interval", @@ -1296,8 +1192,7 @@ "refId": "D" } ], - "title": "CPU", - "type": "yesoreyeram-boomtable-panel" + "description": "" }, { "aliasColors": {}, From 6a28443a59fd578a14530a43d896bd5064517b1b Mon Sep 17 00:00:00 2001 From: Yash Sartanpara Date: Tue, 13 Jun 2023 12:47:49 +0530 Subject: [PATCH 2/6] PMM-12070 add datasource --- .../Experimental/DB_Cluster_Summary.json | 101 +++++++++++++++++- 1 file changed, 97 insertions(+), 4 deletions(-) diff --git a/dashboards/Experimental/DB_Cluster_Summary.json b/dashboards/Experimental/DB_Cluster_Summary.json index 463c4eb763..7fbaae8e56 100644 --- a/dashboards/Experimental/DB_Cluster_Summary.json +++ b/dashboards/Experimental/DB_Cluster_Summary.json @@ -563,7 +563,7 @@ "title": "RAM", "default_title_for_rows": "Pod", "datasource": "Metrics", - "pluginVersion": "9.2.13", + "pluginVersion": "9.2.18", "description": "", "options": { "showHeader": true, @@ -675,6 +675,7 @@ "Value #A": "RAM Limit", "Value #B": "Used", "Value #C": "Free RAM", + "Value #D": "Swap Limit", "pod": "Pod" } } @@ -689,6 +690,15 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | RAM Limit", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "A" }, { @@ -700,6 +710,15 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Used", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "B" }, { @@ -711,6 +730,15 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Free RAM", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "C" }, { @@ -722,6 +750,15 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Swap Limit", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "D" } ] @@ -738,7 +775,7 @@ "title": "Swap", "default_title_for_rows": "Pod", "datasource": "Metrics", - "pluginVersion": "9.2.13", + "pluginVersion": "9.2.18", "options": { "showHeader": true, "footer": { @@ -844,6 +881,7 @@ "Value #A": "", "Value #B": "Used", "Value #D": "Swap Limit", + "Value #C": "Free Swap", "pod": "Pod" } } @@ -859,6 +897,15 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Used", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "B" }, { @@ -866,10 +913,19 @@ "exemplar": true, "expr": "100 - clamp_max((avg by (pod) (container_memory_swap{pod=~\"$pod\"}) * 100) / avg by (pod) (container_spec_memory_swap_limit_bytes{pod=~\"$pod\"}),100)", "format": "table", - "hide": false, + "hide": true, "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Free Swap", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "C" }, { @@ -881,6 +937,15 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Swap Limit", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "D" } ], @@ -1051,7 +1116,7 @@ "title": "CPU", "default_title_for_rows": "Pod", "datasource": "Metrics", - "pluginVersion": "9.2.13", + "pluginVersion": "9.2.18", "options": { "showHeader": true, "footer": { @@ -1153,6 +1218,7 @@ "renameByName": { "Value #A": "System Usage", "Value #B": "User Usage", + "Value #D": "Swap Limit", "pod": "Pod" } } @@ -1167,6 +1233,15 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | System Usage", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "A" }, { @@ -1178,6 +1253,15 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | User Usage", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "B" }, { @@ -1189,6 +1273,15 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Swap Limit", + "datasource": { + "0": "M", + "1": "e", + "2": "t", + "3": "r", + "4": "i", + "5": "c", + "6": "s" + }, "refId": "D" } ], From a638b04023fc6acb409ecd523e6934bf9d7bf069 Mon Sep 17 00:00:00 2001 From: Yash Sartanpara Date: Tue, 13 Jun 2023 12:55:55 +0530 Subject: [PATCH 3/6] PMM-12070 fix datasource --- .../Experimental/DB_Cluster_Summary.json | 100 ++---------------- 1 file changed, 10 insertions(+), 90 deletions(-) diff --git a/dashboards/Experimental/DB_Cluster_Summary.json b/dashboards/Experimental/DB_Cluster_Summary.json index 7fbaae8e56..cae1615546 100644 --- a/dashboards/Experimental/DB_Cluster_Summary.json +++ b/dashboards/Experimental/DB_Cluster_Summary.json @@ -690,15 +690,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | RAM Limit", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "A" }, { @@ -710,15 +702,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Used", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "B" }, { @@ -730,15 +714,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Free RAM", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "C" }, { @@ -750,15 +726,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Swap Limit", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "D" } ] @@ -897,15 +865,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Used", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "B" }, { @@ -917,15 +877,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Free Swap", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "C" }, { @@ -937,15 +889,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Swap Limit", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "D" } ], @@ -1233,15 +1177,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | System Usage", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "A" }, { @@ -1253,15 +1189,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | User Usage", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "B" }, { @@ -1273,15 +1201,7 @@ "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Swap Limit", - "datasource": { - "0": "M", - "1": "e", - "2": "t", - "3": "r", - "4": "i", - "5": "c", - "6": "s" - }, + "datasource": "Metrics", "refId": "D" } ], From 6e83e7e5c84c4efbc76d7b302d85b1458170d325 Mon Sep 17 00:00:00 2001 From: Yash Sartanpara Date: Mon, 26 Jun 2023 15:25:36 +0530 Subject: [PATCH 4/6] PMM-12070 fix thresold colors --- dashboards/Experimental/DB_Cluster_Summary.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dashboards/Experimental/DB_Cluster_Summary.json b/dashboards/Experimental/DB_Cluster_Summary.json index cae1615546..ffb3b32958 100644 --- a/dashboards/Experimental/DB_Cluster_Summary.json +++ b/dashboards/Experimental/DB_Cluster_Summary.json @@ -598,6 +598,10 @@ "color": "red", "value": null }, + { + "color": "orange", + "value": 40 + }, { "color": "green", "value": 80 @@ -774,9 +778,13 @@ "mode": "absolute", "steps": [ { - "color": "dark-red", + "color": "red", "value": null }, + { + "color": "orange", + "value": 40 + }, { "color": "green", "value": 80 From f703b946e9d0d2a1853799e82efbd5f9704998db Mon Sep 17 00:00:00 2001 From: Yash Sartanpara Date: Thu, 27 Jul 2023 13:52:52 +0530 Subject: [PATCH 5/6] PMM-12070 Fix hidden column --- .../Experimental/DB_Cluster_Summary.json | 68 ++++++++++++++----- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/dashboards/Experimental/DB_Cluster_Summary.json b/dashboards/Experimental/DB_Cluster_Summary.json index ffb3b32958..193983f51e 100644 --- a/dashboards/Experimental/DB_Cluster_Summary.json +++ b/dashboards/Experimental/DB_Cluster_Summary.json @@ -563,7 +563,7 @@ "title": "RAM", "default_title_for_rows": "Pod", "datasource": "Metrics", - "pluginVersion": "9.2.18", + "pluginVersion": "9.2.20", "description": "", "options": { "showHeader": true, @@ -747,7 +747,7 @@ "title": "Swap", "default_title_for_rows": "Pod", "datasource": "Metrics", - "pluginVersion": "9.2.18", + "pluginVersion": "9.2.20", "options": { "showHeader": true, "footer": { @@ -764,23 +764,27 @@ }, "mappings": [ { + "type": "value", "options": { "0": { + "text": "-", "color": "text", - "index": 0, - "text": "-" + "index": 0 } - }, - "type": "value" + } } ], "thresholds": { "mode": "absolute", "steps": [ { - "color": "red", + "color": "text", "value": null }, + { + "value": 0, + "color": "red" + }, { "color": "orange", "value": 40 @@ -794,8 +798,9 @@ "color": { "mode": "fixed" }, - "noValue": "-", - "unit": "decbytes" + "unit": "decbytes", + "noValue": "undefined", + "decimals": 2 }, "overrides": [ { @@ -815,13 +820,43 @@ "options": "Value #D" }, "properties": [ + { + "id": "unit", + "value": "decbytes" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Value #C" + }, + "properties": [ + { + "id": "unit", + "value": "percent" + }, { "id": "custom.displayMode", "value": "color-text" }, + { + "id": "color", + "value": { + "mode": "thresholds" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Value #B" + }, + "properties": [ { "id": "unit", - "value": "percent" + "value": "decbytes" } ] } @@ -849,15 +884,16 @@ }, "indexByName": { "Time": 0, - "Value #B": 3, - "Value #D": 2, - "pod": 1 + "pod": 1, + "Value #C": 2, + "Value #D": 3, + "Value #B": 4 }, "renameByName": { "Value #A": "", "Value #B": "Used", - "Value #D": "Swap Limit", "Value #C": "Free Swap", + "Value #D": "Swap Limit", "pod": "Pod" } } @@ -881,7 +917,7 @@ "exemplar": true, "expr": "100 - clamp_max((avg by (pod) (container_memory_swap{pod=~\"$pod\"}) * 100) / avg by (pod) (container_spec_memory_swap_limit_bytes{pod=~\"$pod\"}),100)", "format": "table", - "hide": true, + "hide": false, "instant": true, "interval": "$interval", "legendFormat": "{{pod}} | Free Swap", @@ -1068,7 +1104,7 @@ "title": "CPU", "default_title_for_rows": "Pod", "datasource": "Metrics", - "pluginVersion": "9.2.18", + "pluginVersion": "9.2.20", "options": { "showHeader": true, "footer": { From 2b54383503906d11aff58bbe4c5d5d011c4ff0f3 Mon Sep 17 00:00:00 2001 From: Yash Sartanpara Date: Mon, 31 Jul 2023 15:33:39 +0530 Subject: [PATCH 6/6] PMM-12070 fix null value indicator --- dashboards/Experimental/DB_Cluster_Summary.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboards/Experimental/DB_Cluster_Summary.json b/dashboards/Experimental/DB_Cluster_Summary.json index 193983f51e..3200a611c9 100644 --- a/dashboards/Experimental/DB_Cluster_Summary.json +++ b/dashboards/Experimental/DB_Cluster_Summary.json @@ -799,7 +799,7 @@ "mode": "fixed" }, "unit": "decbytes", - "noValue": "undefined", + "noValue": "-", "decimals": 2 }, "overrides": [