Skip to content

Commit ffd66fd

Browse files
dashboard: fill with none for InfluxDB
On lower timescales data with "fill(null)" seems like a scattered set of dots. Data with "fill(none)" seems fine like a line string. I don't remember these issues on older Grafana versions, so it is possible that something had changed with visualization even for deprecated graph panels.
1 parent 62456a7 commit ffd66fd

11 files changed

+983
-982
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
It affects all custom-built dashboards which had used `replication` (#224)
1818
- Remove deprecated `build-static-*` targets from `make` (#224)
1919
- Make default template use Tarantool 3 sections (#224)
20+
- Use `fill(none)` in InfluxQL requests (PR #229)
2021

2122
### Fixed
2223
- Removed extra quotation mark for TDG jobs_average_panel query (#220)

dashboard/panels/common.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ local influxdb_query_filters(filters) = std.join(' AND ', std.map(
102102
measurement=cfg.measurement,
103103
group_tags=group_tags,
104104
alias=legend[cfg.type],
105-
fill='null',
105+
fill='none',
106106
).where('metric_name', '=', std.format('%s%s', [cfg.metrics_prefix, metric_name]))
107107
).selectField('value').addConverter(converter);
108108
if rate then target.addConverter('non_negative_derivative', ['1s']) else target,

dashboard/panels/tdg/graphql.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ local prometheus = grafana.prometheus;
6262
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_count)s' %(filters)s)
6363
AND $timeFilter)
6464
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_operation_name",
65-
"label_pairs_schema", "label_pairs_entity" fill(null)
65+
"label_pairs_schema", "label_pairs_entity" fill(none)
6666
|||, {
6767
metrics_prefix: cfg.metrics_prefix,
6868
metric_name_sum: std.join('_', [metric_name, 'sum']),

dashboard/panels/tdg/tasks.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ local prometheus = grafana.prometheus;
107107
(SELECT "value" as "%(metrics_prefix)s%(metric_name_count)s" FROM %(policy_prefix)s"%(measurement)s"
108108
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_count)s' %(filters)s)
109109
AND $timeFilter)
110-
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_name" fill(null)
110+
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_name" fill(none)
111111
|||, {
112112
metrics_prefix: cfg.metrics_prefix,
113113
metric_name_sum: std.join('_', [metric_name, 'sum']),
@@ -221,7 +221,7 @@ local prometheus = grafana.prometheus;
221221
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_count)s' %(filters)s)
222222
AND $timeFilter)
223223
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_name",
224-
"label_pairs_kind" fill(null)
224+
"label_pairs_kind" fill(none)
225225
|||, {
226226
metrics_prefix: cfg.metrics_prefix,
227227
metric_name_sum: std.join('_', [metric_name, 'sum']),

dashboard/panels/tdg/tuples.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ local prometheus = grafana.prometheus;
4040
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_sum)s' %(filters)s) AND $timeFilter),
4141
(SELECT "value" as "%(metrics_prefix)s%(metric_name_count)s" FROM %(policy_prefix)s"%(measurement)s"
4242
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_count)s' %(filters)s) AND $timeFilter)
43-
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_type_name" fill(null)
43+
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_type_name" fill(none)
4444
|||, {
4545
metrics_prefix: cfg.metrics_prefix,
4646
metric_name_sum: std.join('_', [metric_name, 'sum']),

0 commit comments

Comments
 (0)