Fix interval template for increase/delta functions. (#1449)

* Fix interval template for increase/delta functions.

* Fix

Author: v-zhuravlev

common-lib/CHANGELOG.md

@@ -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.
 

common-lib/common/signal/base.libsonnet

@@ -230,7 +230,6 @@ local xtd = import 'github.com/jsonnet-libs/xtd/main.libsonnet';
              ],
            )
          else {}),
-
     //Return query
     asPanelExpression():
       self.combineUniqueExpressions(
@@ -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
         ]
       ),
@@ -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:

common-lib/common/signal/utils.libsonnet

@@ -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::
@@ -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
       )