NETOBSERV-976 Fix disabling alerts

netobserv · Apr 19, 2023 · cb460a4 · cb460a4
1 parent 36de463
commit cb460a4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/controllers/flowcollector_controller_test.go b/controllers/flowcollector_controller_test.go
@@ -251,7 +251,8 @@ func flowCollectorControllerSpecs() {
 						Duration: conntrackEndTimeout,
 					},
 					Metrics: flowslatest.FLPMetrics{
-						IgnoreTags: []string{"flows", "bytes", "packets"},
+						IgnoreTags:    []string{"flows", "bytes", "packets"},
+						DisableAlerts: []flowslatest.FLPAlert{flowslatest.AlertLokiError},
 					},
 				}
 				fc.Spec.Loki = flowslatest.FlowCollectorLoki{}
@@ -396,13 +397,15 @@ func flowCollectorControllerSpecs() {
 				}, &sm)
 			}, timeout, interval).Should(Succeed())
 
-			By("Expecting PrometheusRule to exist")
+			By("Expecting PrometheusRule to exist and be updated")
 			Eventually(func() interface{} {
 				return k8sClient.Get(ctx, types.NamespacedName{
 					Name:      "flowlogs-pipeline-alert",
 					Namespace: operatorNamespace,
 				}, &pr)
 			}, timeout, interval).Should(Succeed())
+			Expect(pr.Spec.Groups).Should(HaveLen(1))
+			Expect(pr.Spec.Groups[0].Rules).Should(HaveLen(1))
 
 			// Manually delete ServiceMonitor
 			By("Deleting ServiceMonitor")

diff --git a/controllers/flowlogspipeline/flp_test.go b/controllers/flowlogspipeline/flp_test.go
@@ -534,7 +534,7 @@ func TestPrometheusRuleChanged(t *testing.T) {
 	b := newMonolithBuilder("namespace", image, &cfg, true)
 	first := b.generic.prometheusRule()
 
-	// Check namespace change
+	// Check enabled rule change
 	cfg.Processor.Metrics.DisableAlerts = []flowslatest.FLPAlert{flowslatest.AlertNoFlows}
 	b = newMonolithBuilder("namespace", image, &cfg, true)
 	second := b.generic.prometheusRule()

diff --git a/pkg/helper/comparators.go b/pkg/helper/comparators.go
@@ -85,7 +85,8 @@ func ServiceMonitorChanged(old, new *monitoringv1.ServiceMonitor, report *Change
 }
 
 func PrometheusRuleChanged(old, new *monitoringv1.PrometheusRule, report *ChangeReport) bool {
-	return report.Check("PrometheusRule spec changed", !equality.Semantic.DeepDerivative(new.Spec, old.Spec)) ||
+	// Note: DeepDerivative misses changes in Spec.Groups.Rules (covered by test "Expecting PrometheusRule to exist and be updated")
+	return report.Check("PrometheusRule spec changed", !equality.Semantic.DeepEqual(new.Spec, old.Spec)) ||
 		report.Check("PrometheusRule labels changed", !IsSubSet(old.Labels, new.Labels))
 }