Merge pull request #29710 from vrutkovs/disruption-exclude-localhost

OCPBUGS-55238: spyglass: hide disruption events for localhost

Author: openshift-merge-bot[bot]

e2echart/non-spyglass-e2e-chart-template.html

@@ -419,7 +419,7 @@ <h5 class="modal-title">Resource</h5>
         if (eventInterval.message.reason !== "DisruptionBegan" && eventInterval.message.reason !== "DisruptionSamplerOutageBegan") {
             return false
         }
-        if (eventInterval.source === "Disruption") {
+        if (eventInterval.source === "Disruption" || eventInterval.source === "DisruptionLocalhost") {
             return true
         }
         if (eventInterval.locator.keys["namespace"] === "e2e-k8s-service-lb-available") {

pkg/disruption/backend/disruption/handler.go

@@ -76,7 +76,7 @@ func (h *ciHandler) Unavailable(from, to *backend.SampleResult) {
 		&v1.ObjectReference{Kind: "OpenShiftTest", Namespace: "kube-system", Name: h.descriptor.Name()},
 		nil, v1.EventTypeWarning, string(eventReason), "detected", message.BuildString())
 
-	interval := monitorapi.NewInterval(monitorapi.SourceDisruption, level).Locator(h.descriptor.DisruptionLocator()).
+	interval := monitorapi.NewInterval(h.getSource(), level).Locator(h.descriptor.DisruptionLocator()).
 		Display().
 		Message(message).Build(fs.StartedAt, time.Time{})
 	openIntervalID := h.monitorRecorder.StartInterval(interval)
@@ -100,8 +100,16 @@ func (h *ciHandler) Available(from, to *backend.SampleResult) {
 	h.eventRecorder.Eventf(
 		&v1.ObjectReference{Kind: "OpenShiftTest", Namespace: "kube-system", Name: h.descriptor.Name()}, nil,
 		v1.EventTypeNormal, string(monitorapi.DisruptionEndedEventReason), "detected", message.BuildString())
-	interval := monitorapi.NewInterval(monitorapi.SourceDisruption, monitorapi.Info).Locator(h.descriptor.DisruptionLocator()).
+	interval := monitorapi.NewInterval(h.getSource(), monitorapi.Info).Locator(h.descriptor.DisruptionLocator()).
 		Message(message).Build(fs.StartedAt, time.Time{})
 	openIntervalID := h.monitorRecorder.StartInterval(interval)
 	h.monitorRecorder.EndInterval(openIntervalID, ts.StartedAt)
 }
+
+// getSource returns the source of the interval based on the load balancer type. Localhost disruptions need to be separated, as in some cases these are expected
+func (h *ciHandler) getSource() monitorapi.IntervalSource {
+	if h.descriptor.GetLoadBalancerType() == backend.LocalhostType {
+		return monitorapi.SourceDisruptionLocalhost
+	}
+	return monitorapi.SourceDisruption
+}

pkg/monitor/monitorapi/types.go

@@ -348,6 +348,7 @@ const (
 	SourceAlert                     IntervalSource = "Alert"
 	SourceAPIServerShutdown         IntervalSource = "APIServerShutdown"
 	SourceDisruption                IntervalSource = "Disruption"
+	SourceDisruptionLocalhost       IntervalSource = "DisruptionLocalhost"
 	SourceE2ETest                   IntervalSource = "E2ETest"
 	SourceKubeEvent                 IntervalSource = "KubeEvent"
 	SourceNetworkManagerLog         IntervalSource = "NetworkMangerLog"