Skip to content

mixin-utils: add sum_by parameters to ncHistogramAverageRate #1554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2025
Merged

mixin-utils: add sum_by parameters to ncHistogramAverageRate #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions mixin-utils/test/test_native-classic-histogram.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,16 @@ test.new(std.thisFile)
},
)
)
+ test.case.new(
name='rate of average with sum_by labels',
test=test.expect.eq(
actual=utils.ncHistogramAverageRate('request_duration_seconds', 'cluster="cluster1", job="job1"', sum_by=['namespace']),
expected={
classic: 'sum by (namespace) (rate(request_duration_seconds_sum{cluster="cluster1", job="job1"}[$__rate_interval])) /\nsum by (namespace) (rate(request_duration_seconds_count{cluster="cluster1", job="job1"}[$__rate_interval]))\n',
native: 'sum by (namespace) (histogram_sum(rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))) /\nsum by (namespace) (histogram_count(rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval])))\n',
},
)
)
+ test.case.new(
name='rate of average in recording rule with different interval, multiplier',
test=test.expect.eq(
Expand Down
13 changes: 8 additions & 5 deletions mixin-utils/utils.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,24 +100,27 @@ local g = import 'grafana-builder/grafana.libsonnet';
// classic histograms.
// If from_recording is true, the function will assume :sum_rate metric
// suffix and no rate needed.
ncHistogramAverageRate(metric, selector, rate_interval='$__rate_interval', multiplier='', from_recording=false)::
ncHistogramAverageRate(metric, selector, rate_interval='$__rate_interval', multiplier='', from_recording=false, sum_by=[])::
local sumBy = if std.length(sum_by) > 0 then ' by (%s) ' % std.join(', ', sum_by) else '';
local multiplierStr = if multiplier == '' then '' else '%s * ' % multiplier;
{
classic: |||
%(multiplier)ssum(%(sumMetricQuery)s) /
sum(%(countMetricQuery)s)
%(multiplier)ssum%(sumBy)s(%(sumMetricQuery)s) /
sum%(sumBy)s(%(countMetricQuery)s)
||| % {
sumMetricQuery: $.ncHistogramSumRate(metric, selector, rate_interval, from_recording).classic,
countMetricQuery: $.ncHistogramCountRate(metric, selector, rate_interval, from_recording).classic,
multiplier: multiplierStr,
sumBy: sumBy,
},
native: |||
%(multiplier)ssum(%(sumMetricQuery)s) /
sum(%(countMetricQuery)s)
%(multiplier)ssum%(sumBy)s(%(sumMetricQuery)s) /
sum%(sumBy)s(%(countMetricQuery)s)
||| % {
sumMetricQuery: $.ncHistogramSumRate(metric, selector, rate_interval, from_recording).native,
countMetricQuery: $.ncHistogramCountRate(metric, selector, rate_interval, from_recording).native,
multiplier: multiplierStr,
sumBy: sumBy,
},
},

Expand Down
Loading