Change datasource timeout config for Grafana and add matching timeout… #1304
Conversation
… annotation for Route Signed-off-by: Philip Gough <[email protected]>
|
/test test-e2e |
| TLSAuth bool `yaml:"tlsAuth,omitempty"` | ||
| TLSAuthCA bool `yaml:"tlsAuthWithCACert,omitempty"` | ||
| QueryTimeout string `yaml:"queryTimeout,omitempty"` | ||
| TLSAuth bool `yaml:"tlsAuth,omitempty"` |
There was a problem hiding this comment.
Nit, but would be nice to keep the formatting here is consistent.
There was a problem hiding this comment.
Ack, it is formatted correctly via gofmt however the comment on this particular field throws off the indentation. Since this is a bug fix I'd just keep it minimal here as is, but I intend on doing a follow up which reviews and explains all the fields in this file which will address this!
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: douglascamata, philipgough The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
openshift-merge-bot
bot
merged commit dfc42bd
into
stolostron:release-2.10
… annotation for Route (stolostron#1304) Signed-off-by: Philip Gough <[email protected]>
… annotation for Route (#1304) (#1308) Signed-off-by: Philip Gough <[email protected]>
… annotation for Route
The previous configuration
queryTimeoutis not valid as per https://grafana.com/docs/grafana/v8.5/administration/provisioning/#json-data (it should be timeout defined as seconds).The Route needs to have a corresponding annotation to avoid queries timing out after 30s, which is the default in OpenShifts HAProxy config