fix todos

Author: jotak

api/flowcollector/v1beta2/flowcollector_defaults.go

@@ -164,10 +164,8 @@ var (
 						Info: "100",
 					},
 					GroupBy:       GroupByNamespace,
-					TrendOffset:   &v1.Duration{Duration: time.Minute * 30},
-					TrendDuration: &v1.Duration{Duration: time.Minute * 30},
-					// TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
-					// TrendDuration: &v1.Duration{Duration: time.Hour},
+					TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
+					TrendDuration: &v1.Duration{Duration: time.Hour},
 				},
 			},
 		},
@@ -180,21 +178,17 @@ var (
 						Warning: "200",
 					},
 					GroupBy:       GroupByNode,
-					TrendOffset:   &v1.Duration{Duration: time.Minute * 30},
-					TrendDuration: &v1.Duration{Duration: time.Minute * 30},
-					// TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
-					// TrendDuration: &v1.Duration{Duration: time.Hour},
+					TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
+					TrendDuration: &v1.Duration{Duration: time.Hour},
 				},
 				{
 					Thresholds: HealthRuleThresholds{
 						Info:    "100",
 						Warning: "500",
 					},
 					GroupBy:       GroupByNamespace,
-					TrendOffset:   &v1.Duration{Duration: time.Minute * 30},
-					TrendDuration: &v1.Duration{Duration: time.Minute * 30},
-					// TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
-					// TrendDuration: &v1.Duration{Duration: time.Hour},
+					TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
+					TrendDuration: &v1.Duration{Duration: time.Hour},
 				},
 			},
 		},
@@ -207,26 +201,23 @@ var (
 						Warning: "200",
 					},
 					GroupBy:       GroupByNode,
-					TrendOffset:   &v1.Duration{Duration: time.Minute * 30},
-					TrendDuration: &v1.Duration{Duration: time.Minute * 30},
-					// TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
-					// TrendDuration: &v1.Duration{Duration: time.Hour},
+					TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
+					TrendDuration: &v1.Duration{Duration: time.Hour},
 				},
 				{
 					Thresholds: HealthRuleThresholds{
 						Info:    "100",
 						Warning: "500",
 					},
 					GroupBy:       GroupByNamespace,
-					TrendOffset:   &v1.Duration{Duration: time.Minute * 30},
-					TrendDuration: &v1.Duration{Duration: time.Minute * 30},
-					// TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
-					// TrendDuration: &v1.Duration{Duration: time.Hour},
+					TrendOffset:   &v1.Duration{Duration: 24 * time.Hour},
+					TrendDuration: &v1.Duration{Duration: time.Hour},
 				},
 			},
 		},
 		{
 			Template: HealthRuleIngress5xxErrors,
+			Mode:     ModeRecording,
 			Variants: []HealthRuleVariant{
 				{
 					Thresholds: HealthRuleThresholds{
@@ -239,6 +230,7 @@ var (
 		},
 		{
 			Template: HealthRuleIngressHTTPLatencyTrend,
+			Mode:     ModeRecording,
 			Variants: []HealthRuleVariant{
 				{
 					Thresholds: HealthRuleThresholds{

internal/controller/flp/flp_controller_test.go

@@ -465,7 +465,7 @@ func ControllerSpecs() {
 				}, &pr)
 			}, timeout, interval).Should(Succeed())
 			Expect(pr.Spec.Groups).Should(HaveLen(1))
-			Expect(pr.Spec.Groups[0].Rules).Should(HaveLen(10))
+			Expect(pr.Spec.Groups[0].Rules).Should(HaveLen(8))
 
 			// Manually delete ServiceMonitor
 			By("Deleting ServiceMonitor")

internal/pkg/metrics/alerts/alerts_test.go

@@ -116,12 +116,10 @@ func TestBuildRules_DefaultWithFeaturesAndDisabled(t *testing.T) {
 		"netobserv:health:netpol_denied:namespace:dst:rate2m",
 		"NetpolDenied_PerSrcNamespaceWarning",
 		"NetpolDenied_PerDstNamespaceWarning",
-		"netobserv:health:tcp_latency_p90:namespace:src:rate2m",
-		"netobserv:health:tcp_latency_p90:namespace:dst:rate2m",
-		"Ingress5xxErrors_PerSrcNamespaceWarning",
-		"Ingress5xxErrors_PerSrcNamespaceInfo",
-		"IngressHTTPLatencyTrend_PerSrcNamespaceWarning",
-		"IngressHTTPLatencyTrend_PerSrcNamespaceInfo",
+		"netobserv:health:tcp_latency_increase_p90:namespace:src:rate2m",
+		"netobserv:health:tcp_latency_increase_p90:namespace:dst:rate2m",
+		"netobserv:health:ingress_5xx_errors:namespace:src:rate2m",
+		"netobserv:health:ingress_http_latency_increase_avg:namespace:src:rate2m",
 		"NetObservNoFlows",
 	}, allNames(rules))
 	assert.Contains(t, rules[2].Annotations["description"], "NetObserv is detecting more than 20% of packets dropped by the kernel [source namespace={{ $labels.namespace }}]")

internal/pkg/metrics/alerts/builder_test.go

@@ -158,14 +158,14 @@ func TestRecordingRuleNames(t *testing.T) {
 			template: flowslatest.HealthRuleLatencyHighTrend,
 			groupBy:  "",
 			side:     asSource,
-			expected: "netobserv:health:tcp_latency_p90:rate2m",
+			expected: "netobserv:health:tcp_latency_increase_p90:rate2m",
 		},
 		{
 			name:     "LatencyHighTrend by Node",
 			template: flowslatest.HealthRuleLatencyHighTrend,
 			groupBy:  flowslatest.GroupByNode,
 			side:     asDest,
-			expected: "netobserv:health:tcp_latency_p90:node:dst:rate2m",
+			expected: "netobserv:health:tcp_latency_increase_p90:node:dst:rate2m",
 		},
 	}
 

…/metrics/alerts/ingress_latency_trend.go …ics/alerts/ingress_http_latency_trend.gointernal/pkg/metrics/alerts/ingress_latency_trend.go renamed to internal/pkg/metrics/alerts/ingress_http_latency_trend.go internal/pkg/metrics/alerts/ingress_latency_trend.go renamed to internal/pkg/metrics/alerts/ingress_http_latency_trend.go

@@ -16,7 +16,7 @@ func newIngressHTTPLatencyTrend(ctx *ruleContext) HealthRule {
 }
 
 func (r *ingressHTTPLatencyTrend) RecordingName() string {
-	return buildRecordingRuleName(r.ctx, "ingress_http_latency_avg", "2m")
+	return buildRecordingRuleName(r.ctx, "ingress_http_latency_increase_avg", "2m")
 }
 
 func (r *ingressHTTPLatencyTrend) GetAnnotations() (map[string]string, error) {

internal/pkg/metrics/alerts/latency_trend.go

@@ -15,7 +15,7 @@ func newLatencyTrend(ctx *ruleContext) HealthRule {
 }
 
 func (r *latencyTrend) RecordingName() string {
-	return buildRecordingRuleName(r.ctx, "tcp_latency_p90", "2m")
+	return buildRecordingRuleName(r.ctx, "tcp_latency_increase_p90", "2m")
 }
 
 func (r *latencyTrend) GetAnnotations() (map[string]string, error) {