From d4388da8e19509886b160fa504f8eb47371a5c44 Mon Sep 17 00:00:00 2001
From: Feng Liyuan <darktemplar.f@gmail.com>
Date: Wed, 29 Apr 2020 13:58:43 +0800
Subject: [PATCH] metrics/grafana: add more Golang MemStats metrics (#16902)

---
 metrics/grafana/overview.json     | 16 +++++++++----
 metrics/grafana/tidb.json         | 38 +++++++++++++++++++++++++++----
 metrics/grafana/tidb_summary.json | 38 +++++++++++++++++++++++++++----
 3 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/metrics/grafana/overview.json b/metrics/grafana/overview.json
index cdbb836a9fc37..8e86f21377a0b 100644
--- a/metrics/grafana/overview.json
+++ b/metrics/grafana/overview.json
@@ -2167,19 +2167,27 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "go_memstats_heap_inuse_bytes{job=~\"tidb.*\"}",
+              "expr": "process_resident_memory_bytes{job=\"tidb\"}",
+              "format": "time_series",
               "intervalFactor": 2,
-              "legendFormat": "{{instance}}-{{job}}",
-              "metric": "go_memstats_heap_inuse_bytes",
+              "legendFormat": "process-{{instance}}",
               "refId": "A",
               "step": 10
+            },
+            {
+              "expr": "go_memstats_heap_inuse_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapInuse-{{instance}}",
+              "format": "time_series",
+              "intervalFactor": 2,
+              "refId": "B",
+              "step": 10
             }
           ],
           "thresholds": [],
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Heap Memory Usage",
+          "title": "Memory Usage",
           "tooltip": {
             "shared": true,
             "sort": 0,
diff --git a/metrics/grafana/tidb.json b/metrics/grafana/tidb.json
index 3ae3df76e0212..d3878a2588c2d 100644
--- a/metrics/grafana/tidb.json
+++ b/metrics/grafana/tidb.json
@@ -1768,17 +1768,47 @@
             {
               "expr": "process_resident_memory_bytes{job=\"tidb\"}",
               "format": "time_series",
-              "hide": false,
               "intervalFactor": 1,
               "legendFormat": "process-{{instance}}",
               "refId": "A"
             },
+            {
+              "expr": "go_memstats_heap_sys_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapSys-{{instance}}",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "refId": "B",
+              "hide": true
+            },
+            {
+              "expr": "go_memstats_heap_inuse_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapInuse-{{instance}}",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "refId": "C"
+            },
             {
               "expr": "go_memstats_heap_alloc_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapAlloc-{{instance}}",
               "format": "time_series",
               "intervalFactor": 1,
-              "legendFormat": "heap-{{instance}}",
-              "refId": "B"
+              "refId": "D",
+              "hide": true
+            },
+            {
+              "expr": "go_memstats_heap_idle_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapIdle-{{instance}}",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "refId": "E",
+              "hide": true
+            },
+            {
+              "expr": "go_memstats_heap_released_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapReleased-{{instance}}",
+              "interval": "",
+              "refId": "F",
+              "hide": true
             }
           ],
           "thresholds": [],
@@ -11929,4 +11959,4 @@
   "title": "Test-Cluster-TiDB",
   "uid": "000000011",
   "version": 3
-}
\ No newline at end of file
+}
diff --git a/metrics/grafana/tidb_summary.json b/metrics/grafana/tidb_summary.json
index d16191884cb75..4862094826d0c 100644
--- a/metrics/grafana/tidb_summary.json
+++ b/metrics/grafana/tidb_summary.json
@@ -417,17 +417,47 @@
             {
               "expr": "process_resident_memory_bytes{job=\"tidb\"}",
               "format": "time_series",
-              "hide": false,
               "intervalFactor": 1,
               "legendFormat": "process-{{instance}}",
               "refId": "A"
             },
+            {
+              "expr": "go_memstats_heap_sys_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapSys-{{instance}}",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "refId": "B",
+              "hide": true
+            },
+            {
+              "expr": "go_memstats_heap_inuse_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapInuse-{{instance}}",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "refId": "C"
+            },
             {
               "expr": "go_memstats_heap_alloc_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapAlloc-{{instance}}",
               "format": "time_series",
               "intervalFactor": 1,
-              "legendFormat": "heap-{{instance}}",
-              "refId": "B"
+              "refId": "D",
+              "hide": true
+            },
+            {
+              "expr": "go_memstats_heap_idle_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapIdle-{{instance}}",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "refId": "E",
+              "hide": true
+            },
+            {
+              "expr": "go_memstats_heap_released_bytes{job=\"tidb\"}",
+              "legendFormat": "HeapReleased-{{instance}}",
+              "interval": "",
+              "refId": "F",
+              "hide": true
             }
           ],
           "thresholds": [],
@@ -3048,4 +3078,4 @@
   "title": "Test-Cluster-TiDB-Summary",
   "uid": "000000012",
   "version": 1
-}
\ No newline at end of file
+}