From 4a96ed494720db73370a5a99256398cb536e6429 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 13 Mar 2020 17:14:04 +0100 Subject: [PATCH 1/2] Process dashboard: show number of available CPUs Change-Id: Ifbf13edb2dfa8f5cee64aea3f9dca006d419ef20 --- dashboards/gerrit_process.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dashboards/gerrit_process.json b/dashboards/gerrit_process.json index e2e3fe0..6541a79 100644 --- a/dashboards/gerrit_process.json +++ b/dashboards/gerrit_process.json @@ -250,7 +250,13 @@ "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "available CPUs", + "color": "#1F60C4", + "fill": 0 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, @@ -259,6 +265,11 @@ "expr": "rate(proc_cpu_usage{instance=\"$instance\"}[5m])", "legendFormat": "used CPUs", "refId": "A" + }, + { + "expr": "proc_cpu_num_cores{instance=\"$instance\"}", + "legendFormat": "available CPUs", + "refId": "B" } ], "thresholds": [], From 14e7530aab6ed847312748e44c58e5ad09d12fc6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 13 Mar 2020 17:29:34 +0100 Subject: [PATCH 2/2] Process dashboard: add panel showing system load - Rearrange the other panels so that we show system load over cpu usage over threads in the left column. - Reduce height of memory panel a bit Change-Id: Icaada525f87d0df503f67cf688b94d15a4119034 --- dashboards/gerrit_process.json | 302 +++++++++++++++++++++------------ 1 file changed, 195 insertions(+), 107 deletions(-) diff --git a/dashboards/gerrit_process.json b/dashboards/gerrit_process.json index 6541a79..b2851db 100644 --- a/dashboards/gerrit_process.json +++ b/dashboards/gerrit_process.json @@ -23,17 +23,16 @@ "dashLength": 10, "dashes": false, "datasource": null, - "description": "", "fill": 1, "fillGradient": 0, "gridPos": { - "h": 13, + "h": 11, "w": 12, "x": 0, "y": 0 }, "hiddenSeries": false, - "id": 8, + "id": 14, "legend": { "alignAsTable": true, "avg": true, @@ -60,8 +59,8 @@ "steppedLine": false, "targets": [ { - "expr": "proc_jvm_thread_num_live{instance=\"$instance\"}", - "legendFormat": "Java live threads", + "expr": "proc_cpu_system_load{instance=\"$instance\"}", + "legendFormat": "system load", "refId": "A" } ], @@ -69,7 +68,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "Threads", + "title": "System load", "tooltip": { "shared": true, "sort": 0, @@ -86,7 +85,7 @@ "yaxes": [ { "format": "short", - "label": "Live Threads", + "label": null, "logBase": 1, "max": null, "min": null, @@ -115,7 +114,7 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "h": 13, + "h": 11, "w": 12, "x": 12, "y": 0 @@ -224,7 +223,7 @@ "h": 10, "w": 12, "x": 0, - "y": 13 + "y": 11 }, "hiddenSeries": false, "id": 4, @@ -301,7 +300,7 @@ }, { "format": "short", - "label": null, + "label": "", "logBase": 1, "max": null, "min": null, @@ -326,7 +325,7 @@ "h": 10, "w": 12, "x": 12, - "y": 13 + "y": 11 }, "hiddenSeries": false, "id": 6, @@ -423,13 +422,196 @@ "dashLength": 10, "dashes": false, "datasource": null, - "fill": 2, + "description": "", + "fill": 1, "fillGradient": 0, "gridPos": { "h": 10, "w": 12, "x": 0, - "y": 23 + "y": 21 + }, + "hiddenSeries": false, + "id": 8, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "proc_jvm_thread_num_live{instance=\"$instance\"}", + "legendFormat": "Java live threads", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Threads", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": "Live Threads", + "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": null, + "fill": 6, + "fillGradient": 0, + "gridPos": { + "h": 10, + "w": 12, + "x": 12, + "y": 21 + }, + "hiddenSeries": false, + "id": 10, + "interval": "", + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": true, + "steppedLine": false, + "targets": [ + { + "expr": "jgit_block_cache_open_files{instance=\"$instance\"}", + "legendFormat": "jgit block cache", + "refId": "B" + }, + { + "expr": "proc_num_open_fds{instance=\"$instance\"}-jgit_block_cache_open_files{instance=\"$instance\"}", + "legendFormat": "other", + "refId": "C" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Java open file descriptors", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": "Open File Descriptors", + "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": null, + "fill": 2, + "fillGradient": 0, + "gridPos": { + "h": 10, + "w": 12, + "x": 12, + "y": 31 }, "hiddenSeries": false, "id": 12, @@ -525,100 +707,6 @@ "align": false, "alignLevel": 1 } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": null, - "fill": 6, - "fillGradient": 0, - "gridPos": { - "h": 10, - "w": 12, - "x": 12, - "y": 23 - }, - "hiddenSeries": false, - "id": 10, - "interval": "", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "jgit_block_cache_open_files{instance=\"$instance\"}", - "legendFormat": "jgit block cache", - "refId": "B" - }, - { - "expr": "proc_num_open_fds{instance=\"$instance\"}-jgit_block_cache_open_files{instance=\"$instance\"}", - "legendFormat": "other", - "refId": "C" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Java open file descriptors", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": "Open File Descriptors", - "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 - } } ], "refresh": "1m",