Skip to content

Commit f4eb116

Browse files
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
1 parent 7540be3 commit f4eb116

25 files changed

+954
-911
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
- Set default Prometheus job to `tarantool`
1616
- Set default InfluxDB measurement to `tarantool_http`
1717
- Use in-built `$__rate_interval` instead of user-defined `$rate_time_range`
18+
- Use `fill(null)` in InfluxQL requests
1819

1920

2021
## [1.3.0] - 2022-06-29

dashboard/panels/cluster.libsonnet

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ local prometheus = grafana.prometheus;
342342
measurement=measurement,
343343
group_tags=['label_pairs_alias'],
344344
alias='$tag_label_pairs_alias',
345+
fill='null',
345346
).where('metric_name', '=', 'tnt_cartridge_issues').where('label_pairs_level', '=', level)
346347
.selectField('value').addConverter('last')
347348
),
@@ -437,6 +438,7 @@ local prometheus = grafana.prometheus;
437438
measurement=measurement,
438439
group_tags=['label_pairs_alias', 'label_pairs_stream', 'label_pairs_id'],
439440
alias='$tag_label_pairs_alias $tag_label_pairs_stream ($tag_label_pairs_id)',
441+
fill='null',
440442
).where('metric_name', '=', 'tnt_replication_status')
441443
.selectField('value').addConverter('last')
442444
),
@@ -513,6 +515,7 @@ local prometheus = grafana.prometheus;
513515
measurement=measurement,
514516
group_tags=['label_pairs_alias', 'label_pairs_id'],
515517
alias='$tag_label_pairs_alias ($tag_label_pairs_id)',
518+
fill='null',
516519
).where('metric_name', '=', 'tnt_replication_lag')
517520
.selectField('value').addConverter('mean')
518521
),
@@ -554,6 +557,7 @@ local prometheus = grafana.prometheus;
554557
measurement=measurement,
555558
group_tags=['label_pairs_alias', 'label_pairs_delta'],
556559
alias='$tag_label_pairs_alias ($tag_label_pairs_delta)',
560+
fill='null',
557561
).where('metric_name', '=', 'tnt_clock_delta')
558562
.selectField('value').addConverter('last')
559563
),

dashboard/panels/common.libsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ local prometheus = grafana.prometheus;
6666
measurement=measurement,
6767
group_tags=['label_pairs_alias'],
6868
alias='$tag_label_pairs_alias',
69+
fill='null',
6970
).where('metric_name', '=', metric_name)
7071
.selectField('value').addConverter(converter),
7172

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

dashboard/panels/crud.libsonnet

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ local operation_rps_template(
6868
measurement=measurement,
6969
group_tags=['label_pairs_alias', 'label_pairs_name'],
7070
alias='$tag_label_pairs_alias — $tag_label_pairs_name',
71+
fill='null',
7172
).where('metric_name', '=', 'tnt_crud_stats_count')
7273
.where('label_pairs_operation', '=', operation)
7374
.where('label_pairs_status', '=', status)
@@ -115,6 +116,7 @@ local operation_latency_template(
115116
measurement=measurement,
116117
group_tags=['label_pairs_alias', 'label_pairs_name'],
117118
alias='$tag_label_pairs_alias — $tag_label_pairs_name',
119+
fill='null',
118120
).where('metric_name', '=', 'tnt_crud_stats')
119121
.where('label_pairs_operation', '=', operation)
120122
.where('label_pairs_status', '=', status)
@@ -634,6 +636,7 @@ local module = {
634636
measurement=measurement,
635637
group_tags=['label_pairs_alias', 'label_pairs_name'],
636638
alias='$tag_label_pairs_alias — $tag_label_pairs_name',
639+
fill='null',
637640
).where('metric_name', '=', 'tnt_crud_map_reduces')
638641
.where('label_pairs_operation', '=', 'select')
639642
.selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s'])

dashboard/panels/expirationd.libsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ local prometheus = grafana.prometheus;
3030
'label_pairs_name',
3131
],
3232
alias='$tag_label_pairs_name — $tag_label_pairs_alias',
33+
fill='null',
3334
).where('metric_name', '=', metric_name)
3435
.selectField('value').addConverter('mean'),
3536

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

dashboard/panels/http.libsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ local prometheus = grafana.prometheus;
3737
measurement=measurement,
3838
group_tags=['label_pairs_alias', 'label_pairs_path', 'label_pairs_method', 'label_pairs_status'],
3939
alias='$tag_label_pairs_alias — $tag_label_pairs_method $tag_label_pairs_path (code $tag_label_pairs_status)',
40+
fill='null',
4041
).where('metric_name', '=', metric_name).where('label_pairs_status', '=~', std.format('/%s/', status_regex))
4142
.selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s'])
4243
),
@@ -144,6 +145,7 @@ local prometheus = grafana.prometheus;
144145
measurement=measurement,
145146
group_tags=['label_pairs_alias', 'label_pairs_path', 'label_pairs_method', 'label_pairs_status'],
146147
alias='$tag_label_pairs_alias — $tag_label_pairs_method $tag_label_pairs_path (code $tag_label_pairs_status)',
148+
fill='null',
147149
).where('metric_name', '=', metric_name).where('label_pairs_quantile', '=', quantile)
148150
.where('label_pairs_status', '=~', std.format('/%s/', status_regex)).selectField('value').addConverter('mean')
149151
),

dashboard/panels/operations.libsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ local prometheus = grafana.prometheus;
3737
measurement=measurement,
3838
group_tags=['label_pairs_alias'],
3939
alias='$tag_label_pairs_alias',
40+
fill='null',
4041
).where('metric_name', '=', 'tnt_stats_op_total').where('label_pairs_operation', '=', operation)
4142
.selectField('value').addConverter('mean').addConverter('non_negative_derivative', ['1s'])
4243
),

dashboard/panels/space.libsonnet

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ local prometheus = grafana.prometheus;
4040
measurement=measurement,
4141
group_tags=['label_pairs_alias', 'label_pairs_name'],
4242
alias='$tag_label_pairs_alias — $tag_label_pairs_name',
43+
fill='null',
4344
).where('metric_name', '=', metric_name).where('label_pairs_engine', '=', engine)
4445
.selectField('value').addConverter('last')
4546
),
@@ -125,6 +126,7 @@ local prometheus = grafana.prometheus;
125126
measurement=measurement,
126127
group_tags=['label_pairs_alias', 'label_pairs_name'],
127128
alias='$tag_label_pairs_alias — $tag_label_pairs_name',
129+
fill='null',
128130
).where('metric_name', '=', metric_name).where('label_pairs_engine', '=', 'memtx')
129131
.selectField('value').addConverter('mean')
130132
),
@@ -194,6 +196,7 @@ local prometheus = grafana.prometheus;
194196
measurement=measurement,
195197
group_tags=['label_pairs_alias', 'label_pairs_name', 'label_pairs_index_name'],
196198
alias='$tag_label_pairs_alias — $tag_label_pairs_name ($tag_label_pairs_index_name)',
199+
fill='null',
197200
).where('metric_name', '=', 'tnt_space_index_bsize')
198201
.selectField('value').addConverter('mean')
199202
),

dashboard/panels/tdg/expirationd.libsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ local prometheus = grafana.prometheus;
3030
'label_pairs_name',
3131
],
3232
alias='$tag_label_pairs_name — $tag_label_pairs_alias',
33+
fill='null',
3334
).where('metric_name', '=', metric_name)
3435
.selectField('value').addConverter('mean'),
3536

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

dashboard/panels/tdg/file_connectors.libsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ local prometheus = grafana.prometheus;
3030
'label_pairs_connector_name',
3131
],
3232
alias='$tag_label_pairs_connector_name — $tag_label_pairs_alias',
33+
fill='null',
3334
).where('metric_name', '=', metric_name)
3435
.selectField('value').addConverter('mean'),
3536

0 commit comments

Comments
 (0)