Skip to content

Commit 4a6f925

Browse files
DifferentialOrangeDifferentialOrange
committed
tdg_dashboard: fix latency units
Fix latency units for GraphQL [1], IProto [2] and REST API [3] panels. 1. https://github.com/tarantool/tdg2/blob/b283c91e17fec274d1be187fb734418a7f56a034/common/graphql.lua#L633 2. https://github.com/tarantool/tdg2/blob/7983a6a7b149ac2e9e94e052d01513076847bdff/input_processor/model_iproto.lua#L57 3. https://github.com/tarantool/tdg2/blob/98b113eb4a4f71f26a34f2522e6a93ed4e67db90/input_processor/model_rest.lua#L393 Closes #190
1 parent 2894db7 commit 4a6f925

12 files changed

+278
-276
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- Set InfluxDB `policy` dynamically
1717
- Set datasource dynamically
1818

19+
### Fixed
20+
- TDG dashboard latency units (graphql, iproto, rest requests)
1921

2022
## [1.5.0] - 2022-09-22
2123
Grafana revisions: [InfluxDB revision 15](https://grafana.com/api/dashboards/12567/revisions/15/download), [Prometheus revision 15](https://grafana.com/api/dashboards/13054/revisions/15/download), [InfluxDB TDG revision 4](https://grafana.com/api/dashboards/16405/revisions/4/download), [Prometheus TDG revision 4](https://grafana.com/api/dashboards/16406/revisions/4/download).

‎dashboard/panels/tdg/graphql.libsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ local prometheus = grafana.prometheus;
129129
description=description,
130130
datasource=datasource,
131131
labelY1='average',
132-
format='µs',
132+
format='ms',
133133
).addTarget(average_target(
134134
datasource_type,
135135
'tdg_graphql_query_time',
@@ -208,7 +208,7 @@ local prometheus = grafana.prometheus;
208208
description=description,
209209
datasource=datasource,
210210
labelY1='average',
211-
format='µs',
211+
format='ms',
212212
).addTarget(average_target(
213213
datasource_type,
214214
'tdg_graphql_mutation_time',

‎dashboard/panels/tdg/iproto.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ local prometheus = grafana.prometheus;
8888
|||, method_tail),
8989
datasource=datasource,
9090
labelY1='99th percentile',
91-
format='µs',
91+
format='ms',
9292
panel_width=panel_width,
9393
).addTarget(
9494
if datasource_type == variable.datasource_type.prometheus then

‎dashboard/panels/tdg/rest_api.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ local prometheus = grafana.prometheus;
7474
description=description,
7575
datasource=datasource,
7676
labelY1='99th percentile',
77-
format='µs',
77+
format='ms',
7878
).addTarget(
7979
if datasource_type == variable.datasource_type.prometheus then
8080
prometheus.target(

‎tests/InfluxDB/dashboard_tdg_compiled.json‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25323,7 +25323,7 @@
2532325323
"yaxes": [
2532425324
{
2532525325
"decimals": 0,
25326-
"format": "µs",
25326+
"format": "ms",
2532725327
"label": "average",
2532825328
"logBase": 1,
2532925329
"max": null,
@@ -25332,7 +25332,7 @@
2533225332
},
2533325333
{
2533425334
"decimals": 3,
25335-
"format": "µs",
25335+
"format": "ms",
2533625336
"label": null,
2533725337
"logBase": 1,
2533825338
"max": null,
@@ -25740,7 +25740,7 @@
2574025740
"yaxes": [
2574125741
{
2574225742
"decimals": 0,
25743-
"format": "µs",
25743+
"format": "ms",
2574425744
"label": "average",
2574525745
"logBase": 1,
2574625746
"max": null,
@@ -25749,7 +25749,7 @@
2574925749
},
2575025750
{
2575125751
"decimals": 3,
25752-
"format": "µs",
25752+
"format": "ms",
2575325753
"label": null,
2575425754
"logBase": 1,
2575525755
"max": null,
@@ -26225,7 +26225,7 @@
2622526225
"yaxes": [
2622626226
{
2622726227
"decimals": 0,
26228-
"format": "µs",
26228+
"format": "ms",
2622926229
"label": "99th percentile",
2623026230
"logBase": 1,
2623126231
"max": null,
@@ -26234,7 +26234,7 @@
2623426234
},
2623526235
{
2623626236
"decimals": 3,
26237-
"format": "µs",
26237+
"format": "ms",
2623826238
"label": null,
2623926239
"logBase": 1,
2624026240
"max": null,
@@ -26535,7 +26535,7 @@
2653526535
"yaxes": [
2653626536
{
2653726537
"decimals": 0,
26538-
"format": "µs",
26538+
"format": "ms",
2653926539
"label": "99th percentile",
2654026540
"logBase": 1,
2654126541
"max": null,
@@ -26544,7 +26544,7 @@
2654426544
},
2654526545
{
2654626546
"decimals": 3,
26547-
"format": "µs",
26547+
"format": "ms",
2654826548
"label": null,
2654926549
"logBase": 1,
2655026550
"max": null,
@@ -26845,7 +26845,7 @@
2684526845
"yaxes": [
2684626846
{
2684726847
"decimals": 0,
26848-
"format": "µs",
26848+
"format": "ms",
2684926849
"label": "99th percentile",
2685026850
"logBase": 1,
2685126851
"max": null,
@@ -26854,7 +26854,7 @@
2685426854
},
2685526855
{
2685626856
"decimals": 3,
26857-
"format": "µs",
26857+
"format": "ms",
2685826858
"label": null,
2685926859
"logBase": 1,
2686026860
"max": null,
@@ -27155,7 +27155,7 @@
2715527155
"yaxes": [
2715627156
{
2715727157
"decimals": 0,
27158-
"format": "µs",
27158+
"format": "ms",
2715927159
"label": "99th percentile",
2716027160
"logBase": 1,
2716127161
"max": null,
@@ -27164,7 +27164,7 @@
2716427164
},
2716527165
{
2716627166
"decimals": 3,
27167-
"format": "µs",
27167+
"format": "ms",
2716827168
"label": null,
2716927169
"logBase": 1,
2717027170
"max": null,
@@ -27465,7 +27465,7 @@
2746527465
"yaxes": [
2746627466
{
2746727467
"decimals": 0,
27468-
"format": "µs",
27468+
"format": "ms",
2746927469
"label": "99th percentile",
2747027470
"logBase": 1,
2747127471
"max": null,
@@ -27474,7 +27474,7 @@
2747427474
},
2747527475
{
2747627476
"decimals": 3,
27477-
"format": "µs",
27477+
"format": "ms",
2747827478
"label": null,
2747927479
"logBase": 1,
2748027480
"max": null,
@@ -27775,7 +27775,7 @@
2777527775
"yaxes": [
2777627776
{
2777727777
"decimals": 0,
27778-
"format": "µs",
27778+
"format": "ms",
2777927779
"label": "99th percentile",
2778027780
"logBase": 1,
2778127781
"max": null,
@@ -27784,7 +27784,7 @@
2778427784
},
2778527785
{
2778627786
"decimals": 3,
27787-
"format": "µs",
27787+
"format": "ms",
2778827788
"label": null,
2778927789
"logBase": 1,
2779027790
"max": null,
@@ -28085,7 +28085,7 @@
2808528085
"yaxes": [
2808628086
{
2808728087
"decimals": 0,
28088-
"format": "µs",
28088+
"format": "ms",
2808928089
"label": "99th percentile",
2809028090
"logBase": 1,
2809128091
"max": null,
@@ -28094,7 +28094,7 @@
2809428094
},
2809528095
{
2809628096
"decimals": 3,
28097-
"format": "µs",
28097+
"format": "ms",
2809828098
"label": null,
2809928099
"logBase": 1,
2810028100
"max": null,
@@ -28395,7 +28395,7 @@
2839528395
"yaxes": [
2839628396
{
2839728397
"decimals": 0,
28398-
"format": "µs",
28398+
"format": "ms",
2839928399
"label": "99th percentile",
2840028400
"logBase": 1,
2840128401
"max": null,
@@ -28404,7 +28404,7 @@
2840428404
},
2840528405
{
2840628406
"decimals": 3,
28407-
"format": "µs",
28407+
"format": "ms",
2840828408
"label": null,
2840928409
"logBase": 1,
2841028410
"max": null,
@@ -28705,7 +28705,7 @@
2870528705
"yaxes": [
2870628706
{
2870728707
"decimals": 0,
28708-
"format": "µs",
28708+
"format": "ms",
2870928709
"label": "99th percentile",
2871028710
"logBase": 1,
2871128711
"max": null,
@@ -28714,7 +28714,7 @@
2871428714
},
2871528715
{
2871628716
"decimals": 3,
28717-
"format": "µs",
28717+
"format": "ms",
2871828718
"label": null,
2871928719
"logBase": 1,
2872028720
"max": null,
@@ -29417,7 +29417,7 @@
2941729417
"yaxes": [
2941829418
{
2941929419
"decimals": 0,
29420-
"format": "µs",
29420+
"format": "ms",
2942129421
"label": "99th percentile",
2942229422
"logBase": 1,
2942329423
"max": null,
@@ -29426,7 +29426,7 @@
2942629426
},
2942729427
{
2942829428
"decimals": 3,
29429-
"format": "µs",
29429+
"format": "ms",
2943029430
"label": null,
2943129431
"logBase": 1,
2943229432
"max": null,
@@ -29590,7 +29590,7 @@
2959029590
"yaxes": [
2959129591
{
2959229592
"decimals": 0,
29593-
"format": "µs",
29593+
"format": "ms",
2959429594
"label": "99th percentile",
2959529595
"logBase": 1,
2959629596
"max": null,
@@ -29599,7 +29599,7 @@
2959929599
},
2960029600
{
2960129601
"decimals": 3,
29602-
"format": "µs",
29602+
"format": "ms",
2960329603
"label": null,
2960429604
"logBase": 1,
2960529605
"max": null,
@@ -29763,7 +29763,7 @@
2976329763
"yaxes": [
2976429764
{
2976529765
"decimals": 0,
29766-
"format": "µs",
29766+
"format": "ms",
2976729767
"label": "99th percentile",
2976829768
"logBase": 1,
2976929769
"max": null,
@@ -29772,7 +29772,7 @@
2977229772
},
2977329773
{
2977429774
"decimals": 3,
29775-
"format": "µs",
29775+
"format": "ms",
2977629776
"label": null,
2977729777
"logBase": 1,
2977829778
"max": null,
@@ -30455,7 +30455,7 @@
3045530455
"yaxes": [
3045630456
{
3045730457
"decimals": 0,
30458-
"format": "µs",
30458+
"format": "ms",
3045930459
"label": "99th percentile",
3046030460
"logBase": 1,
3046130461
"max": null,
@@ -30464,7 +30464,7 @@
3046430464
},
3046530465
{
3046630466
"decimals": 3,
30467-
"format": "µs",
30467+
"format": "ms",
3046830468
"label": null,
3046930469
"logBase": 1,
3047030470
"max": null,
@@ -30628,7 +30628,7 @@
3062830628
"yaxes": [
3062930629
{
3063030630
"decimals": 0,
30631-
"format": "µs",
30631+
"format": "ms",
3063230632
"label": "99th percentile",
3063330633
"logBase": 1,
3063430634
"max": null,
@@ -30637,7 +30637,7 @@
3063730637
},
3063830638
{
3063930639
"decimals": 3,
30640-
"format": "µs",
30640+
"format": "ms",
3064130641
"label": null,
3064230642
"logBase": 1,
3064330643
"max": null,
@@ -30801,7 +30801,7 @@
3080130801
"yaxes": [
3080230802
{
3080330803
"decimals": 0,
30804-
"format": "µs",
30804+
"format": "ms",
3080530805
"label": "99th percentile",
3080630806
"logBase": 1,
3080730807
"max": null,
@@ -30810,7 +30810,7 @@
3081030810
},
3081130811
{
3081230812
"decimals": 3,
30813-
"format": "µs",
30813+
"format": "ms",
3081430814
"label": null,
3081530815
"logBase": 1,
3081630816
"max": null,

0 commit comments

Comments
 (0)