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

feat: add support for queryTimeout in datasources #783

Merged
merged 2 commits into from Jul 5, 2022
Merged

feat: add support for queryTimeout in datasources #783

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
d167a50
feat: add support for queryTimeout in datasources
weisdd Jul 3, 2022
77144b5
Merge branch 'master' into feature/query-timeout
pb82 Jul 5, 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
1 change: 1 addition & 0 deletions api/integreatly/v1alpha1/grafanadatasource_types.go
View file
Open in desktop
Expand Up @@ -87,6 +87,7 @@ type GrafanaDataSourceFields struct {
// GrafanaDataSourceJsonData contains the most common json options
// See https://grafana.com/docs/administration/provisioning/#datasources
type GrafanaDataSourceJsonData struct {
QueryTimeout string `json:"queryTimeout,omitempty"`
OauthPassThru bool `json:"oauthPassThru,omitempty"`
TlsAuth bool `json:"tlsAuth,omitempty"`
TlsAuthWithCACert bool `json:"tlsAuthWithCACert,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions bundle/manifests/integreatly.org_grafanadatasources.yaml
View file
Open in desktop
Expand Up @@ -202,6 +202,8 @@ spec:
type: integer
postgresVersion:
type: integer
queryTimeout:
type: string
search:
properties:
hide:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/integreatly.org_grafanadatasources.yaml
View file
Open in desktop
Expand Up @@ -204,6 +204,8 @@ spec:
type: integer
postgresVersion:
type: integer
queryTimeout:
type: string
search:
properties:
hide:
Expand Down
2 changes: 2 additions & 0 deletions deploy/manifests/latest/crds.yaml
View file
Open in desktop
Expand Up @@ -312,6 +312,8 @@ spec:
type: integer
postgresVersion:
type: integer
queryTimeout:
type: string
search:
properties:
hide:
Expand Down
7 changes: 7 additions & 0 deletions documentation/api.md
View file
Open in desktop
Expand Up @@ -919,6 +919,13 @@ GrafanaDataSourceJsonData contains the most common json options See https://graf
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>queryTimeout</b></td>
<td>string</td>
<td>
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#grafanadatasourcespecdatasourcesindexjsondatasearch">search</a></b></td>
<td>object</td>
Expand Down