Merge pull request #29435 from jianzhangbjz/metrics

OCPBUGS-48340: skip OperatorHubSourceError metric checking when disableAllDefaultSources is true

Author: openshift-merge-bot[bot]

test/extended/prometheus/prometheus.go

@@ -747,6 +747,10 @@ var _ = g.Describe("[sig-instrumentation] Prometheus [apigroup:image.openshift.i
 			if isManagedService {
 				allowedAlertNames = append(allowedAlertNames, "KubeDaemonSetMisScheduled")
 			}
+			// https://issues.redhat.com/browse/OCPBUGS-48340
+			if SkipOperatorHubMetricsCheck(oc) {
+				allowedAlertNames = append(allowedAlertNames, "OperatorHubSourceError")
+			}
 
 			tests := map[string]bool{
 				// openshift-e2e-loki alerts should never fail this test, we've seen this happen on daemon set rollout stuck when CI loki was down.
@@ -1014,3 +1018,11 @@ func hasTelemeterClient(client clientset.Interface) bool {
 	}
 	return true
 }
+
+func SkipOperatorHubMetricsCheck(oc *exutil.CLI) bool {
+	stdout, stderr, err := oc.AsAdmin().Run("get").Args("operatorhub", "cluster", "-o=jsonpath={.spec.disableAllDefaultSources}").Outputs()
+	if err != nil {
+		fmt.Printf("command failed: %v\nstderr: %s\nstdout:%s", err, stderr, stdout)
+	}
+	return stdout == "true"
+}