From 1951284ff76b82f800fcb55c0ad343f411b0d457 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Thu, 27 Jun 2024 11:44:21 +0800 Subject: [PATCH] More dashboard updates --- .../grafana/coherence-dashboard-main.json | 256 +++++++++--------- .../grafana/grpc-proxy-details-dashboard.json | 7 +- 2 files changed, 134 insertions(+), 129 deletions(-) diff --git a/dashboards/grafana/coherence-dashboard-main.json b/dashboards/grafana/coherence-dashboard-main.json index 2ca674c2..32dbcd93 100644 --- a/dashboards/grafana/coherence-dashboard-main.json +++ b/dashboards/grafana/coherence-dashboard-main.json @@ -47,16 +47,6 @@ "graphTooltip": 0, "id": 21, "links": [ - { - "icon": "dashboard", - "includeVars": true, - "keepTime": true, - "tags": [], - "title": "Manage Alerts", - "tooltip": "", - "type": "link", - "url": "/d/coh-alerts" - }, { "asDropdown": true, "icon": "external link", @@ -97,7 +87,7 @@ "type": "text" }, { - "collapsed": true, + "collapsed": false, "datasource": "prometheus", "gridPos": { "h": 1, @@ -106,55 +96,88 @@ "y": 2 }, "id": 111, - "panels": [ - { - "dashboardFilter": "", - "dashboardTags": [], - "gridPos": { - "h": 6, - "w": 12, - "x": 0, - "y": 3 - }, - "id": 106, - "limit": 10, - "links": [], - "nameFilter": "", - "onlyAlertsOnDashboard": false, - "show": "current", - "sortOrder": 1, - "stateFilter": [ - "alerting" - ], - "title": "Current Alerts", - "type": "alertlist" - }, - { - "dashboardFilter": "", - "dashboardTags": [], - "gridPos": { - "h": 6, - "w": 12, - "x": 12, - "y": 3 - }, - "id": 107, - "limit": 10, - "links": [], - "nameFilter": "", - "onlyAlertsOnDashboard": false, - "show": "changes", - "sortOrder": 1, - "stateFilter": [ - "alerting" - ], - "title": "Recent Alert State Changes", - "type": "alertlist" - } - ], + "panels": [], "title": "Alerts", "type": "row" }, + { + "dashboardFilter": "", + "dashboardTags": [], + "gridPos": { + "h": 6, + "w": 12, + "x": 0, + "y": 3 + }, + "id": 106, + "limit": 10, + "links": [], + "nameFilter": "", + "onlyAlertsOnDashboard": false, + "options": { + "alertInstanceLabelFilter": "", + "alertName": "", + "dashboardAlerts": false, + "groupBy": [], + "groupMode": "default", + "maxItems": 20, + "sortOrder": 1, + "stateFilter": { + "error": true, + "firing": true, + "noData": false, + "normal": false, + "pending": true + }, + "viewMode": "list" + }, + "show": "current", + "sortOrder": 1, + "stateFilter": [ + "alerting" + ], + "title": "Current Alerts", + "type": "alertlist" + }, + { + "dashboardFilter": "", + "dashboardTags": [], + "gridPos": { + "h": 6, + "w": 12, + "x": 12, + "y": 3 + }, + "id": 107, + "limit": 10, + "links": [], + "nameFilter": "", + "onlyAlertsOnDashboard": false, + "options": { + "alertInstanceLabelFilter": "", + "alertName": "", + "dashboardAlerts": false, + "groupBy": [], + "groupMode": "default", + "maxItems": 20, + "sortOrder": 1, + "stateFilter": { + "error": true, + "firing": true, + "noData": false, + "normal": false, + "pending": true + }, + "viewMode": "list" + }, + "show": "changes", + "sortOrder": 1, + "stateFilter": [ + "alerting" + ], + "title": "Recent Alert State Changes", + "type": "alertlist" + }, { "collapsed": false, "datasource": "prometheus", @@ -162,7 +185,7 @@ "h": 1, "w": 24, "x": 0, - "y": 3 + "y": 9 }, "id": 109, "panels": [], @@ -209,7 +232,7 @@ "h": 5, "w": 4, "x": 0, - "y": 4 + "y": 10 }, "id": 95, "links": [ @@ -291,7 +314,7 @@ "h": 5, "w": 4, "x": 4, - "y": 4 + "y": 10 }, "id": 80, "links": [], @@ -370,7 +393,7 @@ "h": 5, "w": 4, "x": 8, - "y": 4 + "y": 10 }, "id": 92, "links": [ @@ -450,7 +473,7 @@ "h": 5, "w": 4, "x": 12, - "y": 4 + "y": 10 }, "id": 55, "links": [], @@ -524,7 +547,7 @@ "h": 5, "w": 4, "x": 16, - "y": 4 + "y": 10 }, "id": 38, "links": [], @@ -603,7 +626,7 @@ "h": 5, "w": 4, "x": 20, - "y": 4 + "y": 10 }, "id": 9, "links": [], @@ -695,7 +718,7 @@ "h": 8, "w": 12, "x": 0, - "y": 9 + "y": 15 }, "id": 14, "links": [], @@ -799,7 +822,7 @@ "h": 8, "w": 12, "x": 12, - "y": 9 + "y": 15 }, "id": 15, "links": [ @@ -1027,7 +1050,7 @@ "h": 7, "w": 12, "x": 0, - "y": 17 + "y": 23 }, "id": 122, "links": [], @@ -1152,7 +1175,7 @@ "h": 7, "w": 12, "x": 12, - "y": 17 + "y": 23 }, "id": 120, "interval": "", @@ -1208,8 +1231,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1272,8 +1294,7 @@ "mode": "absolute", "steps": [ { - "color": "rgba(245, 54, 54, 0.9)", - "value": null + "color": "rgba(245, 54, 54, 0.9)" }, { "color": "rgba(237, 129, 40, 0.89)" @@ -1325,7 +1346,7 @@ "h": 6, "w": 8, "x": 0, - "y": 24 + "y": 30 }, "id": 104, "links": [], @@ -1386,8 +1407,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1506,8 +1526,7 @@ "mode": "absolute", "steps": [ { - "color": "rgba(50, 172, 45, 0.97)", - "value": null + "color": "rgba(50, 172, 45, 0.97)" }, { "color": "rgba(237, 129, 40, 0.89)" @@ -1526,7 +1545,7 @@ "h": 6, "w": 8, "x": 8, - "y": 24 + "y": 30 }, "id": 103, "links": [], @@ -1590,8 +1609,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1710,8 +1728,7 @@ "mode": "absolute", "steps": [ { - "color": "rgba(50, 172, 45, 0.97)", - "value": null + "color": "rgba(50, 172, 45, 0.97)" }, { "color": "rgba(237, 129, 40, 0.89)" @@ -1730,7 +1747,7 @@ "h": 6, "w": 8, "x": 16, - "y": 24 + "y": 30 }, "id": 102, "links": [], @@ -1754,7 +1771,7 @@ "uid": "P1809F7CD0C75ACF3" }, "editorMode": "code", - "expr": "topk($TopLimit, avg(avg_over_time(coherence_memory_heap_after_gc_used{cluster=\"${ClusterName:raw}\"}[$__range]) / avg_over_time(coherence_memory_heap_memory_usage_max{cluster=\"${ClusterName:raw}\"}[$__range])) by (member))", + "expr": "topk($TopLimit, avg(avg_over_time(coherence_memory_heap_memory_usage_used{cluster=\"${ClusterName:raw}\"}[$__range]) / avg_over_time(coherence_memory_heap_memory_usage_max{cluster=\"${ClusterName:raw}\"}[$__range])) by (member))", "format": "table", "instant": true, "interval": "", @@ -1796,8 +1813,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1912,7 +1928,7 @@ "h": 6, "w": 8, "x": 0, - "y": 30 + "y": 36 }, "id": 74, "links": [], @@ -1975,8 +1991,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2087,7 +2102,7 @@ "h": 6, "w": 8, "x": 8, - "y": 30 + "y": 36 }, "id": 119, "links": [], @@ -2152,8 +2167,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2264,7 +2278,7 @@ "h": 6, "w": 8, "x": 16, - "y": 30 + "y": 36 }, "id": 73, "links": [], @@ -2349,8 +2363,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2366,7 +2379,7 @@ "h": 8, "w": 8, "x": 0, - "y": 36 + "y": 42 }, "id": 114, "links": [ @@ -2450,8 +2463,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2467,7 +2479,7 @@ "h": 8, "w": 8, "x": 8, - "y": 36 + "y": 42 }, "id": 113, "links": [ @@ -2553,8 +2565,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2591,7 +2602,7 @@ "h": 8, "w": 8, "x": 16, - "y": 36 + "y": 42 }, "id": 118, "links": [ @@ -2651,8 +2662,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2711,8 +2721,7 @@ "mode": "absolute", "steps": [ { - "color": "rgba(50, 172, 45, 0.97)", - "value": null + "color": "rgba(50, 172, 45, 0.97)" }, { "color": "rgba(237, 129, 40, 0.89)", @@ -2766,7 +2775,7 @@ "h": 6, "w": 12, "x": 0, - "y": 44 + "y": 50 }, "id": 52, "links": [], @@ -2826,8 +2835,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2938,7 +2946,7 @@ "h": 6, "w": 12, "x": 12, - "y": 44 + "y": 50 }, "id": 75, "links": [], @@ -2998,8 +3006,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3157,7 +3164,7 @@ "h": 6, "w": 12, "x": 0, - "y": 50 + "y": 56 }, "id": 86, "links": [], @@ -3217,8 +3224,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3376,7 +3382,7 @@ "h": 6, "w": 12, "x": 12, - "y": 50 + "y": 56 }, "id": 85, "links": [], @@ -3462,8 +3468,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3479,7 +3484,7 @@ "h": 8, "w": 12, "x": 0, - "y": 56 + "y": 62 }, "id": 116, "links": [], @@ -3563,8 +3568,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3580,7 +3584,7 @@ "h": 8, "w": 12, "x": 12, - "y": 56 + "y": 62 }, "id": 117, "links": [], @@ -3623,8 +3627,8 @@ { "current": { "selected": false, - "text": "mainp", - "value": "mainp" + "text": "main-grpc", + "value": "main-grpc" }, "datasource": { "type": "prometheus", @@ -3712,7 +3716,7 @@ }, { "current": { - "selected": false, + "selected": true, "text": [ "All" ], @@ -3820,6 +3824,6 @@ "timezone": "", "title": "Coherence Dashboard Main", "uid": "coh-main", - "version": 16, + "version": 18, "weekStart": "" } \ No newline at end of file diff --git a/dashboards/grafana/grpc-proxy-details-dashboard.json b/dashboards/grafana/grpc-proxy-details-dashboard.json index 2a2cf630..18abb6e5 100644 --- a/dashboards/grafana/grpc-proxy-details-dashboard.json +++ b/dashboards/grafana/grpc-proxy-details-dashboard.json @@ -311,7 +311,8 @@ "cellOptions": { "type": "auto" }, - "inspect": false + "inspect": false, + "minWidth": 50 }, "mappings": [], "thresholds": { @@ -513,7 +514,7 @@ }, { "id": "unit", - "value": "short" + "value": "string" }, { "id": "decimals", @@ -1146,6 +1147,6 @@ "timezone": "", "title": "Coherence gRPC Proxy Details Dashboard", "uid": "coh-grpc-proxy-details", - "version": 3, + "version": 4, "weekStart": "" } \ No newline at end of file