Add Lua memory panel and memory miscellaneous row

Closes #54

Author: DifferentialOrange

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## Added
+- Memory miscellaneous row with Lua memory panel
+
+## Changed
+- Rename memory overview row
+
 ## [0.2.2] - 2021-01-28
 Grafana revisions: [Prometheus revision 3](https://grafana.com/api/dashboards/13054/revisions/3/download)
 

doc/monitoring/images/Prometheus_dashboard_1.png

@@ -1,6 +1,7 @@
 local grafana = import 'grafonnet/grafana.libsonnet';
 
 local http = import 'http.libsonnet';
+local memory_misc = import 'memory_misc.libsonnet';
 local slab = import 'slab.libsonnet';
 local space = import 'space.libsonnet';
 local row = grafana.row;
@@ -96,7 +97,7 @@ local row = grafana.row;
       { w: 8, h: 8, x: 16, y: 9 + offset },
     )
     .addPanel(
-      row.new(title='Tarantool memory overview'),
+      row.new(title='Tarantool memory allocation overview'),
       { w: 24, h: 1, x: 0, y: 17 + offset }
     )
     .addPanel(
@@ -185,9 +186,22 @@ local row = grafana.row;
       { w: 8, h: 8, x: 16, y: 37 + offset },
     )
     .addPanel(
-      row.new(title='Tarantool spaces statistics'),
+      row.new(title='Tarantool memory miscellaneous'),
       { w: 24, h: 1, x: 0, y: 45 + offset }
     )
+    .addPanel(
+      memory_misc.lua_memory(
+        datasource=datasource,
+        policy=policy,
+        measurement=measurement,
+        job=job,
+      ),
+      { w: 24, h: 8, x: 0, y: 46 + offset },
+    )
+    .addPanel(
+      row.new(title='Tarantool spaces statistics'),
+      { w: 24, h: 1, x: 0, y: 54 + offset }
+    )
     .addPanel(
       space.select_rps(
         datasource=datasource,
@@ -196,7 +210,7 @@ local row = grafana.row;
         job=job,
         rate_time_range=rate_time_range,
       ),
-      { w: 8, h: 8, x: 0, y: 46 + offset },
+      { w: 8, h: 8, x: 0, y: 55 + offset },
     )
     .addPanel(
       space.insert_rps(
@@ -206,7 +220,7 @@ local row = grafana.row;
         job=job,
         rate_time_range=rate_time_range,
       ),
-      { w: 8, h: 8, x: 8, y: 46 + offset },
+      { w: 8, h: 8, x: 8, y: 55 + offset },
     )
     .addPanel(
       space.replace_rps(
@@ -216,7 +230,7 @@ local row = grafana.row;
         job=job,
         rate_time_range=rate_time_range,
       ),
-      { w: 8, h: 8, x: 16, y: 46 + offset },
+      { w: 8, h: 8, x: 16, y: 55 + offset },
     )
     .addPanel(
       space.upsert_rps(
@@ -226,7 +240,7 @@ local row = grafana.row;
         job=job,
         rate_time_range=rate_time_range,
       ),
-      { w: 8, h: 8, x: 0, y: 46 + offset },
+      { w: 8, h: 8, x: 0, y: 63 + offset },
     )
     .addPanel(
       space.update_rps(
@@ -236,7 +250,7 @@ local row = grafana.row;
         job=job,
         rate_time_range=rate_time_range,
       ),
-      { w: 8, h: 8, x: 8, y: 46 + offset },
+      { w: 8, h: 8, x: 8, y: 63 + offset },
     )
     .addPanel(
       space.delete_rps(
@@ -246,6 +260,6 @@ local row = grafana.row;
         job=job,
         rate_time_range=rate_time_range,
       ),
-      { w: 8, h: 8, x: 16, y: 46 + offset },
+      { w: 8, h: 8, x: 16, y: 63 + offset },
     ),
 }

doc/monitoring/images/Prometheus_dashboard_2.png

@@ -0,0 +1,64 @@
+local grafana = import 'grafonnet/grafana.libsonnet';
+
+local graph = grafana.graphPanel;
+local influxdb = grafana.influxdb;
+local prometheus = grafana.prometheus;
+
+{
+  local memory_panel(
+    title,
+    description,
+    datasource,
+    policy,
+    measurement,
+    job,
+    metric_name,
+  ) = graph.new(
+    title=title,
+    description=description,
+    datasource=datasource,
+
+    format='bytes',
+    labelY1='in bytes',
+    fill=0,
+    decimals=2,
+    sort='decreasing',
+    legend_alignAsTable=true,
+    legend_current=true,
+    legend_values=true,
+    legend_sort='current',
+    legend_sortDesc=true,
+  ).addTarget(
+    if datasource == '${DS_PROMETHEUS}' then
+      prometheus.target(
+        expr=std.format('%s{job=~"%s"}', [metric_name, job]),
+        legendFormat='{{alias}}',
+      )
+    else if datasource == '${DS_INFLUXDB}' then
+      influxdb.target(
+        policy=policy,
+        measurement=measurement,
+        group_tags=['label_pairs_alias'],
+        alias='$tag_label_pairs_alias',
+      ).where('metric_name', '=', metric_name).selectField('value').addConverter('mean')
+  ),
+
+  lua_memory(
+    title='Lua runtime',
+    description=|||
+      Memory used for the Lua runtime. Lua memory is bounded by 2 GB per instance. 
+    |||,
+    datasource=null,
+    policy=null,
+    measurement=null,
+    job=null,
+  ):: memory_panel(
+    title=title,
+    description=description,
+    datasource=datasource,
+    policy=policy,
+    measurement=measurement,
+    job=job,
+    metric_name='tnt_info_memory_lua',
+  ),
+}