Merge pull request #100 from tarantool/99-cpu-in-percents

Show CPU time in percents

Author: DifferentialOrange

CHANGELOG.md

@@ -4,6 +4,12 @@ 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
+
+### Changed
+- Show CPU time in percents
+
+
 ## [0.3.1] - 2021-07-08
 Grafana revisions: [InfluxDB revision 6](https://grafana.com/api/dashboards/12567/revisions/6/download), [Prometheus revision 6](https://grafana.com/api/dashboards/13054/revisions/6/download)
 

dashboard/panels/cpu.libsonnet

@@ -3,7 +3,7 @@ local common = import 'common.libsonnet';
 {
   row:: common.row('Tarantool CPU statistics'),
 
-  local getrusage_cpu_time_graph(
+  local getrusage_cpu_percentage_graph(
     title,
     description,
     datasource,
@@ -16,9 +16,8 @@ local common = import 'common.libsonnet';
     title=title,
     description=description,
     datasource=datasource,
-    format='s',
-    labelY1='time per minute',
-    decimalsY1=3,
+    format='percentunit',
+    decimalsY1=0,
     min=0,
     panel_width=12,
   ).addTarget(common.default_rps_target(
@@ -34,7 +33,7 @@ local common = import 'common.libsonnet';
     title='CPU user time',
     description=|||
       Panel works with `metrics >= 0.8.0`.
-      This is the average amount of time per minute
+      This is the average share of time
       spent by instance process executing in user mode.
       Metrics obtained using `getrusage()` call.
       If `No data` displayed for Prometheus panel,
@@ -45,7 +44,7 @@ local common = import 'common.libsonnet';
     measurement=null,
     job=null,
     rate_time_range=null,
-  ):: getrusage_cpu_time_graph(
+  ):: getrusage_cpu_percentage_graph(
     title=title,
     description=description,
     datasource=datasource,
@@ -60,7 +59,7 @@ local common = import 'common.libsonnet';
     title='CPU system time',
     description=|||
       Panel works with `metrics >= 0.8.0`.
-      This is the average amount of time per minute
+      This is the average share of time
       spent by instance process executing in kernel mode.
       Metrics obtained using `getrusage()` call.
       If `No data` displayed for Prometheus panel,
@@ -71,7 +70,7 @@ local common = import 'common.libsonnet';
     measurement=null,
     job=null,
     rate_time_range=null,
-  ):: getrusage_cpu_time_graph(
+  ):: getrusage_cpu_percentage_graph(
     title=title,
     description=description,
     datasource=datasource,

tests/InfluxDB/dashboard_compiled.json

@@ -5296,7 +5296,7 @@
          "dashes": false,
          "datasource": "${DS_INFLUXDB}",
          "decimals": 3,
-         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average amount of time per minute\nspent by instance process executing in user mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
+         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average share of time\nspent by instance process executing in user mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
          "fill": 0,
          "gridPos": {
             "h": 8,
@@ -5407,17 +5407,17 @@
          },
          "yaxes": [
             {
-               "decimals": 3,
-               "format": "s",
-               "label": "time per minute",
+               "decimals": 0,
+               "format": "percentunit",
+               "label": null,
                "logBase": 1,
                "max": null,
                "min": 0,
                "show": true
             },
             {
                "decimals": 3,
-               "format": "s",
+               "format": "percentunit",
                "label": null,
                "logBase": 1,
                "max": null,
@@ -5433,7 +5433,7 @@
          "dashes": false,
          "datasource": "${DS_INFLUXDB}",
          "decimals": 3,
-         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average amount of time per minute\nspent by instance process executing in kernel mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
+         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average share of time\nspent by instance process executing in kernel mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
          "fill": 0,
          "gridPos": {
             "h": 8,
@@ -5544,17 +5544,17 @@
          },
          "yaxes": [
             {
-               "decimals": 3,
-               "format": "s",
-               "label": "time per minute",
+               "decimals": 0,
+               "format": "percentunit",
+               "label": null,
                "logBase": 1,
                "max": null,
                "min": 0,
                "show": true
             },
             {
                "decimals": 3,
-               "format": "s",
+               "format": "percentunit",
                "label": null,
                "logBase": 1,
                "max": null,

tests/InfluxDB/dashboard_with_custom_panels_compiled.json

@@ -5296,7 +5296,7 @@
          "dashes": false,
          "datasource": "${DS_INFLUXDB}",
          "decimals": 3,
-         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average amount of time per minute\nspent by instance process executing in user mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
+         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average share of time\nspent by instance process executing in user mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
          "fill": 0,
          "gridPos": {
             "h": 8,
@@ -5407,17 +5407,17 @@
          },
          "yaxes": [
             {
-               "decimals": 3,
-               "format": "s",
-               "label": "time per minute",
+               "decimals": 0,
+               "format": "percentunit",
+               "label": null,
                "logBase": 1,
                "max": null,
                "min": 0,
                "show": true
             },
             {
                "decimals": 3,
-               "format": "s",
+               "format": "percentunit",
                "label": null,
                "logBase": 1,
                "max": null,
@@ -5433,7 +5433,7 @@
          "dashes": false,
          "datasource": "${DS_INFLUXDB}",
          "decimals": 3,
-         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average amount of time per minute\nspent by instance process executing in kernel mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
+         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average share of time\nspent by instance process executing in kernel mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
          "fill": 0,
          "gridPos": {
             "h": 8,
@@ -5544,17 +5544,17 @@
          },
          "yaxes": [
             {
-               "decimals": 3,
-               "format": "s",
-               "label": "time per minute",
+               "decimals": 0,
+               "format": "percentunit",
+               "label": null,
                "logBase": 1,
                "max": null,
                "min": 0,
                "show": true
             },
             {
                "decimals": 3,
-               "format": "s",
+               "format": "percentunit",
                "label": null,
                "logBase": 1,
                "max": null,

tests/Prometheus/dashboard_compiled.json

@@ -3904,7 +3904,7 @@
          "dashes": false,
          "datasource": "${DS_PROMETHEUS}",
          "decimals": 3,
-         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average amount of time per minute\nspent by instance process executing in user mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
+         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average share of time\nspent by instance process executing in user mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
          "fill": 0,
          "gridPos": {
             "h": 8,
@@ -3968,17 +3968,17 @@
          },
          "yaxes": [
             {
-               "decimals": 3,
-               "format": "s",
-               "label": "time per minute",
+               "decimals": 0,
+               "format": "percentunit",
+               "label": null,
                "logBase": 1,
                "max": null,
                "min": 0,
                "show": true
             },
             {
                "decimals": 3,
-               "format": "s",
+               "format": "percentunit",
                "label": null,
                "logBase": 1,
                "max": null,
@@ -3994,7 +3994,7 @@
          "dashes": false,
          "datasource": "${DS_PROMETHEUS}",
          "decimals": 3,
-         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average amount of time per minute\nspent by instance process executing in kernel mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
+         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average share of time\nspent by instance process executing in kernel mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
          "fill": 0,
          "gridPos": {
             "h": 8,
@@ -4058,17 +4058,17 @@
          },
          "yaxes": [
             {
-               "decimals": 3,
-               "format": "s",
-               "label": "time per minute",
+               "decimals": 0,
+               "format": "percentunit",
+               "label": null,
                "logBase": 1,
                "max": null,
                "min": 0,
                "show": true
             },
             {
                "decimals": 3,
-               "format": "s",
+               "format": "percentunit",
                "label": null,
                "logBase": 1,
                "max": null,

tests/Prometheus/dashboard_with_custom_panels_compiled.json

@@ -3904,7 +3904,7 @@
          "dashes": false,
          "datasource": "${DS_PROMETHEUS}",
          "decimals": 3,
-         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average amount of time per minute\nspent by instance process executing in user mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
+         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average share of time\nspent by instance process executing in user mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
          "fill": 0,
          "gridPos": {
             "h": 8,
@@ -3968,17 +3968,17 @@
          },
          "yaxes": [
             {
-               "decimals": 3,
-               "format": "s",
-               "label": "time per minute",
+               "decimals": 0,
+               "format": "percentunit",
+               "label": null,
                "logBase": 1,
                "max": null,
                "min": 0,
                "show": true
             },
             {
                "decimals": 3,
-               "format": "s",
+               "format": "percentunit",
                "label": null,
                "logBase": 1,
                "max": null,
@@ -3994,7 +3994,7 @@
          "dashes": false,
          "datasource": "${DS_PROMETHEUS}",
          "decimals": 3,
-         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average amount of time per minute\nspent by instance process executing in kernel mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
+         "description": "Panel works with `metrics >= 0.8.0`.\nThis is the average share of time\nspent by instance process executing in kernel mode.\nMetrics obtained using `getrusage()` call.\nIf `No data` displayed for Prometheus panel,\ncheck up your 'rate_time_range' variable.\n",
          "fill": 0,
          "gridPos": {
             "h": 8,
@@ -4058,17 +4058,17 @@
          },
          "yaxes": [
             {
-               "decimals": 3,
-               "format": "s",
-               "label": "time per minute",
+               "decimals": 0,
+               "format": "percentunit",
+               "label": null,
                "logBase": 1,
                "max": null,
                "min": 0,
                "show": true
             },
             {
                "decimals": 3,
-               "format": "s",
+               "format": "percentunit",
                "label": null,
                "logBase": 1,
                "max": null,