From fe5b18bba2175d304d7ae135963cfde9f7cfc023 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Wed, 29 Jan 2025 11:29:05 +0100 Subject: [PATCH] operator log scraper: ensure that events have different from/to time so that spyglass would render them --- .../operatorloganalyzer/operator_log_scraper.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/monitortests/testframework/operatorloganalyzer/operator_log_scraper.go b/pkg/monitortests/testframework/operatorloganalyzer/operator_log_scraper.go index aa77b74220c9..6392d7f601e1 100644 --- a/pkg/monitortests/testframework/operatorloganalyzer/operator_log_scraper.go +++ b/pkg/monitortests/testframework/operatorloganalyzer/operator_log_scraper.go @@ -173,7 +173,7 @@ func (g operatorLogHandler) HandleLogLine(logLine podaccess.LogLineContent) { Reason(monitorapi.LeaseAcquiringStarted). HumanMessage(logLine.Line), ). - Build(logLine.Instant, logLine.Instant), + Build(logLine.Instant, logLine.Instant.Add(time.Second)), ) case strings.Contains(logLine.Line, "successfully acquired lease") && !strings.Contains(logLine.Line, "Degraded"): // need to exclude lines that re-embed the kube-controller-manager log @@ -184,7 +184,7 @@ func (g operatorLogHandler) HandleLogLine(logLine podaccess.LogLineContent) { Reason(monitorapi.LeaseAcquired). HumanMessage(logLine.Line), ). - Build(logLine.Instant, logLine.Instant), + Build(logLine.Instant, logLine.Instant.Add(time.Second)), ) case strings.Contains(logLine.Line, "unable to ApplyStatus for operator") && strings.Contains(logLine.Line, "is invalid"): // apply failures @@ -195,7 +195,7 @@ func (g operatorLogHandler) HandleLogLine(logLine podaccess.LogLineContent) { Reason(monitorapi.ReasonBadOperatorApply). HumanMessage(logLine.Line), ). - Build(logLine.Instant, logLine.Instant), + Build(logLine.Instant, logLine.Instant.Add(time.Second)), ) case strings.Contains(logLine.Line, "unable to Apply for operator") && strings.Contains(logLine.Line, "is invalid"): // apply failures @@ -206,7 +206,7 @@ func (g operatorLogHandler) HandleLogLine(logLine podaccess.LogLineContent) { Reason(monitorapi.ReasonBadOperatorApply). HumanMessage(logLine.Line), ). - Build(logLine.Instant, logLine.Instant), + Build(logLine.Instant, logLine.Instant.Add(time.Second)), ) 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( @@ -216,7 +216,7 @@ func (g operatorLogHandler) HandleLogLine(logLine podaccess.LogLineContent) { Reason(monitorapi.ReasonEtcdBootstrap). HumanMessage(logLine.Line), ). - Build(logLine.Instant, logLine.Instant), + Build(logLine.Instant, logLine.Instant.Add(time.Second)), ) }