Skip to content
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

Jump to bottom

add support to set datasource timeout #826

Merged
merged 2 commits into from Sep 27, 2022
Merged

add support to set datasource timeout #826

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
5cb25d2
add support to set datasource timeout
alex-berger Sep 27, 2022
2299fb3
Merge branch 'master' into feature/ds-timeout
Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/integreatly/v1alpha1/grafanadatasource_types.go
View file
Open in desktop
Expand Up @@ -101,6 +101,8 @@ type GrafanaDataSourceFields struct {
// GrafanaDataSourceJsonData contains the most common json options
// See https://grafana.com/docs/administration/provisioning/#datasources
type GrafanaDataSourceJsonData struct {
// HTTP Request timeout in seconds. Overrides dataproxy.timeout option
Timeout int `json:"timeout,omitempty"`
QueryTimeout string `json:"queryTimeout,omitempty"`
OauthPassThru bool `json:"oauthPassThru,omitempty"`
TlsAuth bool `json:"tlsAuth,omitempty"`
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/integreatly.org_grafanadatasources.yaml
View file
Open in desktop
Expand Up @@ -259,6 +259,10 @@ spec:
type: string
timeInterval:
type: string
timeout:
description: HTTP Request timeout in seconds. Overrides
dataproxy.timeout option
type: integer
timescaledb:
type: boolean
timezone:
Expand Down
4 changes: 4 additions & 0 deletions deploy/manifests/latest/crds.yaml
View file
Open in desktop
Expand Up @@ -421,6 +421,10 @@ spec:
type: string
timeInterval:
type: string
timeout:
description: HTTP Request timeout in seconds. Overrides
dataproxy.timeout option
type: integer
timescaledb:
type: boolean
timezone:
Expand Down
7 changes: 7 additions & 0 deletions documentation/api.md
View file
Open in desktop
Expand Up @@ -1204,6 +1204,13 @@ GrafanaDataSourceJsonData contains the most common json options See https://graf
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>timeout</b></td>
<td>integer</td>
<td>
HTTP Request timeout in seconds. Overrides dataproxy.timeout option<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>timescaledb</b></td>
<td>boolean</td>
Expand Down