Skip to content

OCPBUGS-235: pkg/clusterconditions/promql: Cap PromQL queries at 5 minutes #825

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-robot merged 1 commit into from
Aug 19, 2022
Merged

OCPBUGS-235: pkg/clusterconditions/promql: Cap PromQL queries at 5 minutes #825

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
14 changes: 13 additions & 1 deletion pkg/clusterconditions/promql/promql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ type PromQL struct {

// HTTPClientConfig holds the client configuration for connecting to the Prometheus service.
HTTPClientConfig config.HTTPClientConfig

// QueryTimeout limits the amount of time we wait before giving up on the Prometheus query.
QueryTimeout time.Duration
}

var promql = &cache.Cache{
Expand All @@ -41,6 +44,7 @@ var promql = &cache.Cache{
CAFile: "/etc/tls/service-ca/service-ca.crt",
},
},
QueryTimeout: 5 * time.Minute,
},
MinBetweenMatches: 10 * time.Minute,
MinForCondition: time.Hour,
Expand Down Expand Up @@ -79,8 +83,16 @@ func (p *PromQL) Match(ctx context.Context, condition *configv1.ClusterCondition
}

v1api := prometheusv1.NewAPI(client)

queryContext := ctx
if p.QueryTimeout > 0 {
var cancel context.CancelFunc
queryContext, cancel = context.WithTimeout(ctx, p.QueryTimeout)
defer cancel()
}

klog.V(2).Infof("evaluate %s cluster condition: %q", condition.Type, condition.PromQL.PromQL)
result, warnings, err := v1api.Query(ctx, condition.PromQL.PromQL, time.Now())
result, warnings, err := v1api.Query(queryContext, condition.PromQL.PromQL, time.Now())
if err != nil {
return false, fmt.Errorf("executing PromQL query: %w", err)
}
Expand Down