tdg_dashboard: use expirationd module metrics

Since TDG 2.6.0, it uses expirationd module metrics instead of
custom TDG 2 expiration metrics [1].

1. tarantool/tdg2@f6c78cf

Closes #164

Author: DifferentialOrange

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Set InfluxDB `measurement` dynamically
 - Set InfluxDB `policy` dynamically
 - Set datasource dynamically
+- Use expirationd module metrics in TDG dashboard
 
 ### Fixed
 - TDG dashboard latency units (graphql, iproto, rest requests)

dashboard/build/influxdb/tdg_dashboard_raw.libsonnet

@@ -160,7 +160,7 @@ function(
     alias=alias,
   )
 ).addPanels(
-  section.tdg_expirationd(
+  section.expirationd(
     datasource_type=variable.datasource_type.influxdb,
     datasource=datasource,
     policy=policy,

dashboard/build/prometheus/tdg_dashboard_raw.libsonnet

@@ -155,7 +155,7 @@ function(
     alias=alias,
   )
 ).addPanels(
-  section.tdg_expirationd(
+  section.expirationd(
     datasource_type=variable.datasource_type.prometheus,
     datasource=datasource,
     job=job,

dashboard/panels/tdg/expirationd.libsonnet

@@ -11,7 +11,6 @@ local slab = import 'dashboard/panels/slab.libsonnet';
 local space = import 'dashboard/panels/space.libsonnet';
 local vinyl = import 'dashboard/panels/vinyl.libsonnet';
 
-local tdg_expirationd = import 'dashboard/panels/tdg/expirationd.libsonnet';
 local tdg_file_connectors = import 'dashboard/panels/tdg/file_connectors.libsonnet';
 local tdg_graphql = import 'dashboard/panels/tdg/graphql.libsonnet';
 local tdg_iproto = import 'dashboard/panels/tdg/iproto.libsonnet';
@@ -2180,46 +2179,6 @@ local tdg_tuples = import 'dashboard/panels/tdg/tuples.libsonnet';
     ),
   ],
 
-  tdg_expirationd(datasource_type, datasource, policy=null, measurement=null, job=null, alias=null):: [
-    tdg_expirationd.row,
-
-    tdg_expirationd.tuples_checked(
-      datasource_type=datasource_type,
-      datasource=datasource,
-      policy=policy,
-      measurement=measurement,
-      job=job,
-      alias=alias,
-    ),
-
-    tdg_expirationd.tuples_expired(
-      datasource_type=datasource_type,
-      datasource=datasource,
-      policy=policy,
-      measurement=measurement,
-      job=job,
-      alias=alias,
-    ),
-
-    tdg_expirationd.restarts(
-      datasource_type=datasource_type,
-      datasource=datasource,
-      policy=policy,
-      measurement=measurement,
-      job=job,
-      alias=alias,
-    ),
-
-    tdg_expirationd.operation_time(
-      datasource_type=datasource_type,
-      datasource=datasource,
-      policy=policy,
-      measurement=measurement,
-      job=job,
-      alias=alias,
-    ),
-  ],
-
   tdg_tuples(datasource_type, datasource, policy=null, measurement=null, job=null, alias=null):: [
     tdg_tuples.row,
 

dashboard/section.libsonnet

@@ -249,10 +249,10 @@ Based on [tarantool/tdg2 2.6.7](https://github.com/tarantool/tdg2/releases/tag/2
 - **tdg_kafka_eos_producer_id**: unsupported ([#134](https://github.com/tarantool/grafana-dashboard/issues/134), decided not to support: doesn't seem useful for visualization)
 - **tdg_kafka_eos_producer_epoch**: unsupported ([#134](https://github.com/tarantool/grafana-dashboard/issues/134), decided not to support: doesn't seem useful for visualization)
 - **tdg_kafka_eos_epoch_cnt**: unsupported ([#134](https://github.com/tarantool/grafana-dashboard/issues/134), decided not to support: doesn't seem useful for visualization)
-- [x] **tdg_expiration_checked_count**: see *TDG expirationd statistics/Tuples checked* panel ([#134](https://github.com/tarantool/grafana-dashboard/issues/134), [#164](https://github.com/tarantool/grafana-dashboard/issues/164))
-- [x] **tdg_expiration_expired_count**: see *TDG expirationd statistics/Tuples expired* panel ([#134](https://github.com/tarantool/grafana-dashboard/issues/134), [#164](https://github.com/tarantool/grafana-dashboard/issues/164))
-- [x] **tdg_expiration_restarts**: see *TDG expirationd statistics/Restart count* panel ([#134](https://github.com/tarantool/grafana-dashboard/issues/134), [#164](https://github.com/tarantool/grafana-dashboard/issues/164))
-- [x] **tdg_expiration_working_time**: see *TDG expirationd statistics/Operation time* panel ([#134](https://github.com/tarantool/grafana-dashboard/issues/134), [#164](https://github.com/tarantool/grafana-dashboard/issues/164))
+- **tdg_expiration_checked_count**: unsupported ([#164](https://github.com/tarantool/grafana-dashboard/issues/164), deprecated, replaced with **expirationd_checked_count**)
+- **tdg_expiration_expired_count**: unsupported ([#164](https://github.com/tarantool/grafana-dashboard/issues/164), deprecated, replaced with **expirationd_expired_count**)
+- **tdg_expiration_restarts**: unsupported ([#164](https://github.com/tarantool/grafana-dashboard/issues/164), deprecated, replaced with **expirationd_restarts**)
+- **tdg_expiration_working_time**: unsupported ([#164](https://github.com/tarantool/grafana-dashboard/issues/164), deprecated, replaced with **expirationd_working_time**)
 - [x] **tnt_cpu_thread**: see *Tarantool CPU statistics/Thread system time*, *Tarantool CPU statistics/Thread user time* panels ([#134](https://github.com/tarantool/grafana-dashboard/issues/134))
 - [x] **tdg_scanned_tuples_count**, **tdg_scanned_tuples_sum**: see *TDG tuples statistics/Tuples scanned (average)* panels ([#134](https://github.com/tarantool/grafana-dashboard/issues/134))
 - **tdg_scanned_tuples_le**: unsupported ([#134](https://github.com/tarantool/grafana-dashboard/issues/134), decided not to support:  **tdg_scanned_tuples_count**, **tdg_scanned_tuples_sum** should be enough)

supported_metrics.md

@@ -23189,7 +23189,7 @@
                         {
                            "key": "metric_name",
                            "operator": "=",
-                           "value": "tdg_expiration_checked_count"
+                           "value": "expirationd_checked_count"
                         },
                         {
                            "condition": "AND",
@@ -23338,7 +23338,7 @@
                         {
                            "key": "metric_name",
                            "operator": "=",
-                           "value": "tdg_expiration_expired_count"
+                           "value": "expirationd_expired_count"
                         },
                         {
                            "condition": "AND",
@@ -23481,7 +23481,7 @@
                         {
                            "key": "metric_name",
                            "operator": "=",
-                           "value": "tdg_expiration_restarts"
+                           "value": "expirationd_restarts"
                         },
                         {
                            "condition": "AND",
@@ -23624,7 +23624,7 @@
                         {
                            "key": "metric_name",
                            "operator": "=",
-                           "value": "tdg_expiration_working_time"
+                           "value": "expirationd_working_time"
                         },
                         {
                            "condition": "AND",
@@ -23678,7 +23678,7 @@
          "repeatIteration": null,
          "repeatRowId": null,
          "showTitle": true,
-         "title": "TDG expirationd statistics",
+         "title": "expirationd module statistics",
          "titleSize": "h6",
          "type": "row"
       },

tests/InfluxDB/dashboard_tdg_compiled.json

@@ -23189,7 +23189,7 @@
                         {
                            "key": "metric_name",
                            "operator": "=",
-                           "value": "tdg_expiration_checked_count"
+                           "value": "expirationd_checked_count"
                         },
                         {
                            "condition": "AND",
@@ -23338,7 +23338,7 @@
                         {
                            "key": "metric_name",
                            "operator": "=",
-                           "value": "tdg_expiration_expired_count"
+                           "value": "expirationd_expired_count"
                         },
                         {
                            "condition": "AND",
@@ -23481,7 +23481,7 @@
                         {
                            "key": "metric_name",
                            "operator": "=",
-                           "value": "tdg_expiration_restarts"
+                           "value": "expirationd_restarts"
                         },
                         {
                            "condition": "AND",
@@ -23624,7 +23624,7 @@
                         {
                            "key": "metric_name",
                            "operator": "=",
-                           "value": "tdg_expiration_working_time"
+                           "value": "expirationd_working_time"
                         },
                         {
                            "condition": "AND",
@@ -23678,7 +23678,7 @@
          "repeatIteration": null,
          "repeatRowId": null,
          "showTitle": true,
-         "title": "TDG expirationd statistics",
+         "title": "expirationd module statistics",
          "titleSize": "h6",
          "type": "row"
       },