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: fix Prometheus TDG moving average #238

Merged
merged 1 commit into from
Dec 6, 2024
+17 −11
Merged

dashboard: fix Prometheus TDG moving average #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Fixed
- Prometheus TDG average panels displaying lifetime average instead of a moving one (#237)


## [3.2.0] - 2024-10-04
Grafana revisions:
- Tarantool 3:
2 changes: 1 addition & 1 deletion dashboard/panels/tdg/graphql.libsonnet
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ local prometheus = grafana.prometheus;
prometheus.target(
expr=std.format(
|||
%(metrics_prefix)s%(metric_name_sum)s{%(filters)s} / %(metrics_prefix)s%(metric_name_count)s{%(filters)s}
rate(%(metrics_prefix)s%(metric_name_sum)s{%(filters)s}[$__rate_interval]) / rate(%(metrics_prefix)s%(metric_name_count)s{%(filters)s})[$__rate_interval])
|||,
{
metrics_prefix: cfg.metrics_prefix,
4 changes: 2 additions & 2 deletions dashboard/panels/tdg/tasks.libsonnet
View file
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ local prometheus = grafana.prometheus;
prometheus.target(
expr=std.format(
|||
%(metrics_prefix)s%(metric_name_sum)s{%(filters)s} / %(metrics_prefix)s%(metric_name_count)s{%(filters)s}
rate(%(metrics_prefix)s%(metric_name_sum)s{%(filters)s}[$__rate_interval]) / rate(%(metrics_prefix)s%(metric_name_count)s{%(filters)s}[$__rate_interval])
|||,
{
metrics_prefix: cfg.metrics_prefix,
@@ -196,7 +196,7 @@ local prometheus = grafana.prometheus;
prometheus.target(
expr=std.format(
|||
%(metrics_prefix)s%(metric_name_sum)s{%(filters)s} / %(metrics_prefix)s%(metric_name_count)s{%(filters)s}
rate(%(metrics_prefix)s%(metric_name_sum)s{%(filters)s}[$__rate_interval]) / rate(%(metrics_prefix)s%(metric_name_count)s{%(filters)s}[$__rate_interval])
|||,
{
metrics_prefix: cfg.metrics_prefix,
2 changes: 1 addition & 1 deletion dashboard/panels/tdg/tuples.libsonnet
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ local prometheus = grafana.prometheus;
prometheus.target(
expr=std.format(
|||
%(metrics_prefix)s%(metric_name_sum)s{%(filters)s} / %(metrics_prefix)s%(metric_name_count)s{%(filters)s}
rate(%(metrics_prefix)s%(metric_name_sum)s{%(filters)s}[$__rate_interval]) / rate(%(metrics_prefix)s%(metric_name_count)s{%(filters)s}[$__rate_interval])
|||,
{
metrics_prefix: cfg.metrics_prefix,
14 changes: 7 additions & 7 deletions tests/Prometheus/dashboard_tdg_compiled.json
View file
Original file line number Diff line number Diff line change
@@ -18917,7 +18917,7 @@
"steppedLine": false,
"targets": [
{
"expr": "tdg_scanned_tuples_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_scanned_tuples_count{alias=~\"$alias\",job=~\"$job\"}\n",
"expr": "rate(tdg_scanned_tuples_sum{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]) / rate(tdg_scanned_tuples_count{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval])\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{type_name}} — {{alias}}",
@@ -19004,7 +19004,7 @@
"steppedLine": false,
"targets": [
{
"expr": "tdg_returned_tuples_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_returned_tuples_count{alias=~\"$alias\",job=~\"$job\"}\n",
"expr": "rate(tdg_returned_tuples_sum{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]) / rate(tdg_returned_tuples_count{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval])\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{type_name}} — {{alias}}",
@@ -19932,7 +19932,7 @@
"steppedLine": false,
"targets": [
{
"expr": "tdg_graphql_query_time_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_graphql_query_time_count{alias=~\"$alias\",job=~\"$job\"}\n",
"expr": "rate(tdg_graphql_query_time_sum{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]) / rate(tdg_graphql_query_time_count{alias=~\"$alias\",job=~\"$job\"})[$__rate_interval])\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{operation_name}} ({{schema}}, {{entity}}) — {{alias}}",
@@ -20193,7 +20193,7 @@
"steppedLine": false,
"targets": [
{
"expr": "tdg_graphql_mutation_time_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_graphql_mutation_time_count{alias=~\"$alias\",job=~\"$job\"}\n",
"expr": "rate(tdg_graphql_mutation_time_sum{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]) / rate(tdg_graphql_mutation_time_count{alias=~\"$alias\",job=~\"$job\"})[$__rate_interval])\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{operation_name}} ({{schema}}, {{entity}}) — {{alias}}",
@@ -23385,7 +23385,7 @@
"steppedLine": false,
"targets": [
{
"expr": "tdg_jobs_execution_time_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_jobs_execution_time_count{alias=~\"$alias\",job=~\"$job\"}\n",
"expr": "rate(tdg_jobs_execution_time_sum{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]) / rate(tdg_jobs_execution_time_count{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval])\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{name}} — {{alias}}",
@@ -23907,7 +23907,7 @@
"steppedLine": false,
"targets": [
{
"expr": "tdg_tasks_execution_time_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_tasks_execution_time_count{alias=~\"$alias\",job=~\"$job\"}\n",
"expr": "rate(tdg_tasks_execution_time_sum{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]) / rate(tdg_tasks_execution_time_count{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval])\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{name}} ({{kind}}) — {{alias}}",
@@ -24342,7 +24342,7 @@
"steppedLine": false,
"targets": [
{
"expr": "tdg_system_tasks_execution_time_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_system_tasks_execution_time_count{alias=~\"$alias\",job=~\"$job\"}\n",
"expr": "rate(tdg_system_tasks_execution_time_sum{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]) / rate(tdg_system_tasks_execution_time_count{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval])\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{name}} ({{kind}}) — {{alias}}",