Merge pull request #826 from alex-berger/feature/ds-timeout

add support to set datasource timeout
grafana · Sep 27, 2022 · 54a5592 · 54a5592
2 parents 6b272df + 2299fb3
commit 54a5592
Show file tree

Hide file tree

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

diff --git a/config/crd/bases/integreatly.org_grafanadatasources.yaml b/config/crd/bases/integreatly.org_grafanadatasources.yaml
@@ -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:

diff --git a/deploy/manifests/latest/crds.yaml b/deploy/manifests/latest/crds.yaml
@@ -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:

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