From 30941b68ac849103a19e1d3060e8c69afb1cf4fa Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Wed, 31 May 2023 17:27:05 +0200 Subject: [PATCH] test/extended/prometheus: increase telemetry series threshold TechPreview jobs happen to increase significantly the number of series being sent to telemetry (especially because of the additional CRDs being installed which increase the cardinality of the `cluster:usage:resources:sum` metric). Signed-off-by: Simon Pasquier --- test/extended/prometheus/prometheus.go | 6 +++--- .../util/annotate/generated/zz_generated.annotations.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/extended/prometheus/prometheus.go b/test/extended/prometheus/prometheus.go index 381018bba734..487fb55b2297 100644 --- a/test/extended/prometheus/prometheus.go +++ b/test/extended/prometheus/prometheus.go @@ -194,7 +194,7 @@ var _ = g.Describe("[sig-instrumentation][Late] Alerts", func() { alerts.CheckAlerts(alerts.AllowedAlertsDuringConformance, oc.AdminConfig(), oc.NewPrometheusClient(context.TODO()), oc.AdminConfigClient(), testDuration, nil) }) - g.It("shouldn't exceed the 650 series limit of total series sent via telemetry from each cluster", func() { + g.It("shouldn't exceed the series limit of total series sent via telemetry from each cluster", func() { if enabledErr, err := telemetryIsEnabled(ctx, oc.AdminKubeClient()); err != nil { e2e.Failf("could not determine if Telemetry is enabled: %v", err) } else if enabledErr != nil { @@ -207,7 +207,7 @@ var _ = g.Describe("[sig-instrumentation][Late] Alerts", func() { tests := map[string]bool{ // We want to limit the number of total series sent, the cluster:telemetry_selected_series:count // rule contains the count of the all the series that are sent via telemetry. It is permissible - // for some scenarios to generate more series than 650, we just want the basic state to be below + // for some scenarios to generate more series than 750, we just want the basic state to be below // a threshold. // // The following query can be executed against the telemetry server @@ -222,7 +222,7 @@ var _ = g.Describe("[sig-instrumentation][Late] Alerts", func() { // )[30m:1m] // ) // ) - fmt.Sprintf(`avg_over_time(cluster:telemetry_selected_series:count[%s]) >= 650`, testDuration): false, + fmt.Sprintf(`avg_over_time(cluster:telemetry_selected_series:count[%s]) >= 750`, testDuration): false, fmt.Sprintf(`max_over_time(cluster:telemetry_selected_series:count[%s]) >= 1200`, testDuration): false, } err := helper.RunQueries(context.TODO(), oc.NewPrometheusClient(context.TODO()), tests, oc) diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index b444a5380e04..bbd9fc6b610f 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -1175,7 +1175,7 @@ var Annotations = map[string]string{ "[sig-instrumentation] Prometheus [apigroup:image.openshift.io] when installed on the cluster when using openshift-sdn should be able to get the sdn ovs flows": " [Skipped:Disconnected] [Suite:openshift/conformance/parallel]", - "[sig-instrumentation][Late] Alerts shouldn't exceed the 650 series limit of total series sent via telemetry from each cluster": " [Suite:openshift/conformance/parallel]", + "[sig-instrumentation][Late] Alerts shouldn't exceed the series limit of total series sent via telemetry from each cluster": " [Suite:openshift/conformance/parallel]", "[sig-instrumentation][Late] Alerts shouldn't report any unexpected alerts in firing or pending state": " [Suite:openshift/conformance/parallel]",