Merge pull request #783 from weisdd/feature/query-timeout

feat: add support for queryTimeout in datasources
grafana · Jul 5, 2022 · 8538935 · 8538935
2 parents 44bfa42 + 77144b5
commit 8538935
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/api/integreatly/v1alpha1/grafanadatasource_types.go b/api/integreatly/v1alpha1/grafanadatasource_types.go
@@ -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"`

diff --git a/bundle/manifests/integreatly.org_grafanadatasources.yaml b/bundle/manifests/integreatly.org_grafanadatasources.yaml
@@ -202,6 +202,8 @@ spec:
                           type: integer
                         postgresVersion:
                           type: integer
+                        queryTimeout:
+                          type: string
                         search:
                           properties:
                             hide:

diff --git a/config/crd/bases/integreatly.org_grafanadatasources.yaml b/config/crd/bases/integreatly.org_grafanadatasources.yaml
@@ -204,6 +204,8 @@ spec:
                           type: integer
                         postgresVersion:
                           type: integer
+                        queryTimeout:
+                          type: string
                         search:
                           properties:
                             hide:

diff --git a/deploy/manifests/latest/crds.yaml b/deploy/manifests/latest/crds.yaml
@@ -312,6 +312,8 @@ spec:
                           type: integer
                         postgresVersion:
                           type: integer
+                        queryTimeout:
+                          type: string
                         search:
                           properties:
                             hide:

diff --git a/documentation/api.md b/documentation/api.md
@@ -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>