replace prometheus targets by common

Author: patapenka-alexey

dashboard/panels/cpu.libsonnet

@@ -105,6 +105,13 @@ local prometheus = grafana.prometheus;
         }),
         alias='$tag_label_pairs_name — $tag_label_pairs_alias'
       ),
+  ).addTarget(
+    if cfg.type == variable.datasource_type.prometheus then
+      prometheus.target(
+        expr='sum(rate(tnt_cpu_user_time{job=~"$job"}[$__rate_interval])) + sum(rate(tnt_cpu_system_time{job=~"$job"}[$__rate_interval]))',
+      )
+    else if cfg.type == variable.datasource_type.influxdb then
+      influxdb.target()
   ),
 
   getrusage_cpu_total_time(

dashboard/panels/runtime.libsonnet

@@ -27,7 +27,7 @@ local variable = import 'dashboard/variable.libsonnet';
 
   total_memory(
     cfg,
-    title='Total memory',
+    title='Total memory usage',
     description=|||
       Total memory used by Tarantool.
     |||,
@@ -41,7 +41,7 @@ local variable = import 'dashboard/variable.libsonnet';
   ).addTarget(
     if cfg.type == variable.datasource_type.prometheus then
       prometheus.target(
-        expr='sum(tnt_memory{job=~"$job"}) + sum(tnt_memory_virt{job=~"$job"}'),
+        expr='sum(tnt_memory{job=~"$job"}) + sum(tnt_memory_virt{job=~"$job"})',
         legendFormat='{{alias}}',
       )
     else if cfg.type == variable.datasource_type.influxdb then
@@ -64,10 +64,7 @@ local variable = import 'dashboard/variable.libsonnet';
   ).addTarget(
     common.target(cfg, 'tnt_memory')
   ).addTarget(
-    if cfg.type == variable.datasource_type.prometheus then
-      prometheus.target(expr=aggregate_expr(cfg, 'tnt_memory'),)
-    else if cfg.type == variable.datasource_type.influxdb then
-      influxdb.target()
+    common.target(cfg, 'sum(tnt_memory{job=~"$job"})'),
   ),
 
   virt_memory(
@@ -86,10 +83,7 @@ local variable = import 'dashboard/variable.libsonnet';
   ).addTarget(
     common.target(cfg, 'tnt_memory_virt')
   ).addTarget(
-    if cfg.type == variable.datasource_type.prometheus then
-      prometheus.target(expr=aggregate_expr(cfg, 'tnt_memory_virt'),)
-    else if cfg.type == variable.datasource_type.influxdb then
-      influxdb.target()
+    common.target(cfg, 'sum(tnt_memory_virt{job=~"$job"})'),
   ),
 
   lua_memory(