Merge branch 'master' into https-proxy

grafana · Feb 15, 2022 · 6c4bb2c · 6c4bb2c
2 parents 506c02e + 1b94fe6
commit 6c4bb2c
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 3 deletions.
diff --git a/api/integreatly/v1alpha1/grafanadatasource_types.go b/api/integreatly/v1alpha1/grafanadatasource_types.go
@@ -157,8 +157,9 @@ type GrafanaDataSourceJsonData struct {
 	MaxLines      int                                  `json:"maxLines,omitempty"`
 	DerivedFields []GrafanaDataSourceJsonDerivedFields `json:"derivedFields,omitempty"`
 	// Fields for Prometheus data sources
-	CustomQueryParameters string `json:"customQueryParameters,omitempty"`
-	HTTPMethod            string `json:"httpMethod,omitempty"`
+	CustomQueryParameters       string                                             `json:"customQueryParameters,omitempty"`
+	HTTPMethod                  string                                             `json:"httpMethod,omitempty"`
+	ExemplarTraceIdDestinations []GrafanaDataSourceJsonExemplarTraceIdDestinations `json:"exemplarTraceIdDestinations,omitempty"`
 	// Fields for tracing data sources
 	TracesToLogs GrafanaDataSourceJsonTracesToLogs `json:"tracesToLogs,omitempty"`
 	ServiceMap   GrafanaDataSourceJsonServiceMap   `json:"serviceMap,omitempty"`
@@ -191,6 +192,13 @@ type GrafanaDataSourceJsonDerivedFields struct {
 	Url           string `json:"url,omitempty"`
 }
 
+type GrafanaDataSourceJsonExemplarTraceIdDestinations struct {
+	DatasourceUid   string `json:"datasourceUid,omitempty"`
+	Name            string `json:"name,omitempty"`
+	Url             string `json:"url,omitempty"`
+	UrlDisplayLabel string `json:"urlDisplayLabel,omitempty"`
+}
+
 type GrafanaDataSourceJsonTracesToLogs struct {
 	DatasourceUid      string   `json:"datasourceUid,omitempty"`
 	SpanEndTimeShift   string   `json:"spanEndTimeShift,omitempty"`

diff --git a/api/integreatly/v1alpha1/zz_generated.deepcopy.go b/api/integreatly/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/integreatly.org_grafanadatasources.yaml b/config/crd/bases/integreatly.org_grafanadatasources.yaml
@@ -117,6 +117,19 @@ spec:
                           type: string
                         esVersion:
                           type: string
+                        exemplarTraceIdDestinations:
+                          items:
+                            properties:
+                              datasourceUid:
+                                type: string
+                              name:
+                                type: string
+                              url:
+                                type: string
+                              urlDisplayLabel:
+                                type: string
+                            type: object
+                          type: array
                         githubUrl:
                           description: Fields for Github data sources
                           type: string

diff --git a/controllers/constants/constants.go b/controllers/constants/constants.go
@@ -2,7 +2,7 @@ package constants
 
 const (
 	GrafanaImage                            = "docker.io/grafana/grafana"
-	GrafanaVersion                          = "7.5.11"
+	GrafanaVersion                          = "7.5.15"
 	GrafanaServiceAccountName               = "grafana-serviceaccount"
 	GrafanaServiceName                      = "grafana-service"
 	GrafanaDataStorageName                  = "grafana-pvc"

diff --git a/deploy/manifests/latest/crds.yaml b/deploy/manifests/latest/crds.yaml
@@ -225,6 +225,19 @@ spec:
                           type: string
                         esVersion:
                           type: string
+                        exemplarTraceIdDestinations:
+                          items:
+                            properties:
+                              datasourceUid:
+                                type: string
+                              name:
+                                type: string
+                              url:
+                                type: string
+                              urlDisplayLabel:
+                                type: string
+                            type: object
+                          type: array
                         githubUrl:
                           description: Fields for Github data sources
                           type: string

diff --git a/documentation/api.md b/documentation/api.md
@@ -695,6 +695,13 @@ GrafanaDataSourceJsonData contains the most common json options See https://graf
           <br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b><a href="#grafanadatasourcespecdatasourcesindexjsondataexemplartraceiddestinationsindex">exemplarTraceIdDestinations</a></b></td>
+        <td>[]object</td>
+        <td>
+          <br/>
+        </td>
+        <td>false</td>
       </tr><tr>
         <td><b>githubUrl</b></td>
         <td>string</td>
@@ -1146,6 +1153,54 @@ GrafanaDataSourceJsonData contains the most common json options See https://graf
 </table>
 
 
+### GrafanaDataSource.spec.datasources[index].jsonData.exemplarTraceIdDestinations[index]
+<sup><sup>[↩ Parent](#grafanadatasourcespecdatasourcesindexjsondata)</sup></sup>
+
+
+
+
+
+<table>
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th>Type</th>
+            <th>Description</th>
+            <th>Required</th>
+        </tr>
+    </thead>
+    <tbody><tr>
+        <td><b>datasourceUid</b></td>
+        <td>string</td>
+        <td>
+          <br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
+        <td><b>name</b></td>
+        <td>string</td>
+        <td>
+          <br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
+        <td><b>url</b></td>
+        <td>string</td>
+        <td>
+          <br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
+        <td><b>urlDisplayLabel</b></td>
+        <td>string</td>
+        <td>
+          <br/>
+        </td>
+        <td>false</td>
+      </tr></tbody>
+</table>
+
+
 ### GrafanaDataSource.spec.datasources[index].jsonData.nodeGraph
 <sup><sup>[↩ Parent](#grafanadatasourcespecdatasourcesindexjsondata)</sup></sup>