chore: more accurate cumulative counter rate calc

frontend/public/locales/en-GB/alerts.json

@@ -43,11 +43,18 @@
 	"option_15min": "15 mins",
 	"option_30min": "30 mins",
 	"option_60min": "60 mins",
-	"option_4hours": "4 hours",
+	"option_2hours": "2 hours",
 	"option_3hours": "3 hours",
+	"option_4hours": "4 hours",
+	"option_5hours": "5 hours",
 	"option_6hours": "6 hours",
+	"option_8hours": "8 hours",
+	"option_10hours": "10 hours",
 	"option_12hours": "12 hours",
 	"option_24hours": "24 hours",
+	"option_48hours": "48 hours",
+	"option_72hours": "72 hours",
+	"option_1week": "1 week",
 	"field_threshold": "Alert Threshold",
 	"option_allthetimes": "all the times",
 	"option_atleastonce": "at least once",

frontend/public/locales/en-GB/rules.json

@@ -29,12 +29,24 @@
 	"text_condition1": "Send a notification when",
 	"text_condition2": "the threshold",
 	"text_condition3": "during the last",
+	"option_1min": "1 min",
 	"option_5min": "5 mins",
 	"option_10min": "10 mins",
 	"option_15min": "15 mins",
+	"option_30min": "30 mins",
 	"option_60min": "60 mins",
+	"option_2hours": "2 hours",
+	"option_3hours": "3 hours",
 	"option_4hours": "4 hours",
+	"option_5hours": "5 hours",
+	"option_6hours": "6 hours",
+	"option_8hours": "8 hours",
+	"option_10hours": "10 hours",
+	"option_12hours": "12 hours",
 	"option_24hours": "24 hours",
+	"option_48hours": "48 hours",
+	"option_72hours": "72 hours",
+	"option_1week": "1 week",
 	"field_threshold": "Alert Threshold",
 	"option_allthetimes": "all the times",
 	"option_atleastonce": "at least once",

frontend/public/locales/en/alerts.json

@@ -47,11 +47,18 @@
 	"option_15min": "15 mins",
 	"option_30min": "30 mins",
 	"option_60min": "60 mins",
+	"option_2hours": "2 hours",
 	"option_3hours": "3 hours",
 	"option_4hours": "4 hours",
+	"option_5hours": "5 hours",
 	"option_6hours": "6 hours",
+	"option_8hours": "8 hours",
+	"option_10hours": "10 hours",
 	"option_12hours": "12 hours",
 	"option_24hours": "24 hours",
+	"option_48hours": "48 hours",
+	"option_72hours": "72 hours",
+	"option_1week": "1 week",
 	"field_threshold": "Alert Threshold",
 	"option_allthetimes": "all the times",
 	"option_atleastonce": "at least once",

frontend/public/locales/en/rules.json

@@ -29,12 +29,24 @@
 	"text_condition1": "Send a notification when",
 	"text_condition2": "the threshold",
 	"text_condition3": "during the last",
+	"option_1min": "1 min",
 	"option_5min": "5 mins",
 	"option_10min": "10 mins",
 	"option_15min": "15 mins",
+	"option_30min": "30 mins",
 	"option_60min": "60 mins",
+	"option_2hours": "2 hours",
+	"option_3hours": "3 hours",
 	"option_4hours": "4 hours",
+	"option_5hours": "5 hours",
+	"option_6hours": "6 hours",
+	"option_8hours": "8 hours",
+	"option_10hours": "10 hours",
+	"option_12hours": "12 hours",
 	"option_24hours": "24 hours",
+	"option_48hours": "48 hours",
+	"option_72hours": "72 hours",
+	"option_1week": "1 week",
 	"field_threshold": "Alert Threshold",
 	"option_allthetimes": "all the times",
 	"option_atleastonce": "at least once",

frontend/src/container/FormAlertRules/RuleOptions.tsx

@@ -181,8 +181,18 @@ function RuleOptions({
 			<Select.Option value="10m0s">{t('option_10min')}</Select.Option>
 			<Select.Option value="15m0s">{t('option_15min')}</Select.Option>
 			<Select.Option value="1h0m0s">{t('option_60min')}</Select.Option>
+			<Select.Option value="2h0m0s">{t('option_2hours')}</Select.Option>
+			<Select.Option value="3h0m0s">{t('option_3hours')}</Select.Option>
 			<Select.Option value="4h0m0s">{t('option_4hours')}</Select.Option>
+			<Select.Option value="5h0m0s">{t('option_5hours')}</Select.Option>
+			<Select.Option value="6h0m0s">{t('option_6hours')}</Select.Option>
+			<Select.Option value="8h0m0s">{t('option_8hours')}</Select.Option>
+			<Select.Option value="10h0m0s">{t('option_10hours')}</Select.Option>
+			<Select.Option value="12h0m0s">{t('option_12hours')}</Select.Option>
 			<Select.Option value="24h0m0s">{t('option_24hours')}</Select.Option>
+			<Select.Option value="48h0m0s">{t('option_48hours')}</Select.Option>
+			<Select.Option value="72h0m0s">{t('option_72hours')}</Select.Option>
+			<Select.Option value="168h0m0s">{t('option_1week')}</Select.Option>
 		</InlineSelect>
 	);
 

pkg/query-service/app/metrics/v4/cumulative/timeseries.go

@@ -38,8 +38,8 @@ import (
 //
 // The `increase` function is similar to the `rate` function, except that it does not divide by the time interval.
 const (
-	rateWithoutNegative     = `If((per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) < 0, nan, If((ts - lagInFrame(ts, 1, toDate('1970-01-01')) OVER rate_window) >= 86400, nan, (per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) / (ts - lagInFrame(ts, 1, toDate('1970-01-01')) OVER rate_window)))`
-	increaseWithoutNegative = `If((per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) < 0, nan, If((ts - lagInFrame(ts, 1, toDate('1970-01-01')) OVER rate_window) >= 86400, nan, (per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window)))`
+	rateWithoutNegative     = `If((per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) < 0, per_series_value, (per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) / (ts - lagInFrame(ts, 1, toDateTime(fromUnixTimestamp64Milli(%d))) OVER rate_window))`
+	increaseWithoutNegative = `If((per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window) < 0, per_series_value, (per_series_value - lagInFrame(per_series_value, 1, 0) OVER rate_window))`
 )
 
 // prepareTimeAggregationSubQueryTimeSeries prepares the sub-query to be used for temporal aggregation
@@ -151,6 +151,7 @@ func prepareTimeAggregationSubQuery(start, end, step int64, mq *v3.BuilderQuery)
 		subQuery = fmt.Sprintf(queryTmpl, selectLabelsAny, step, op, timeSeriesSubQuery)
 	case v3.TimeAggregationRate:
 		innerSubQuery := fmt.Sprintf(queryTmpl, selectLabelsAny, step, op, timeSeriesSubQuery)
+		rateWithoutNegative := fmt.Sprintf(rateWithoutNegative, start)
 		rateQueryTmpl :=
 			"SELECT %s ts, " + rateWithoutNegative +
 				" as per_series_value FROM (%s) WINDOW rate_window as (PARTITION BY fingerprint ORDER BY fingerprint, ts)"