Skip to content

Commit d6c3728

Browse files
ahadasahadas
committed
fix: per-model(s) top-level values in usage dashboard
The top-levels values of Total Requests, Total Errors, Success Rate, and Active Users, are now calculated also based on the selected model(s). Signed-off-by: Arik Hadas <ahadas@redhat.com>
1 parent 65ca551 commit d6c3728

1 file changed

Lines changed: 102 additions & 5 deletions

File tree

‎deployment/components/observability/observability/dashboards/usage-dashboard.yaml‎

Lines changed: 102 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,33 @@ spec:
8181
datasource:
8282
kind: PrometheusDatasource
8383
name: kuadrant-prometheus-datasource
84-
query: 'count(count by (user) (increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]) > 0)) or vector(0)'
84+
query: |-
85+
count(
86+
count by (user) (
87+
(
88+
(
89+
sum by (user, subscription, limitador_namespace) (
90+
increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
91+
)
92+
+
93+
sum by (user, subscription, limitador_namespace) (
94+
increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
95+
)
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])
104+
)
105+
)
106+
* on(user, subscription, limitador_namespace)
107+
(0 * max by (user, subscription, limitador_namespace) (max_over_time(authorized_hits{model=~"$model"}[$__range])) + 1)
108+
> 0
109+
)
110+
) or vector(0)
85111
seriesNameFormat: Users
86112
successRate:
87113
kind: Panel
@@ -105,7 +131,41 @@ spec:
105131
datasource:
106132
kind: PrometheusDatasource
107133
name: kuadrant-prometheus-datasource
108-
query: '((sum(increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))) / ((sum(increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])) + (sum(increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])) or vector(0))) > 0)) or vector(1)'
134+
query: |-
135+
(
136+
(
137+
sum(
138+
sum by (user, subscription, limitador_namespace) (
139+
increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
140+
)
141+
* on(user, subscription, limitador_namespace)
142+
(0 * max by (user, subscription, limitador_namespace) (max_over_time(authorized_hits{model=~"$model"}[$__range])) + 1)
143+
)
144+
)
145+
/
146+
(
147+
(
148+
sum(
149+
sum by (user, subscription, limitador_namespace) (
150+
increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
151+
)
152+
* on(user, subscription, limitador_namespace)
153+
(0 * max by (user, subscription, limitador_namespace) (max_over_time(authorized_hits{model=~"$model"}[$__range])) + 1)
154+
)
155+
+
156+
(
157+
sum(
158+
sum by (user, subscription, limitador_namespace) (
159+
increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
160+
)
161+
* on(user, subscription, limitador_namespace)
162+
(0 * max by (user, subscription, limitador_namespace) (max_over_time(authorized_hits{model=~"$model"}[$__range])) + 1)
163+
)
164+
or vector(0)
165+
)
166+
) > 0
167+
)
168+
) or vector(1)
109169
seriesNameFormat: Success Rate
110170
tokenConsumptionByUser:
111171
kind: Panel
@@ -180,7 +240,15 @@ spec:
180240
query: |-
181241
round(
182242
sum by (user, subscription, model) (
183-
sum by (user, subscription, limitador_namespace) (increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))
243+
(
244+
(
245+
sum by (user, subscription, limitador_namespace) (increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))
246+
+
247+
sum by (user, subscription, limitador_namespace) (increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))
248+
)
249+
or
250+
sum by (user, subscription, limitador_namespace) (increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range]))
251+
)
184252
* on(user, subscription, limitador_namespace) group_left(model)
185253
(0 * max by (user, subscription, limitador_namespace, model) (max_over_time(authorized_hits{model=~"$model"}[$__range])) + 1)
186254
)
@@ -228,7 +296,15 @@ spec:
228296
datasource:
229297
kind: PrometheusDatasource
230298
name: kuadrant-prometheus-datasource
231-
query: 'sum(increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])) or vector(0)'
299+
query: |-
300+
sum(
301+
sum by (user, subscription, limitador_namespace) (
302+
increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
303+
)
304+
* on(user, subscription, limitador_namespace)
305+
(0 * max by (user, subscription, limitador_namespace) (max_over_time(authorized_hits{model=~"$model"}[$__range])) + 1)
306+
)
307+
or vector(0)
232308
seriesNameFormat: Errors
233309
totalRequests:
234310
kind: Panel
@@ -253,7 +329,28 @@ spec:
253329
datasource:
254330
kind: PrometheusDatasource
255331
name: kuadrant-prometheus-datasource
256-
query: '(sum(increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])) or vector(0)) + (sum(increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])) or vector(0))'
332+
query: |-
333+
(
334+
sum(
335+
sum by (user, subscription, limitador_namespace) (
336+
increase(authorized_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
337+
)
338+
* on(user, subscription, limitador_namespace)
339+
(0 * max by (user, subscription, limitador_namespace) (max_over_time(authorized_hits{model=~"$model"}[$__range])) + 1)
340+
)
341+
or vector(0)
342+
)
343+
+
344+
(
345+
sum(
346+
sum by (user, subscription, limitador_namespace) (
347+
increase(limited_calls{user!="", user=~"$user", subscription=~"$subscription"}[$__range])
348+
)
349+
* on(user, subscription, limitador_namespace)
350+
(0 * max by (user, subscription, limitador_namespace) (max_over_time(authorized_hits{model=~"$model"}[$__range])) + 1)
351+
)
352+
or vector(0)
353+
)
257354
seriesNameFormat: Requests
258355
totalTokens:
259356
kind: Panel

0 commit comments

Comments
 (0)