Fix tests

Signed-off-by: Mustafain Ali Khan <[email protected]>

Author: mustafain117

docs/configuration/config-file-reference.md

@@ -4116,6 +4116,10 @@ ruler_client:
 # CLI flag: -ruler.rule-path
 [rule_path: <string> | default = "/rules"]
 
+# Default offset for all rule evaluation queries
+# CLI flag: -ruler.rule-query-offset
+[rule_query_offset: <duration> | default = 0s]
+
 # Comma-separated list of URL(s) of the Alertmanager(s) to send notifications
 # to. Each Alertmanager URL is treated as a separate group in the configuration.
 # Multiple Alertmanagers in HA per group can be supported by using DNS

pkg/ruler/api_test.go

@@ -263,7 +263,7 @@ interval: 15s
 			err:    errors.New("invalid rules config: rule group 'rg_name' has no rules"),
 		},
 		{
-			name:   "with a a valid rules file",
+			name:   "with a valid rules file",
 			status: 202,
 			input: `
 name: test
@@ -279,7 +279,20 @@ rules:
   labels:
     test: test
 `,
-			output: "name: test\ninterval: 15s\nrules:\n    - record: up_rule\n      expr: up{}\n    - alert: up_alert\n      expr: sum(up{}) > 1\n      for: 30s\n      labels:\n        test: test\n      annotations:\n        test: test\n",
+			output: "name: test\ninterval: 15s\nquery_offset: 0s\nrules:\n    - record: up_rule\n      expr: up{}\n    - alert: up_alert\n      expr: sum(up{}) > 1\n      for: 30s\n      labels:\n        test: test\n      annotations:\n        test: test\n",
+		},
+		{
+			name:   "with a valid rule query offset",
+			status: 202,
+			input: `
+name: test
+interval: 15s
+query_offset: 2m
+rules:
+- record: up_rule
+  expr: up{}
+`,
+			output: "name: test\ninterval: 15s\nquery_offset: 2m\nrules:\n    - record: up_rule\n      expr: up{}\n",
 		},
 	}
 
@@ -329,7 +342,7 @@ func TestRuler_DeleteNamespace(t *testing.T) {
 
 	router.ServeHTTP(w, req)
 	require.Equal(t, http.StatusOK, w.Code)
-	require.Equal(t, "name: group1\ninterval: 1m\nrules:\n    - record: UP_RULE\n      expr: up\n    - alert: UP_ALERT\n      expr: up < 1\n", w.Body.String())
+	require.Equal(t, "name: group1\ninterval: 1m\nquery_offset: 0s\nrules:\n    - record: UP_RULE\n      expr: up\n    - alert: UP_ALERT\n      expr: up < 1\n", w.Body.String())
 
 	// Delete namespace1
 	req = requestFor(t, http.MethodDelete, "https://localhost:8080/api/v1/rules/namespace1", nil, "user1")

pkg/ruler/ruler.go

@@ -105,6 +105,8 @@ type Config struct {
 	PollInterval time.Duration `yaml:"poll_interval"`
 	// Path to store rule files for prom manager.
 	RulePath string `yaml:"rule_path"`
+	// Default offset for all rule evaluation queries.
+	RuleQueryOffset time.Duration `yaml:"rule_query_offset"`
 
 	// URL of the Alertmanager to send notifications to.
 	// If you are configuring the ruler to send to a Cortex Alertmanager,
@@ -121,8 +123,6 @@ type Config struct {
 	// Client configs for interacting with the Alertmanager
 	Notifier NotifierConfig `yaml:"alertmanager_client"`
 
-	//Default offset for all rule evaluation queries.
-	RuleQueryOffset time.Duration `yaml:"rule_query_offset"`
 	// Max time to tolerate outage for restoring "for" state of alert.
 	OutageTolerance time.Duration `yaml:"for_outage_tolerance"`
 	// Minimum duration between alert and restored "for" state. This is maintained only for alerts with configured "for" time greater than grace period.

pkg/ruler/ruler_test.go

@@ -2413,7 +2413,7 @@ func TestRuler_QueryOffset(t *testing.T) {
 	expectedRg := mockRulesQueryOffset["user1"][0]
 	compareRuleGroupDescToStateDesc(t, expectedRg, rg)
 
-	// test default query offset=0
+	// test default query offset=0 when not defined at group level
 	require.Equal(t, time.Duration(0), rg.GetGroup().QueryOffset)
 
 	ctx = user.InjectOrgID(context.Background(), "user2")
@@ -2426,5 +2426,4 @@ func TestRuler_QueryOffset(t *testing.T) {
 
 	// test group query offset is set
 	require.Equal(t, time.Minute*2, rg.GetGroup().QueryOffset)
-	rulespb.FromProto(rg.GetGroup())
 }

pkg/ruler/rulespb/compat.go

@@ -13,14 +13,18 @@ import (
 
 // ToProto transforms a formatted prometheus rulegroup to a rule group protobuf
 func ToProto(user string, namespace string, rl rulefmt.RuleGroup) *RuleGroupDesc {
+	queryOffset := time.Duration(0)
+	if rl.QueryOffset != nil {
+		queryOffset = time.Duration(*rl.QueryOffset)
+	}
 	rg := RuleGroupDesc{
 		Name:        rl.Name,
 		Namespace:   namespace,
 		Interval:    time.Duration(rl.Interval),
 		Rules:       formattedRuleToProto(rl.Rules),
 		User:        user,
 		Limit:       int64(rl.Limit),
-		QueryOffset: time.Duration(*rl.QueryOffset),
+		QueryOffset: queryOffset,
 	}
 	return &rg
 }