dashboard: use fill(null) in InfluxQL requests

This patch replaces fill(none) with fill(null) in dashboards InfluxQL
requests. After this patch, all panels with non-derivative requests
will show the gap in metrics for an interval if there were no metrics
for this interval. Before this patch, they had displayed a straight line
connecting border values in the area. Derivative requests will still
display a straight line [1]. There is a workaround to make derivative
requests result consistent with non-derivative one, but it makes query
more complicated both in terms of readability and performance, so it's
not worth it.

1. influxdata/influxdb#7185

Closes #23

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Set default Prometheus job to `tarantool`
 - Set default InfluxDB measurement to `tarantool_http`
 - Use in-built `$__rate_interval` instead of user-defined `$rate_time_range`
+- Use `fill(null)` in InfluxQL requests
 
 
 ## [1.3.0] - 2022-06-29

dashboard/panels/cluster.libsonnet

@@ -342,6 +342,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias'],
         alias='$tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', 'tnt_cartridge_issues').where('label_pairs_level', '=', level)
       .selectField('value').addConverter('last')
   ),
@@ -437,6 +438,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_stream', 'label_pairs_id'],
         alias='$tag_label_pairs_alias $tag_label_pairs_stream ($tag_label_pairs_id)',
+        fill='null',
       ).where('metric_name', '=', 'tnt_replication_status')
       .selectField('value').addConverter('last')
   ),
@@ -513,6 +515,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_id'],
         alias='$tag_label_pairs_alias ($tag_label_pairs_id)',
+        fill='null',
       ).where('metric_name', '=', 'tnt_replication_lag')
       .selectField('value').addConverter('mean')
   ),
@@ -554,6 +557,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_delta'],
         alias='$tag_label_pairs_alias ($tag_label_pairs_delta)',
+        fill='null',
       ).where('metric_name', '=', 'tnt_clock_delta')
       .selectField('value').addConverter('last')
   ),

dashboard/panels/common.libsonnet

@@ -66,6 +66,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias'],
         alias='$tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter(converter),
 
@@ -88,6 +89,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias'],
         alias='$tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
 

dashboard/panels/crud.libsonnet

@@ -68,6 +68,7 @@ local operation_rps_template(
       measurement=measurement,
       group_tags=['label_pairs_alias', 'label_pairs_name'],
       alias='$tag_label_pairs_alias — $tag_label_pairs_name',
+      fill='null',
     ).where('metric_name', '=', 'tnt_crud_stats_count')
     .where('label_pairs_operation', '=', operation)
     .where('label_pairs_status', '=', status)
@@ -115,6 +116,7 @@ local operation_latency_template(
       measurement=measurement,
       group_tags=['label_pairs_alias', 'label_pairs_name'],
       alias='$tag_label_pairs_alias — $tag_label_pairs_name',
+      fill='null',
     ).where('metric_name', '=', 'tnt_crud_stats')
     .where('label_pairs_operation', '=', operation)
     .where('label_pairs_status', '=', status)
@@ -634,6 +636,7 @@ local module = {
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_name'],
         alias='$tag_label_pairs_alias — $tag_label_pairs_name',
+        fill='null',
       ).where('metric_name', '=', 'tnt_crud_map_reduces')
       .where('label_pairs_operation', '=', 'select')
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s'])

dashboard/panels/expirationd.libsonnet

@@ -30,6 +30,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_name',
         ],
         alias='$tag_label_pairs_name — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean'),
 
@@ -55,6 +56,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_name',
         ],
         alias='$tag_label_pairs_name — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
 

dashboard/panels/http.libsonnet

@@ -37,6 +37,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_path', 'label_pairs_method', 'label_pairs_status'],
         alias='$tag_label_pairs_alias — $tag_label_pairs_method $tag_label_pairs_path (code $tag_label_pairs_status)',
+        fill='null',
       ).where('metric_name', '=', metric_name).where('label_pairs_status', '=~', std.format('/%s/', status_regex))
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s'])
   ),
@@ -144,6 +145,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_path', 'label_pairs_method', 'label_pairs_status'],
         alias='$tag_label_pairs_alias — $tag_label_pairs_method $tag_label_pairs_path (code $tag_label_pairs_status)',
+        fill='null',
       ).where('metric_name', '=', metric_name).where('label_pairs_quantile', '=', quantile)
       .where('label_pairs_status', '=~', std.format('/%s/', status_regex)).selectField('value').addConverter('mean')
   ),

dashboard/panels/operations.libsonnet

@@ -37,6 +37,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias'],
         alias='$tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', 'tnt_stats_op_total').where('label_pairs_operation', '=', operation)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s'])
   ),

dashboard/panels/space.libsonnet

@@ -40,6 +40,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_name'],
         alias='$tag_label_pairs_alias — $tag_label_pairs_name',
+        fill='null',
       ).where('metric_name', '=', metric_name).where('label_pairs_engine', '=', engine)
       .selectField('value').addConverter('last')
   ),
@@ -125,6 +126,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_name'],
         alias='$tag_label_pairs_alias — $tag_label_pairs_name',
+        fill='null',
       ).where('metric_name', '=', metric_name).where('label_pairs_engine', '=', 'memtx')
       .selectField('value').addConverter('mean')
   ),
@@ -194,6 +196,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_name', 'label_pairs_index_name'],
         alias='$tag_label_pairs_alias — $tag_label_pairs_name ($tag_label_pairs_index_name)',
+        fill='null',
       ).where('metric_name', '=', 'tnt_space_index_bsize')
       .selectField('value').addConverter('mean')
   ),

dashboard/panels/tdg/expirationd.libsonnet

@@ -30,6 +30,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_name',
         ],
         alias='$tag_label_pairs_name — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean'),
 
@@ -55,6 +56,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_name',
         ],
         alias='$tag_label_pairs_name — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
 

dashboard/panels/tdg/file_connectors.libsonnet

@@ -30,6 +30,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_connector_name',
         ],
         alias='$tag_label_pairs_connector_name — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean'),
 

dashboard/panels/tdg/graphql.libsonnet

@@ -33,6 +33,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_entity',
         ],
         alias='$tag_label_pairs_operation_name ($tag_label_pairs_schema, $tag_label_pairs_entity) — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
 
@@ -69,7 +70,7 @@ local prometheus = grafana.prometheus;
           (SELECT "value" as "%(metric_name_count)s" FROM %(policy_prefix)s"%(measurement)s"
           WHERE ("metric_name" = '%(metric_name_count)s') AND $timeFilter)
           GROUP BY time($__interval), "label_pairs_alias", "label_pairs_operation_name",
-          "label_pairs_schema", "label_pairs_entity" fill(none)
+          "label_pairs_schema", "label_pairs_entity" fill(null)
         |||, {
           metric_name_sum: std.join('_', [metric_name, 'sum']),
           metric_name_count: std.join('_', [metric_name, 'count']),

dashboard/panels/tdg/iproto.libsonnet

@@ -53,6 +53,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_type',
         ],
         alias='$tag_label_pairs_type — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .where('label_pairs_method', '=', std.format('repository.%s', method_tail))
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
@@ -102,6 +103,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_type',
         ],
         alias='$tag_label_pairs_type — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .where('label_pairs_method', '=', std.format('repository.%s', method_tail))
       .where('label_pairs_quantile', '=', '0.99')

dashboard/panels/tdg/kafka/brokers.libsonnet

@@ -33,6 +33,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_broker_name',
         ],
         alias='$tag_label_pairs_name ($tag_label_pairs_broker_name) — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean'),
 
@@ -61,6 +62,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_broker_name',
         ],
         alias='$tag_label_pairs_name ($tag_label_pairs_broker_name) — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
 
@@ -89,6 +91,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_broker_name',
         ],
         alias='$tag_label_pairs_name ($tag_label_pairs_broker_name) — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', metric_name).where('label_pairs_quantile', '=', '0.99')
       .selectField('value').addConverter('last'),
 
@@ -620,6 +623,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_request',
         ],
         alias='$tag_label_pairs_request — $tag_label_pairs_name ($tag_label_pairs_broker_name) — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', 'tdg_kafka_broker_req')
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
   ),

dashboard/panels/tdg/kafka/topics.libsonnet

@@ -33,6 +33,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_topic',
         ],
         alias='$tag_label_pairs_name ($tag_label_pairs_topic) — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean'),
 
@@ -61,6 +62,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_partition',
         ],
         alias='$tag_label_pairs_name ($tag_label_pairs_topic, $tag_label_pairs_partition) — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean'),
 
@@ -90,6 +92,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_partition',
         ],
         alias='$tag_label_pairs_name ($tag_label_pairs_topic, $tag_label_pairs_partition) — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
 
@@ -118,6 +121,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_topic',
         ],
         alias='$tag_label_pairs_name ($tag_label_pairs_topic) — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', metric_name).where('label_pairs_quantile', '=', '0.99')
       .selectField('value').addConverter('last'),
 

dashboard/panels/tdg/kafka/utils.libsonnet

@@ -24,6 +24,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_name', 'label_pairs_type', 'label_pairs_connector_name'],
         alias='$tag_label_pairs_name — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean'),
 
@@ -46,6 +47,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias', 'label_pairs_name', 'label_pairs_type', 'label_pairs_connector_name'],
         alias='$tag_label_pairs_name — $tag_label_pairs_alias ($tag_label_pairs_type, $tag_label_pairs_connector_name)',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
 }

dashboard/panels/tdg/rest_api.libsonnet

@@ -47,6 +47,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_method',
         ],
         alias='$tag_label_pairs_method $tag_label_pairs_type (code $tag_label_pairs_status_code) — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .where('label_pairs_method', get_condition, 'GET')
       .where('label_pairs_status_code', '=~', std.format('/%s/', status_regex))
@@ -92,6 +93,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_method',
         ],
         alias='$tag_label_pairs_method $tag_label_pairs_type (code $tag_label_pairs_status_code) — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .where('label_pairs_method', get_condition, 'GET')
       .where('label_pairs_status_code', '=~', std.format('/%s/', status_regex))

dashboard/panels/tdg/tasks.libsonnet

@@ -41,6 +41,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_kind',
         ],
         alias='$tag_label_pairs_name — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
   ),
@@ -78,6 +79,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_kind',
         ],
         alias='$tag_label_pairs_name — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean'),
   ),
@@ -124,7 +126,7 @@ local prometheus = grafana.prometheus;
           WHERE ("metric_name" = '%(metric_name_sum)s') AND $timeFilter),
           (SELECT "value" as "%(metric_name_count)s" FROM %(policy_prefix)s"%(measurement)s"
           WHERE ("metric_name" = '%(metric_name_count)s') AND $timeFilter)
-          GROUP BY time($__interval), "label_pairs_alias", "label_pairs_name" fill(none)
+          GROUP BY time($__interval), "label_pairs_alias", "label_pairs_name" fill(null)
         |||, {
           metric_name_sum: std.join('_', [metric_name, 'sum']),
           metric_name_count: std.join('_', [metric_name, 'count']),
@@ -167,6 +169,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_kind',
         ],
         alias='$tag_label_pairs_name ($tag_label_pairs_kind) — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s']),
   ),
@@ -204,6 +207,7 @@ local prometheus = grafana.prometheus;
           'label_pairs_kind',
         ],
         alias='$tag_label_pairs_name ($tag_label_pairs_kind) — $tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', metric_name)
       .selectField('value').addConverter('mean'),
   ),
@@ -251,7 +255,7 @@ local prometheus = grafana.prometheus;
           (SELECT "value" as "%(metric_name_count)s" FROM %(policy_prefix)s"%(measurement)s"
           WHERE ("metric_name" = '%(metric_name_count)s') AND $timeFilter)
           GROUP BY time($__interval), "label_pairs_alias", "label_pairs_name",
-          "label_pairs_kind" fill(none)
+          "label_pairs_kind" fill(null)
         |||, {
           metric_name_sum: std.join('_', [metric_name, 'sum']),
           metric_name_count: std.join('_', [metric_name, 'count']),

dashboard/panels/tdg/tuples.libsonnet

@@ -41,7 +41,7 @@ local prometheus = grafana.prometheus;
           WHERE ("metric_name" = '%(metric_name_sum)s') AND $timeFilter),
           (SELECT "value" as "%(metric_name_count)s" FROM %(policy_prefix)s"%(measurement)s"
           WHERE ("metric_name" = '%(metric_name_count)s') AND $timeFilter)
-          GROUP BY time($__interval), "label_pairs_alias", "label_pairs_type_name" fill(none)
+          GROUP BY time($__interval), "label_pairs_alias", "label_pairs_type_name" fill(null)
         |||, {
           metric_name_sum: std.join('_', [metric_name, 'sum']),
           metric_name_count: std.join('_', [metric_name, 'count']),

dashboard/panels/vinyl.libsonnet

@@ -590,6 +590,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias'],
         alias='$tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', 'tnt_vinyl_scheduler_tasks').where('label_pairs_status', '=', 'inprogress')
       .selectField('value').addConverter('last')
   ),
@@ -627,6 +628,7 @@ local prometheus = grafana.prometheus;
         measurement=measurement,
         group_tags=['label_pairs_alias'],
         alias='$tag_label_pairs_alias',
+        fill='null',
       ).where('metric_name', '=', 'tnt_vinyl_scheduler_tasks').where('label_pairs_status', '=', 'failed')
       .selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s'])
   ),