Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dashboard: fill with none for InfluxDB #229

Merged
merged 2 commits into from
Jul 9, 2024
Merged

dashboard: fill with none for InfluxDB #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aac0bbb
example: fix Grafana volumes
DifferentialOrange Jul 8, 2024
4eb6a93
dashboard: fill with none for InfluxDB
DifferentialOrange Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
It affects all custom-built dashboards which had used `replication` (#224)
- Remove deprecated `build-static-*` targets from `make` (#224)
- Make default template use Tarantool 3 sections (#224)
- Use `fill(none)` in InfluxQL requests (PR #229)

### Fixed
- Removed extra quotation mark for TDG jobs_average_panel query (#220)
Expand Down
2 changes: 1 addition & 1 deletion dashboard/panels/common.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ local influxdb_query_filters(filters) = std.join(' AND ', std.map(
measurement=cfg.measurement,
group_tags=group_tags,
alias=legend[cfg.type],
fill='null',
fill='none',
).where('metric_name', '=', std.format('%s%s', [cfg.metrics_prefix, metric_name]))
).selectField('value').addConverter(converter);
if rate then target.addConverter('non_negative_derivative', ['1s']) else target,
Expand Down
2 changes: 1 addition & 1 deletion dashboard/panels/tdg/graphql.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ local prometheus = grafana.prometheus;
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_count)s' %(filters)s)
AND $timeFilter)
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_operation_name",
"label_pairs_schema", "label_pairs_entity" fill(null)
"label_pairs_schema", "label_pairs_entity" fill(none)
|||, {
metrics_prefix: cfg.metrics_prefix,
metric_name_sum: std.join('_', [metric_name, 'sum']),
Expand Down
4 changes: 2 additions & 2 deletions dashboard/panels/tdg/tasks.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ local prometheus = grafana.prometheus;
(SELECT "value" as "%(metrics_prefix)s%(metric_name_count)s" FROM %(policy_prefix)s"%(measurement)s"
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_count)s' %(filters)s)
AND $timeFilter)
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_name" fill(null)
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_name" fill(none)
|||, {
metrics_prefix: cfg.metrics_prefix,
metric_name_sum: std.join('_', [metric_name, 'sum']),
Expand Down Expand Up @@ -221,7 +221,7 @@ local prometheus = grafana.prometheus;
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_count)s' %(filters)s)
AND $timeFilter)
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_name",
"label_pairs_kind" fill(null)
"label_pairs_kind" fill(none)
|||, {
metrics_prefix: cfg.metrics_prefix,
metric_name_sum: std.join('_', [metric_name, 'sum']),
Expand Down
2 changes: 1 addition & 1 deletion dashboard/panels/tdg/tuples.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ local prometheus = grafana.prometheus;
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_sum)s' %(filters)s) AND $timeFilter),
(SELECT "value" as "%(metrics_prefix)s%(metric_name_count)s" FROM %(policy_prefix)s"%(measurement)s"
WHERE ("metric_name" = '%(metrics_prefix)s%(metric_name_count)s' %(filters)s) AND $timeFilter)
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_type_name" fill(null)
GROUP BY time($__interval), "label_pairs_alias", "label_pairs_type_name" fill(none)
|||, {
metrics_prefix: cfg.metrics_prefix,
metric_name_sum: std.join('_', [metric_name, 'sum']),
Expand Down
8 changes: 2 additions & 6 deletions docker-compose.cartridge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,8 @@ services:
volumes:
- ./example_cluster/grafana/provisioning:/etc/grafana/provisioning
# Map to different folders to prevent name collision.
- ./tests/Prometheus/dashboard_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/Prometheus/dashboard_static_compiled.json:/usr/lib/dashboards/Prometheus-static/dashboard.json
- ./tests/Prometheus/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/Prometheus-static-var/dashboard.json
- ./tests/InfluxDB/dashboard_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
- ./tests/InfluxDB/dashboard_static_compiled.json:/usr/lib/dashboards/InfluxDB-static/dashboard.json
- ./tests/InfluxDB/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/InfluxDB-static-var/dashboard.json
- ./tests/Prometheus/dashboard_cartridge_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/InfluxDB/dashboard_cartridge_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json

networks:
tarantool_dashboard_dev:
Expand Down
4 changes: 0 additions & 4 deletions docker-compose.tdg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,7 @@ services:
- ./example_cluster/grafana/provisioning:/etc/grafana/provisioning
# Map to different folders to prevent name collision.
- ./tests/Prometheus/dashboard_tdg_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/Prometheus/dashboard_tdg_static_compiled.json:/usr/lib/dashboards/Prometheus-static/dashboard.json
- ./tests/Prometheus/dashboard_tdg_static_with_instance_variable_compiled.json:/usr/lib/dashboards/Prometheus-static-var/dashboard.json
- ./tests/InfluxDB/dashboard_tdg_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
- ./tests/InfluxDB/dashboard_tdg_static_compiled.json:/usr/lib/dashboards/InfluxDB-static/dashboard.json
- ./tests/InfluxDB/dashboard_tdg_static_with_instance_variable_compiled.json:/usr/lib/dashboards/InfluxDB-static-var/dashboard.json

networks:
tarantool_dashboard_dev:
Expand Down
8 changes: 2 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,8 @@ services:
volumes:
- ./example_cluster/grafana/provisioning:/etc/grafana/provisioning
# Map to different folders to prevent name collision.
- ./tests/Prometheus/dashboard_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/Prometheus/dashboard_static_compiled.json:/usr/lib/dashboards/Prometheus-static/dashboard.json
- ./tests/Prometheus/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/Prometheus-static-var/dashboard.json
- ./tests/InfluxDB/dashboard_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
- ./tests/InfluxDB/dashboard_static_compiled.json:/usr/lib/dashboards/InfluxDB-static/dashboard.json
- ./tests/InfluxDB/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/InfluxDB-static-var/dashboard.json
- ./tests/Prometheus/dashboard_tarantool3_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/InfluxDB/dashboard_tarantool3_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json

networks:
tarantool_dashboard_dev:
Expand Down
Loading
Loading