fix

ahadas · ahadas · commit 192bad788d58 · 2026-04-20T09:48:34.000+03:00
diff --git a/deployment/components/observability/observability/dashboards/usage-dashboard.yaml b/deployment/components/observability/observability/dashboards/usage-dashboard.yaml
@@ -89,14 +89,18 @@ spec:
                             sum by (user, subscription, limitador_namespace) (
                               increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
                             )
-                            or vector(0)
-                          )
-                          +
-                          (
+                            +
                             sum by (user, subscription, limitador_namespace) (
                               increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
                             )
-                            or vector(0)
+                          )
+                          or
+                          sum by (user, subscription, limitador_namespace) (
+                            increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
+                          )
+                          or
+                          sum by (user, subscription, limitador_namespace) (
+                            increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
                           )
                         )
                         * on(user, subscription, limitador_namespace)
@@ -253,13 +257,13 @@ spec:
                         (
                           (
                             sum by (user, subscription, limitador_namespace) (increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))
-                            or vector(0)
-                          )
-                          +
-                          (
+                            +
                             sum by (user, subscription, limitador_namespace) (increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))
-                            or vector(0)
                           )
+                          or
+                          sum by (user, subscription, limitador_namespace) (increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))
+                          or
+                          sum by (user, subscription, limitador_namespace) (increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))
                         )
                         * on(user, subscription, limitador_namespace) group_left(model)
                         (

Original file line number	Diff line number	Diff line change
`@@ -89,14 +89,18 @@ spec:`
`89`	`89`	`sum by (user, subscription, limitador_namespace) (`
`90`	`90`	`increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])`
`91`	`91`	`)`
`92`		`- or vector(0)`
`93`		`- )`
`94`		`- +`
`95`		`- (`
	`92`	`+ +`
`96`	`93`	`sum by (user, subscription, limitador_namespace) (`
`97`	`94`	`increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])`
`98`	`95`	`)`
`99`		`- or vector(0)`
	`96`	`+ )`
	`97`	`+ or`
	`98`	`+ sum by (user, subscription, limitador_namespace) (`
	`99`	`+ increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])`
	`100`	`+ )`
	`101`	`+ or`
	`102`	`+ sum by (user, subscription, limitador_namespace) (`
	`103`	`+ increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])`
`100`	`104`	`)`
`101`	`105`	`)`
`102`	`106`	`* on(user, subscription, limitador_namespace)`
`@@ -253,13 +257,13 @@ spec:`
`253`	`257`	`(`
`254`	`258`	`(`
`255`	`259`	`sum by (user, subscription, limitador_namespace) (increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))`
`256`		`- or vector(0)`
`257`		`- )`
`258`		`- +`
`259`		`- (`
	`260`	`+ +`
`260`	`261`	`sum by (user, subscription, limitador_namespace) (increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))`
`261`		`- or vector(0)`
`262`	`262`	`)`
	`263`	`+ or`
	`264`	`+ sum by (user, subscription, limitador_namespace) (increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))`
	`265`	`+ or`
	`266`	`+ sum by (user, subscription, limitador_namespace) (increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))`
`263`	`267`	`)`
`264`	`268`	`* on(user, subscription, limitador_namespace) group_left(model)`
`265`	`269`	`(`