feat: add version check for thanos. keep_firing_for now available (#6283

)
prometheus-operator · Feb 8, 2024 · c5098f5 · c5098f5
1 parent ca78f91
commit c5098f5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 14 deletions.
diff --git a/pkg/operator/rules.go b/pkg/operator/rules.go
@@ -107,6 +107,7 @@ func (prs *PrometheusRuleSelector) sanitizePrometheusRulesSpec(promRuleSpec moni
 	component := "Prometheus"
 
 	if prs.ruleFormat == ThanosFormat {
+		minVersionKeepFiringFor = semver.MustParse("0.34.0")
 		minVersionLimits = semver.MustParse("0.24.0")
 		component = "Thanos"
 	}
@@ -123,18 +124,9 @@ func (prs *PrometheusRuleSelector) sanitizePrometheusRulesSpec(promRuleSpec moni
 		}
 
 		for j := range promRuleSpec.Groups[i].Rules {
-			switch prs.ruleFormat {
-			case PrometheusFormat:
-				if promRuleSpec.Groups[i].Rules[j].KeepFiringFor != nil && prs.version.LT(minVersionKeepFiringFor) {
-					promRuleSpec.Groups[i].Rules[j].KeepFiringFor = nil
-					level.Warn(logger).Log("msg", fmt.Sprintf("ignoring 'keep_firing_for' not supported by %s", component), "minimum_version", minVersionKeepFiringFor)
-				}
-			case ThanosFormat:
-				// keep_firing_for is not yet supported in thanos https://github.com/thanos-io/thanos/issues/6165
-				if promRuleSpec.Groups[i].Rules[j].KeepFiringFor != nil {
-					promRuleSpec.Groups[i].Rules[j].KeepFiringFor = nil
-					level.Warn(logger).Log("msg", "ignoring `keep_firing_for` as it is not yet supported in thanos, see https://github.com/thanos-io/thanos/issues/6165")
-				}
+			if promRuleSpec.Groups[i].Rules[j].KeepFiringFor != nil && prs.version.LT(minVersionKeepFiringFor) {
+				promRuleSpec.Groups[i].Rules[j].KeepFiringFor = nil
+				level.Warn(logger).Log("msg", fmt.Sprintf("ignoring 'keep_firing_for' not supported by %s", component), "minimum_version", minVersionKeepFiringFor)
 			}
 		}
 	}

diff --git a/pkg/operator/rules_test.go b/pkg/operator/rules_test.go
@@ -38,7 +38,8 @@ func TestMakeRulesConfigMaps(t *testing.T) {
 	t.Run("shouldDropLimitFieldForUnsupportedPrometheusVersion", shouldDropLimitFieldForUnsupportedPrometheusVersion)
 	t.Run("shouldDropLimitFieldForUnsupportedThanosVersion", shouldDropLimitFieldForUnsupportedThanosVersion)
 	t.Run("shouldAcceptRuleWithKeepFiringForPrometheus", shouldAcceptRuleWithKeepFiringForPrometheus)
-	t.Run("shouldDropKeepFiringForThanos", shouldDropKeepFiringForThanos)
+	t.Run("shouldDropRuleFiringForThanos", shouldDropRuleFiringForThanos)
+	t.Run("shouldAcceptRuleFiringForThanos", shouldAcceptRuleFiringForThanos)
 	t.Run("shouldDropKeepFiringForFieldForUnsupportedPrometheusVersion", shouldDropKeepFiringForFieldForUnsupportedPrometheusVersion)
 }
 
@@ -227,7 +228,7 @@ func shouldAcceptRuleWithKeepFiringForPrometheus(t *testing.T) {
 	}
 }
 
-func shouldDropKeepFiringForThanos(t *testing.T) {
+func shouldDropRuleFiringForThanos(t *testing.T) {
 	duration := monitoringv1.NonEmptyDuration("5m")
 	rules := &monitoringv1.PrometheusRule{
 		Spec: monitoringv1.PrometheusRuleSpec{Groups: []monitoringv1.RuleGroup{
@@ -252,6 +253,31 @@ func shouldDropKeepFiringForThanos(t *testing.T) {
 	}
 }
 
+func shouldAcceptRuleFiringForThanos(t *testing.T) {
+	duration := monitoringv1.NonEmptyDuration("5m")
+	rules := &monitoringv1.PrometheusRule{
+		Spec: monitoringv1.PrometheusRuleSpec{Groups: []monitoringv1.RuleGroup{
+			{
+				Name: "group",
+				Rules: []monitoringv1.Rule{
+					{
+						Alert:         "alert",
+						Expr:          intstr.FromString("vector(1)"),
+						KeepFiringFor: &duration,
+					},
+				},
+			},
+		}},
+	}
+
+	thanosVersion, _ := semver.ParseTolerant("v0.34.0")
+	pr := newRuleSelectorForConfigGeneration(ThanosFormat, thanosVersion)
+	content, _ := pr.generateRulesConfiguration(rules)
+	if !strings.Contains(content, "keep_firing_for") {
+		t.Fatalf("expected `keep_firing_for` to be present in PrometheusRule")
+	}
+}
+
 func shouldDropKeepFiringForFieldForUnsupportedPrometheusVersion(t *testing.T) {
 	duration := monitoringv1.NonEmptyDuration("5m")
 	rules := &monitoringv1.PrometheusRule{