Skip to content

Fix interval template for increase/delta functions. #1449

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 2 commits into from
Jun 18, 2025
Merged

Fix interval template for increase/delta functions. #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
348db70
Fix interval template for increase/delta functions.
v-zhuravlev Jun 11, 2025
49c592e
Fix
v-zhuravlev Jun 11, 2025
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
3 changes: 3 additions & 0 deletions common-lib/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 0.3.4
- [Signal] Fix interval template for increase/delta functions.

# 0.3.3
- [Signal] add `withQuantile(quantile=0.95)` to histogram signals.

Expand Down
9 changes: 6 additions & 3 deletions common-lib/common/signal/base.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ local xtd = import 'github.com/jsonnet-libs/xtd/main.libsonnet';
],
)
else {}),

//Return query
asPanelExpression():
self.combineUniqueExpressions(
Expand All @@ -252,16 +251,18 @@ local xtd = import 'github.com/jsonnet-libs/xtd/main.libsonnet';
if source.infoLabel != null then [source.infoLabel]
else []
);
local vars = this.vars { agg: std.join(',', aggLabels) };
signalUtils.wrapExpr(
type,
source.expr,
exprWrappers=std.get(source, 'exprWrappers', default=[]),
q=std.get(source, 'quantile', default=0.95),
aggLevel=aggLevel,
rangeFunction=source.rangeFunction,
alertRule=false,
).applyFunctions()
% vars
% this.vars {
agg: std.join(',', aggLabels),
}
for source in this.sourceMaps
]
),
Expand All @@ -278,6 +279,8 @@ local xtd = import 'github.com/jsonnet-libs/xtd/main.libsonnet';
q=std.get(source, 'quantile', default=0.95),
aggLevel='none',
rangeFunction=source.rangeFunction,
// ensure that interval doesn't have Grafana dashboard dynamic intervals:
alertRule=true,
).applyFunctions()
% this.vars
{ // ensure that interval doesn't have Grafana dashboard dynamic intervals:
Expand Down
7 changes: 5 additions & 2 deletions common-lib/common/signal/utils.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
wrapExpr(type, expr, exprWrappers=[], q=0.95, aggLevel, rangeFunction): {
wrapExpr(type, expr, exprWrappers=[], q=0.95, aggLevel, rangeFunction, alertRule): {

// additional templates to wrap base expression
functionTemplates::
Expand All @@ -22,7 +22,10 @@
expr: if type == 'counter' then
(
// for increase/delta/idelta - must be $__interval with negative offset for proper Total calculations, else use default from init function.
local interval = if (rangeFunction == 'idelta' || rangeFunction == 'delta' || rangeFunction == 'increase') then '[$__interval:] offset -$__interval' else '[%(interval)s]';
local interval =
if (rangeFunction == 'idelta' || rangeFunction == 'delta' || rangeFunction == 'increase') then
(if alertRule then '[%(interval)s:] offset -%(interval)s' else '[$__interval:] offset -$__interval')
else '[%(interval)s]';
local baseExpr = rangeFunction + '(' + expr + interval + ')';
baseExpr
)
Expand Down
Loading