Upgrade client-golang and introduce flag for restoring 'for' state

Signed-off-by: Anand Rajagopal <[email protected]>

Author: rajagopalanand

docs/configuration/config-file-reference.md

@@ -4855,6 +4855,10 @@ ring:
 # ruler.enable-ha-evaluation is true.
 # CLI flag: -ruler.liveness-check-timeout
 [liveness_check_timeout: <duration> | default = 1s]
+
+# If true, restores the `for` state of new rule groups added to an existing rule manager.
+# CLI flag: -ruler.always-restore-new-rule-groups
+[always_restore_new_rule_groups: <boolean> | default = false]
 ```
 
 ### `ruler_storage_config`

go.mod

@@ -41,7 +41,7 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/alertmanager v0.28.0
-	github.com/prometheus/client_golang v1.21.0-rc.0
+	github.com/prometheus/client_golang v1.21.1
 	github.com/prometheus/client_model v0.6.1
 	github.com/prometheus/common v0.62.0
 	// Prometheus maps version 2.x.y to tags v0.x.y.

go.sum

@@ -1573,6 +1573,8 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr
 github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.21.0-rc.0 h1:bR+RxBlwcr4q8hXkgSOA/J18j6n0/qH0Gb0DH+8c+RY=
 github.com/prometheus/client_golang v1.21.0-rc.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

pkg/ruler/compat.go

@@ -370,7 +370,7 @@ func DefaultTenantManagerFactory(cfg Config, p Pusher, q storage.Queryable, engi
 			DefaultRuleQueryOffset: func() time.Duration {
 				return overrides.RulerQueryOffset(userID)
 			},
-			RestoreNewRuleGroups: true,
+			RestoreNewRuleGroups: cfg.AlwaysRestoreNewRuleGroups,
 		}), nil
 	}
 }

pkg/ruler/ruler.go

@@ -170,8 +170,9 @@ type Config struct {
 	EnableQueryStats      bool `yaml:"query_stats_enabled"`
 	DisableRuleGroupLabel bool `yaml:"disable_rule_group_label"`
 
-	EnableHAEvaluation   bool          `yaml:"enable_ha_evaluation"`
-	LivenessCheckTimeout time.Duration `yaml:"liveness_check_timeout"`
+	EnableHAEvaluation         bool          `yaml:"enable_ha_evaluation"`
+	LivenessCheckTimeout       time.Duration `yaml:"liveness_check_timeout"`
+	AlwaysRestoreNewRuleGroups bool          `yaml:"always_restore_new_rule_groups"`
 }
 
 // Validate config and returns error on failure
@@ -254,7 +255,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
 
 	f.BoolVar(&cfg.EnableHAEvaluation, "ruler.enable-ha-evaluation", false, "Enable high availability")
 	f.DurationVar(&cfg.LivenessCheckTimeout, "ruler.liveness-check-timeout", 1*time.Second, "Timeout duration for non-primary rulers during liveness checks. If the check times out, the non-primary ruler will evaluate the rule group. Applicable when ruler.enable-ha-evaluation is true.")
-
+	f.BoolVar(&cfg.AlwaysRestoreNewRuleGroups, "ruler.always-restore-new-rule-groups", false, "When enabled, ruler will always restore the `for` state of new rule groups")
 	cfg.RingCheckPeriod = 5 * time.Second
 }