add bootstrap removed event from CEO

openshift · Jan 28, 2025 · 8bcb2e0 · 8bcb2e0
1 parent c0e422d
commit 8bcb2e0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/e2echart/e2e-chart-template.html b/e2echart/e2e-chart-template.html
@@ -101,6 +101,11 @@ <h5 class="modal-title">Resource</h5>
 
     }
 
+    function isEtcdBootstrap(eventInterval) {
+        return eventInterval.source === 'PodLog' && eventInterval.message.reason === "EtcdBootstrap";
+
+    }
+
     function isPodLog(eventInterval) {
         if (eventInterval.source === 'PodLog') {
             return true
@@ -500,6 +505,7 @@ <h5 class="modal-title">Resource</h5>
 
         timelineGroups.push({ group: "etcd-leaders", data: [] })
         createTimelineData(etcdLeadershipLogsValue, timelineGroups[timelineGroups.length - 1].data, eventIntervals, isEtcdLeadershipAndNotEmpty, regex)
+        createTimelineData("Bootstrap", timelineGroups[timelineGroups.length - 1].data, eventIntervals, isEtcdBootstrap, regex)
 
         timelineGroups.push({group: "cloud-metrics", data: []})
         createTimelineData(cloudMetricsValue, timelineGroups[timelineGroups.length - 1].data, eventIntervals, isCloudMetrics, regex)

diff --git a/pkg/monitor/monitorapi/types.go b/pkg/monitor/monitorapi/types.go
@@ -262,6 +262,8 @@ const (
 
 	ReasonHighGeneration    IntervalReason = "HighGeneration"
 	ReasonInvalidGeneration IntervalReason = "GenerationViolation"
+
+	ReasonEtcdBootstrap IntervalReason = "EtcdBootstrap"
 )
 
 type AnnotationKey string

diff --git a/pkg/monitortests/testframework/operatorloganalyzer/operator_log_scraper.go b/pkg/monitortests/testframework/operatorloganalyzer/operator_log_scraper.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/openshift/origin/pkg/monitortests/testframework/watchnamespaces"
 	"strings"
 	"time"
 
+	"github.com/openshift/origin/pkg/monitortests/testframework/watchnamespaces"
+
 	"github.com/openshift/origin/pkg/monitor"
 	"github.com/openshift/origin/pkg/monitor/monitorapi"
 	"github.com/openshift/origin/pkg/monitortestframework"
@@ -207,6 +208,16 @@ func (g operatorLogHandler) HandleLogLine(logLine podaccess.LogLineContent) {
 				).
 				Build(logLine.Instant, logLine.Instant),
 		)
+	case strings.Contains(logLine.Line, "Removing bootstrap member") || strings.Contains(logLine.Line, "Successfully removed bootstrap member") || strings.Contains(logLine.Line, "Cluster etcd operator bootstrapped successfully"): // ceo removed bootstrap member
+		g.recorder.AddIntervals(
+			monitorapi.NewInterval(monitorapi.SourcePodLog, monitorapi.Info).
+				Locator(logLine.Locator).
+				Message(monitorapi.NewMessage().
+					Reason(monitorapi.ReasonEtcdBootstrap).
+					HumanMessage(logLine.Line),
+				).
+				Build(logLine.Instant, logLine.Instant),
+		)
 	}
 
 }
diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go