Skip to content

Commit e88b30e

Browse files
Merge pull request #30810 from petr-muller/allowlist-insights-periodic-gathering-kubejobfailed
NO-JIRA: Exclude KubeJobFailed for periodic-gathering jobs in openshift-insights
2 parents 2a1c975 + 18f455a commit e88b30e

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

test/extended/prometheus/prometheus.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,11 @@ var _ = g.Describe("[sig-instrumentation] Prometheus [apigroup:image.openshift.i
874874

875875
tests := map[string]bool{
876876
// openshift-e2e-loki alerts should never fail this test, we've seen this happen on daemon set rollout stuck when CI loki was down.
877-
fmt.Sprintf(`ALERTS{alertname!~"%s",alertstate="firing",severity!="info",namespace!="openshift-e2e-loki"} >= 1`, strings.Join(allowedAlertNames, "|")): false,
877+
//
878+
// CCXDEV-16087 / OCPBUGS-77314: Insights call API that fails with 504 due to load
879+
// The unless clause excludes KubeJobFailed alerts from periodic-gathering jobs in openshift-insights
880+
// TODO: Revert (or remove the unless clause) once CCXDEV-16087 / OCPBUGS-77314 is addressed
881+
fmt.Sprintf(`(ALERTS{alertname!~"%s",alertstate="firing",severity!="info",namespace!="openshift-e2e-loki"} unless ALERTS{alertname="KubeJobFailed",alertstate="firing",namespace="openshift-insights",job_name=~"periodic-gathering-.*"}) >= 1`, strings.Join(allowedAlertNames, "|")): false,
878882
}
879883
err = helper.RunQueries(context.TODO(), oc.NewPrometheusClient(context.TODO()), tests, oc)
880884
o.Expect(err).NotTo(o.HaveOccurred())

0 commit comments

Comments
 (0)