Skip to content

ROSAENG-64957: Reset ocm_agent_response_failure gauge on alert resolution and resend window #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Aug 16, 2026
Merged

ROSAENG-64957: Reset ocm_agent_response_failure gauge on alert resolution and resend window #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebda209
ROSAENG-64957: Reset ocm_agent_response_failure gauge on alert resolu…
aliceh Aug 11, 2026
86a32cd
Increase golangci-lint timeout from 5m to 10m
aliceh Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ getlint:
.PHONY: lint
lint: getlint
@mkdir -p /tmp/go-cache
@export GOCACHE=/tmp/go-cache && $(GOPATH)/bin/golangci-lint run --timeout=5m
@export GOCACHE=/tmp/go-cache && $(GOPATH)/bin/golangci-lint run --timeout=10m

mockgen: ensure-mockgen
go generate $(GOBUILDFLAGS) ./...
Expand Down
9 changes: 9 additions & 0 deletions pkg/handlers/webhookrhobsreceiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ func (h *WebhookRHOBSReceiverHandler) processAlert(alert template.Alert, isCurre
}

if !fleetNotificationRetriever.fleetNotification.LimitedSupport && !isCurrentlyFiring {
metrics.ResetResponseMetricFailure(config.ServiceLogService, fleetNotificationRetriever.fleetNotification.Name, alert.Labels[AMLabelAlertName])
return nil
}

Expand Down Expand Up @@ -477,6 +478,14 @@ func (h *WebhookRHOBSReceiverHandler) processAlert(alert template.Alert, isCurre
metrics.CountServiceLogSent(fleetNotification.Name, "firing")
}
metrics.ResetResponseMetricFailure(logService, fleetNotification.Name, alertName)
} else {
var logService string
if fleetNotification.LimitedSupport {
logService = config.ClustersService
} else {
logService = config.ServiceLogService
}
metrics.ResetResponseMetricFailure(logService, fleetNotification.Name, alertName)
}
} else {
if c.wasClusterInLimitedSupport {
Expand Down