Remove extra quotation at the end of TDG jobs_average_panel query

opomuc · DifferentialOrange · commit c6acba201374 · 2023-06-19T11:53:05.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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
+- Removed extra quotation mark for TDG jobs_average_panel query (#220)
+
 ## [2.1.1] - 2023-06-01
 Grafana revisions: [InfluxDB revision 18](https://grafana.com/api/dashboards/12567/revisions/18/download), [Prometheus revision 18](https://grafana.com/api/dashboards/13054/revisions/18/download), [InfluxDB TDG revision 7](https://grafana.com/api/dashboards/16405/revisions/7/download), [Prometheus TDG revision 7](https://grafana.com/api/dashboards/16406/revisions/7/download).
 
diff --git a/dashboard/panels/tdg/tasks.libsonnet b/dashboard/panels/tdg/tasks.libsonnet
@@ -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"}
+            %(metrics_prefix)s%(metric_name_sum)s{%(filters)s} / %(metrics_prefix)s%(metric_name_count)s{%(filters)s}
           |||,
           {
             metrics_prefix: cfg.metrics_prefix,
diff --git a/tests/Prometheus/dashboard_tdg_compiled.json b/tests/Prometheus/dashboard_tdg_compiled.json
@@ -23275,7 +23275,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": "tdg_jobs_execution_time_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_jobs_execution_time_count{alias=~\"$alias\",job=~\"$job\"}\n",
                      "format": "time_series",
                      "intervalFactor": 2,
                      "legendFormat": "{{name}} — {{alias}}",
diff --git a/tests/Prometheus/dashboard_tdg_static_compiled.json b/tests/Prometheus/dashboard_tdg_static_compiled.json
@@ -23275,7 +23275,7 @@
                "steppedLine": false,
                "targets": [
                   {
-                     "expr": "tdg_jobs_execution_time_sum{job=~\"tarantool\"} / tdg_jobs_execution_time_count{job=~\"tarantool\"\"}\n",
+                     "expr": "tdg_jobs_execution_time_sum{job=~\"tarantool\"} / tdg_jobs_execution_time_count{job=~\"tarantool\"}\n",
                      "format": "time_series",
                      "intervalFactor": 2,
                      "legendFormat": "{{name}} — {{alias}}",
diff --git a/tests/Prometheus/dashboard_tdg_static_custom_title_compiled.json b/tests/Prometheus/dashboard_tdg_static_custom_title_compiled.json
@@ -23275,7 +23275,7 @@
                "steppedLine": false,
                "targets": [
                   {
-                     "expr": "tdg_jobs_execution_time_sum{job=~\"tarantool\"} / tdg_jobs_execution_time_count{job=~\"tarantool\"\"}\n",
+                     "expr": "tdg_jobs_execution_time_sum{job=~\"tarantool\"} / tdg_jobs_execution_time_count{job=~\"tarantool\"}\n",
                      "format": "time_series",
                      "intervalFactor": 2,
                      "legendFormat": "{{name}} — {{alias}}",
diff --git a/tests/Prometheus/dashboard_tdg_static_with_instance_variable_compiled.json b/tests/Prometheus/dashboard_tdg_static_with_instance_variable_compiled.json
@@ -23275,7 +23275,7 @@
                "steppedLine": false,
                "targets": [
                   {
-                     "expr": "tdg_jobs_execution_time_sum{alias=~\"$alias\",job=~\"tarantool\"} / tdg_jobs_execution_time_count{alias=~\"$alias\",job=~\"tarantool\"\"}\n",
+                     "expr": "tdg_jobs_execution_time_sum{alias=~\"$alias\",job=~\"tarantool\"} / tdg_jobs_execution_time_count{alias=~\"$alias\",job=~\"tarantool\"}\n",
                      "format": "time_series",
                      "intervalFactor": 2,
                      "legendFormat": "{{name}} — {{alias}}",

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ local prometheus = grafana.prometheus;`
`83`	`83`	`prometheus.target(`
`84`	`84`	`expr=std.format(`
`85`	`85`	`\|\|\|`
`86`		`- %(metrics_prefix)s%(metric_name_sum)s{%(filters)s} / %(metrics_prefix)s%(metric_name_count)s{%(filters)s"}`
	`86`	`+ %(metrics_prefix)s%(metric_name_sum)s{%(filters)s} / %(metrics_prefix)s%(metric_name_count)s{%(filters)s}`
`87`	`87`	`\|\|\|,`
`88`	`88`	`{`
`89`	`89`	`metrics_prefix: cfg.metrics_prefix,`
Original file line number	Diff line number	Diff line change
`@@ -23275,7 +23275,7 @@`
`23275`	`23275`	`"steppedLine": false,`
`23276`	`23276`	`"targets": [`
`23277`	`23277`	`{`
`23278`		`- "expr": "tdg_jobs_execution_time_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_jobs_execution_time_count{alias=~\"$alias\",job=~\"$job\"\"}\n",`
	`23278`	`+ "expr": "tdg_jobs_execution_time_sum{alias=~\"$alias\",job=~\"$job\"} / tdg_jobs_execution_time_count{alias=~\"$alias\",job=~\"$job\"}\n",`
`23279`	`23279`	`"format": "time_series",`
`23280`	`23280`	`"intervalFactor": 2,`
`23281`	`23281`	`"legendFormat": "{{name}} — {{alias}}",`