Skip to content

NO-ISSUE: improve error reporting in cpumetriccollector #31132

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 1 commit into from
May 11, 2026
Merged

NO-ISSUE: improve error reporting in cpumetriccollector #31132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pkg/monitortests/testframework/cpumetriccollector/monitortest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ func (w *cpuMetricCollector) collectCPUMetricsFromPrometheus(ctx context.Context

prometheusClient, err := metrics.NewPrometheusClient(ctx, kubeClient, routeClient)
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to create Prometheus client: %w", err)
}

if intervals, err := prometheus.EnsureThanosQueriersConnectedToPromSidecars(ctx, prometheusClient); err != nil {
return intervals, err
return intervals, fmt.Errorf("failed to check Thanos querier connection to Prometheus sidecars: %w", err)
}

// Get node information for determining node roles
Expand All @@ -123,7 +123,7 @@ func (w *cpuMetricCollector) collectCPUMetricsFromPrometheus(ctx context.Context
cpuQuery := `100 - (avg by (instance) (rate(node_cpu_seconds_total{mode="idle"}[1m])) * 100)`
cpuMetrics, warningsForQuery, err := prometheusClient.QueryRange(ctx, cpuQuery, timeRange)
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to query CPU usage per instance: %w", err)
}
if len(warningsForQuery) > 0 {
for _, w := range warningsForQuery {
Expand Down