From de4ac8980059bcf0947ae5ed1014e8ddfded652c Mon Sep 17 00:00:00 2001
From: rpereira2 <rpereira@gitlab.com>
Date: Tue, 2 Jun 2020 00:15:17 +0530
Subject: [PATCH] Add charts showing CPU and memory usage
Add charts showing the CPU and memory usage of each instance to the
self monitoring default dashboard.
---
.../unreleased/212882-add-cpu-mem-charts.yml | 5 +++++
config/prometheus/self_monitoring_default.yml | 21 +++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 changelogs/unreleased/212882-add-cpu-mem-charts.yml
diff --git a/changelogs/unreleased/212882-add-cpu-mem-charts.yml b/changelogs/unreleased/212882-add-cpu-mem-charts.yml
new file mode 100644
index 0000000000000..52e645cead787
--- /dev/null
+++ b/changelogs/unreleased/212882-add-cpu-mem-charts.yml
@@ -0,0 +1,5 @@
+---
+title: Add CPU, memory usage charts to self monitoring default dashboard
+merge_request: 33532
+author:
+type: changed
diff --git a/config/prometheus/self_monitoring_default.yml b/config/prometheus/self_monitoring_default.yml
index dc2361fb3bc5c..53b47274ecd71 100644
--- a/config/prometheus/self_monitoring_default.yml
+++ b/config/prometheus/self_monitoring_default.yml
@@ -1,6 +1,27 @@
dashboard: 'Default dashboard'
priority: 1
panel_groups:
+
+- group: 'Resource usage'
+ panels:
+ - title: "Memory usage"
+ type: "line-chart"
+ y_label: "% memory used"
+ metrics:
+ - id: node_memory_usage_percentage
+ query_range: '(1 - (node_memory_MemAvailable_bytes or node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes + node_memory_Slab_bytes) / node_memory_MemTotal_bytes) * 100'
+ unit: "%"
+ label: instance
+
+ - title: "CPU usage"
+ type: "line-chart"
+ y_label: "% CPU used"
+ metrics:
+ - id: node_cpu_usage_percentage
+ query_range: '(avg without (mode,cpu) (1 - irate(node_cpu_seconds_total{mode="idle"}[5m]))) * 100'
+ unit: "%"
+ label: instance
+
- group: Web Service
panels:
- title: Web Service - Error Ratio
--
GitLab