fix: show locks metrics correctly

JuArce · JuArce · commit 95e99c2dc298 · 2025-08-08T16:16:04.000-03:00
diff --git a/grafana/provisioning/dashboards/aligned/aggregator_batcher.json b/grafana/provisioning/dashboards/aligned/aggregator_batcher.json
@@ -18,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 2,
+  "id": 4,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -1524,7 +1524,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -1594,7 +1595,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "dark-red"
+                "color": "dark-red",
+                "value": null
               },
               {
                 "color": "green",
@@ -1726,7 +1728,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -1801,7 +1804,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -1906,7 +1910,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -2048,7 +2053,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "dark-red",
@@ -2155,7 +2161,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -2222,7 +2229,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           }
@@ -2321,7 +2329,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -2388,7 +2397,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "#FF9830",
@@ -2495,7 +2505,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -2561,7 +2572,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           }
@@ -2661,7 +2673,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -2728,7 +2741,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "#EAB839",
@@ -2835,7 +2849,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -2933,7 +2948,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3000,7 +3016,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "#EAB839",
@@ -3107,7 +3124,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           }
@@ -3201,7 +3219,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           }
@@ -3288,7 +3307,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           },
@@ -3388,7 +3408,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           },
@@ -3459,7 +3480,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3599,7 +3621,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3675,7 +3698,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           }
@@ -3825,7 +3849,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3926,7 +3951,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -3966,8 +3992,8 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "message_handler_batch_lock_timeouts_count",
+          "editorMode": "code",
+          "expr": "floor(increase(message_handler_batch_lock_timeouts_count{job=\"aligned-batcher\"}[$__range]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -3982,8 +4008,8 @@
             "uid": "prometheus"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "message_handler_user_lock_timeouts_count",
+          "editorMode": "code",
+          "expr": "floor(increase(message_handler_user_lock_timeouts_count{job=\"aligned-batcher\"}[$__range]))",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -4068,7 +4094,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           },
@@ -4163,7 +4190,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -4455,6 +4483,6 @@
   "timezone": "browser",
   "title": "System Data",
   "uid": "aggregator",
-  "version": 7,
+  "version": 20,
   "weekStart": ""
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"editable": true,`
`19`	`19`	`"fiscalYearStartMonth": 0,`
`20`	`20`	`"graphTooltip": 0,`
`21`		`- "id": 2,`
	`21`	`+ "id": 4,`
`22`	`22`	`"links": [],`
`23`	`23`	`"liveNow": false,`
`24`	`24`	`"panels": [`
`@@ -1524,7 +1524,8 @@`
`1524`	`1524`	`"mode": "absolute",`
`1525`	`1525`	`"steps": [`
`1526`	`1526`	`{`
`1527`		`- "color": "green"`
	`1527`	`+ "color": "green",`
	`1528`	`+ "value": null`
`1528`	`1529`	`},`
`1529`	`1530`	`{`
`1530`	`1531`	`"color": "red",`
`@@ -1594,7 +1595,8 @@`
`1594`	`1595`	`"mode": "absolute",`
`1595`	`1596`	`"steps": [`
`1596`	`1597`	`{`
`1597`		`- "color": "dark-red"`
	`1598`	`+ "color": "dark-red",`
	`1599`	`+ "value": null`
`1598`	`1600`	`},`
`1599`	`1601`	`{`
`1600`	`1602`	`"color": "green",`
`@@ -1726,7 +1728,8 @@`
`1726`	`1728`	`"mode": "absolute",`
`1727`	`1729`	`"steps": [`
`1728`	`1730`	`{`
`1729`		`- "color": "green"`
	`1731`	`+ "color": "green",`
	`1732`	`+ "value": null`
`1730`	`1733`	`},`
`1731`	`1734`	`{`
`1732`	`1735`	`"color": "red",`
`@@ -1801,7 +1804,8 @@`
`1801`	`1804`	`"mode": "absolute",`
`1802`	`1805`	`"steps": [`
`1803`	`1806`	`{`
`1804`		`- "color": "green"`
	`1807`	`+ "color": "green",`
	`1808`	`+ "value": null`
`1805`	`1809`	`},`
`1806`	`1810`	`{`
`1807`	`1811`	`"color": "red",`
`@@ -1906,7 +1910,8 @@`
`1906`	`1910`	`"mode": "absolute",`
`1907`	`1911`	`"steps": [`
`1908`	`1912`	`{`
`1909`		`- "color": "green"`
	`1913`	`+ "color": "green",`
	`1914`	`+ "value": null`
`1910`	`1915`	`},`
`1911`	`1916`	`{`
`1912`	`1917`	`"color": "red",`
`@@ -2048,7 +2053,8 @@`
`2048`	`2053`	`"mode": "absolute",`
`2049`	`2054`	`"steps": [`
`2050`	`2055`	`{`
`2051`		`- "color": "green"`
	`2056`	`+ "color": "green",`
	`2057`	`+ "value": null`
`2052`	`2058`	`},`
`2053`	`2059`	`{`
`2054`	`2060`	`"color": "dark-red",`
`@@ -2155,7 +2161,8 @@`
`2155`	`2161`	`"mode": "absolute",`
`2156`	`2162`	`"steps": [`
`2157`	`2163`	`{`
`2158`		`- "color": "green"`
	`2164`	`+ "color": "green",`
	`2165`	`+ "value": null`
`2159`	`2166`	`},`
`2160`	`2167`	`{`
`2161`	`2168`	`"color": "red",`
`@@ -2222,7 +2229,8 @@`
`2222`	`2229`	`"mode": "absolute",`
`2223`	`2230`	`"steps": [`
`2224`	`2231`	`{`
`2225`		`- "color": "green"`
	`2232`	`+ "color": "green",`
	`2233`	`+ "value": null`
`2226`	`2234`	`}`
`2227`	`2235`	`]`
`2228`	`2236`	`}`
`@@ -2321,7 +2329,8 @@`
`2321`	`2329`	`"mode": "absolute",`
`2322`	`2330`	`"steps": [`
`2323`	`2331`	`{`
`2324`		`- "color": "green"`
	`2332`	`+ "color": "green",`
	`2333`	`+ "value": null`
`2325`	`2334`	`},`
`2326`	`2335`	`{`
`2327`	`2336`	`"color": "red",`
`@@ -2388,7 +2397,8 @@`
`2388`	`2397`	`"mode": "absolute",`
`2389`	`2398`	`"steps": [`
`2390`	`2399`	`{`
`2391`		`- "color": "green"`
	`2400`	`+ "color": "green",`
	`2401`	`+ "value": null`
`2392`	`2402`	`},`
`2393`	`2403`	`{`
`2394`	`2404`	`"color": "#FF9830",`
`@@ -2495,7 +2505,8 @@`
`2495`	`2505`	`"mode": "absolute",`
`2496`	`2506`	`"steps": [`
`2497`	`2507`	`{`
`2498`		`- "color": "green"`
	`2508`	`+ "color": "green",`
	`2509`	`+ "value": null`
`2499`	`2510`	`},`
`2500`	`2511`	`{`
`2501`	`2512`	`"color": "red",`
`@@ -2561,7 +2572,8 @@`
`2561`	`2572`	`"mode": "absolute",`
`2562`	`2573`	`"steps": [`
`2563`	`2574`	`{`
`2564`		`- "color": "green"`
	`2575`	`+ "color": "green",`
	`2576`	`+ "value": null`
`2565`	`2577`	`}`
`2566`	`2578`	`]`
`2567`	`2579`	`}`
`@@ -2661,7 +2673,8 @@`
`2661`	`2673`	`"mode": "absolute",`
`2662`	`2674`	`"steps": [`
`2663`	`2675`	`{`
`2664`		`- "color": "green"`
	`2676`	`+ "color": "green",`
	`2677`	`+ "value": null`
`2665`	`2678`	`},`
`2666`	`2679`	`{`
`2667`	`2680`	`"color": "red",`
`@@ -2728,7 +2741,8 @@`
`2728`	`2741`	`"mode": "absolute",`
`2729`	`2742`	`"steps": [`
`2730`	`2743`	`{`
`2731`		`- "color": "green"`
	`2744`	`+ "color": "green",`
	`2745`	`+ "value": null`
`2732`	`2746`	`},`
`2733`	`2747`	`{`
`2734`	`2748`	`"color": "#EAB839",`
`@@ -2835,7 +2849,8 @@`
`2835`	`2849`	`"mode": "absolute",`
`2836`	`2850`	`"steps": [`
`2837`	`2851`	`{`
`2838`		`- "color": "green"`
	`2852`	`+ "color": "green",`
	`2853`	`+ "value": null`
`2839`	`2854`	`},`
`2840`	`2855`	`{`
`2841`	`2856`	`"color": "red",`
`@@ -2933,7 +2948,8 @@`
`2933`	`2948`	`"mode": "absolute",`
`2934`	`2949`	`"steps": [`
`2935`	`2950`	`{`
`2936`		`- "color": "green"`
	`2951`	`+ "color": "green",`
	`2952`	`+ "value": null`
`2937`	`2953`	`},`
`2938`	`2954`	`{`
`2939`	`2955`	`"color": "red",`
`@@ -3000,7 +3016,8 @@`
`3000`	`3016`	`"mode": "absolute",`
`3001`	`3017`	`"steps": [`
`3002`	`3018`	`{`
`3003`		`- "color": "green"`
	`3019`	`+ "color": "green",`
	`3020`	`+ "value": null`
`3004`	`3021`	`},`
`3005`	`3022`	`{`
`3006`	`3023`	`"color": "#EAB839",`
`@@ -3107,7 +3124,8 @@`
`3107`	`3124`	`"mode": "absolute",`
`3108`	`3125`	`"steps": [`
`3109`	`3126`	`{`
`3110`		`- "color": "green"`
	`3127`	`+ "color": "green",`
	`3128`	`+ "value": null`
`3111`	`3129`	`}`
`3112`	`3130`	`]`
`3113`	`3131`	`}`
`@@ -3201,7 +3219,8 @@`
`3201`	`3219`	`"mode": "absolute",`
`3202`	`3220`	`"steps": [`
`3203`	`3221`	`{`
`3204`		`- "color": "green"`
	`3222`	`+ "color": "green",`
	`3223`	`+ "value": null`
`3205`	`3224`	`}`
`3206`	`3225`	`]`
`3207`	`3226`	`}`
`@@ -3288,7 +3307,8 @@`
`3288`	`3307`	`"mode": "absolute",`
`3289`	`3308`	`"steps": [`
`3290`	`3309`	`{`
`3291`		`- "color": "green"`
	`3310`	`+ "color": "green",`
	`3311`	`+ "value": null`
`3292`	`3312`	`}`
`3293`	`3313`	`]`
`3294`	`3314`	`},`
`@@ -3388,7 +3408,8 @@`
`3388`	`3408`	`"mode": "absolute",`
`3389`	`3409`	`"steps": [`
`3390`	`3410`	`{`
`3391`		`- "color": "green"`
	`3411`	`+ "color": "green",`
	`3412`	`+ "value": null`
`3392`	`3413`	`}`
`3393`	`3414`	`]`
`3394`	`3415`	`},`
`@@ -3459,7 +3480,8 @@`
`3459`	`3480`	`"mode": "absolute",`
`3460`	`3481`	`"steps": [`
`3461`	`3482`	`{`
`3462`		`- "color": "green"`
	`3483`	`+ "color": "green",`
	`3484`	`+ "value": null`
`3463`	`3485`	`},`
`3464`	`3486`	`{`
`3465`	`3487`	`"color": "red",`
`@@ -3599,7 +3621,8 @@`
`3599`	`3621`	`"mode": "absolute",`
`3600`	`3622`	`"steps": [`
`3601`	`3623`	`{`
`3602`		`- "color": "green"`
	`3624`	`+ "color": "green",`
	`3625`	`+ "value": null`
`3603`	`3626`	`},`
`3604`	`3627`	`{`
`3605`	`3628`	`"color": "red",`
`@@ -3675,7 +3698,8 @@`
`3675`	`3698`	`"mode": "absolute",`
`3676`	`3699`	`"steps": [`
`3677`	`3700`	`{`
`3678`		`- "color": "green"`
	`3701`	`+ "color": "green",`
	`3702`	`+ "value": null`
`3679`	`3703`	`}`
`3680`	`3704`	`]`
`3681`	`3705`	`}`
`@@ -3825,7 +3849,8 @@`
`3825`	`3849`	`"mode": "absolute",`
`3826`	`3850`	`"steps": [`
`3827`	`3851`	`{`
`3828`		`- "color": "green"`
	`3852`	`+ "color": "green",`
	`3853`	`+ "value": null`
`3829`	`3854`	`},`
`3830`	`3855`	`{`
`3831`	`3856`	`"color": "red",`
`@@ -3926,7 +3951,8 @@`
`3926`	`3951`	`"mode": "absolute",`
`3927`	`3952`	`"steps": [`
`3928`	`3953`	`{`
`3929`		`- "color": "green"`
	`3954`	`+ "color": "green",`
	`3955`	`+ "value": null`
`3930`	`3956`	`},`
`3931`	`3957`	`{`
`3932`	`3958`	`"color": "red",`
`@@ -3966,8 +3992,8 @@`
`3966`	`3992`	`"uid": "prometheus"`
`3967`	`3993`	`},`
`3968`	`3994`	`"disableTextWrap": false,`
`3969`		`- "editorMode": "builder",`
`3970`		`- "expr": "message_handler_batch_lock_timeouts_count",`
	`3995`	`+ "editorMode": "code",`
	`3996`	`+ "expr": "floor(increase(message_handler_batch_lock_timeouts_count{job=\"aligned-batcher\"}[$__range]))",`
`3971`	`3997`	`"fullMetaSearch": false,`
`3972`	`3998`	`"includeNullMetadata": true,`
`3973`	`3999`	`"instant": false,`
`@@ -3982,8 +4008,8 @@`
`3982`	`4008`	`"uid": "prometheus"`
`3983`	`4009`	`},`
`3984`	`4010`	`"disableTextWrap": false,`
`3985`		`- "editorMode": "builder",`
`3986`		`- "expr": "message_handler_user_lock_timeouts_count",`
	`4011`	`+ "editorMode": "code",`
	`4012`	`+ "expr": "floor(increase(message_handler_user_lock_timeouts_count{job=\"aligned-batcher\"}[$__range]))",`
`3987`	`4013`	`"fullMetaSearch": false,`
`3988`	`4014`	`"hide": false,`
`3989`	`4015`	`"includeNullMetadata": true,`
`@@ -4068,7 +4094,8 @@`
`4068`	`4094`	`"mode": "absolute",`
`4069`	`4095`	`"steps": [`
`4070`	`4096`	`{`
`4071`		`- "color": "green"`
	`4097`	`+ "color": "green",`
	`4098`	`+ "value": null`
`4072`	`4099`	`}`
`4073`	`4100`	`]`
`4074`	`4101`	`},`
`@@ -4163,7 +4190,8 @@`
`4163`	`4190`	`"mode": "absolute",`
`4164`	`4191`	`"steps": [`
`4165`	`4192`	`{`
`4166`		`- "color": "green"`
	`4193`	`+ "color": "green",`
	`4194`	`+ "value": null`
`4167`	`4195`	`},`
`4168`	`4196`	`{`
`4169`	`4197`	`"color": "red",`
`@@ -4455,6 +4483,6 @@`
`4455`	`4483`	`"timezone": "browser",`
`4456`	`4484`	`"title": "System Data",`
`4457`	`4485`	`"uid": "aggregator",`
`4458`		`- "version": 7,`
	`4486`	`+ "version": 20,`
`4459`	`4487`	`"weekStart": ""`
`4460`		`-}`
	`4488`	`+}`