From 1b94fe6dc41907a4a3ffae3eca4cfe5fab859e35 Mon Sep 17 00:00:00 2001
From: Johan Andersson <59731200+johanderss@users.noreply.github.com>
Date: Tue, 15 Feb 2022 13:47:02 +0100
Subject: [PATCH] Added support for exemplarTraceIdDestinations (#681) (#682)
---
.../v1alpha1/grafanadatasource_types.go | 12 +++-
.../v1alpha1/zz_generated.deepcopy.go | 20 +++++++
.../integreatly.org_grafanadatasources.yaml | 13 +++++
deploy/manifests/latest/crds.yaml | 13 +++++
documentation/api.md | 55 +++++++++++++++++++
5 files changed, 111 insertions(+), 2 deletions(-)
diff --git a/api/integreatly/v1alpha1/grafanadatasource_types.go b/api/integreatly/v1alpha1/grafanadatasource_types.go
index 978919fee..8ca694164 100644
--- 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
index 3d3c9b8b9..10b78df33 100644
--- a/api/integreatly/v1alpha1/zz_generated.deepcopy.go
+++ b/api/integreatly/v1alpha1/zz_generated.deepcopy.go
@@ -1525,6 +1525,11 @@ func (in *GrafanaDataSourceJsonData) DeepCopyInto(out *GrafanaDataSourceJsonData
*out = make([]GrafanaDataSourceJsonDerivedFields, len(*in))
copy(*out, *in)
}
+ if in.ExemplarTraceIdDestinations != nil {
+ in, out := &in.ExemplarTraceIdDestinations, &out.ExemplarTraceIdDestinations
+ *out = make([]GrafanaDataSourceJsonExemplarTraceIdDestinations, len(*in))
+ copy(*out, *in)
+ }
in.TracesToLogs.DeepCopyInto(&out.TracesToLogs)
out.ServiceMap = in.ServiceMap
out.NodeGraph = in.NodeGraph
@@ -1556,6 +1561,21 @@ func (in *GrafanaDataSourceJsonDerivedFields) DeepCopy() *GrafanaDataSourceJsonD
return out
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GrafanaDataSourceJsonExemplarTraceIdDestinations) DeepCopyInto(out *GrafanaDataSourceJsonExemplarTraceIdDestinations) {
+ *out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GrafanaDataSourceJsonExemplarTraceIdDestinations.
+func (in *GrafanaDataSourceJsonExemplarTraceIdDestinations) DeepCopy() *GrafanaDataSourceJsonExemplarTraceIdDestinations {
+ if in == nil {
+ return nil
+ }
+ out := new(GrafanaDataSourceJsonExemplarTraceIdDestinations)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *GrafanaDataSourceJsonSearch) DeepCopyInto(out *GrafanaDataSourceJsonSearch) {
*out = *in
diff --git a/config/crd/bases/integreatly.org_grafanadatasources.yaml b/config/crd/bases/integreatly.org_grafanadatasources.yaml
index 1602816c1..39e655498 100644
--- 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/deploy/manifests/latest/crds.yaml b/deploy/manifests/latest/crds.yaml
index dc22bba4f..cec0f9892 100644
--- 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
index 786082228..6a5636ed5 100644
--- a/documentation/api.md
+++ b/documentation/api.md
@@ -695,6 +695,13 @@ GrafanaDataSourceJsonData contains the most common json options See https://graf
false |
+
+ | exemplarTraceIdDestinations |
+ []object |
+
+
+ |
+ false |
| githubUrl |
string |
@@ -1146,6 +1153,54 @@ GrafanaDataSourceJsonData contains the most common json options See https://graf
+### GrafanaDataSource.spec.datasources[index].jsonData.exemplarTraceIdDestinations[index]
+[↩ Parent](#grafanadatasourcespecdatasourcesindexjsondata)
+
+
+
+
+
+
+
+
+ | Name |
+ Type |
+ Description |
+ Required |
+
+
+
+ | datasourceUid |
+ string |
+
+
+ |
+ false |
+
+ | name |
+ string |
+
+
+ |
+ false |
+
+ | url |
+ string |
+
+
+ |
+ false |
+
+ | urlDisplayLabel |
+ string |
+
+
+ |
+ false |
+
+
+
+
### GrafanaDataSource.spec.datasources[index].jsonData.nodeGraph
[↩ Parent](#grafanadatasourcespecdatasourcesindexjsondata)