[ACM-3748] Set max source resolution to auto in Grafana datasource (#…

…1264) (#1273) * Set max source resolution to auto in Grafana datasource * Move custom query parameter into jsondata --------- Signed-off-by: Douglas Camata <[email protected]> Co-authored-by: Douglas Camata <[email protected]>
stolostron · Oct 27, 2023 · df623d8 · df623d8
1 parent 6146b71
commit df623d8
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/operators/multiclusterobservability/controllers/multiclusterobservability/grafana.go b/operators/multiclusterobservability/controllers/multiclusterobservability/grafana.go
@@ -54,11 +54,12 @@ type GrafanaDatasource struct {
 }
 
 type JsonData struct {
-	TLSAuth      bool   `yaml:"tlsAuth,omitempty"`
-	TLSAuthCA    bool   `yaml:"tlsAuthWithCACert,omitempty"`
-	QueryTimeout string `yaml:"queryTimeout,omitempty"`
-	HttpMethod   string `yaml:"httpMethod,omitempty"`
-	TimeInterval string `yaml:"timeInterval,omitempty"`
+	TLSAuth               bool   `yaml:"tlsAuth,omitempty"`
+	TLSAuthCA             bool   `yaml:"tlsAuthWithCACert,omitempty"`
+	QueryTimeout          string `yaml:"queryTimeout,omitempty"`
+	HttpMethod            string `yaml:"httpMethod,omitempty"`
+	TimeInterval          string `yaml:"timeInterval,omitempty"`
+	CustomQueryParameters string `yaml:"customQueryParameters,omitempty"`
 }
 
 type SecureJsonData struct {
@@ -94,8 +95,9 @@ func GenerateGrafanaDataSource(
 					config.GetDefaultNamespace(),
 				),
 				JSONData: &JsonData{
-					QueryTimeout: "300s",
-					TimeInterval: fmt.Sprintf("%ds", mco.Spec.ObservabilityAddonSpec.Interval),
+					QueryTimeout:          "300s",
+					CustomQueryParameters: "max_source_resolution=auto",
+					TimeInterval:          fmt.Sprintf("%ds", mco.Spec.ObservabilityAddonSpec.Interval),
 				},
 			},
 			{
@@ -109,8 +111,9 @@ func GenerateGrafanaDataSource(
 					config.GetDefaultNamespace(),
 				),
 				JSONData: &JsonData{
-					QueryTimeout: "300s",
-					TimeInterval: fmt.Sprintf("%ds", DynamicTimeInterval),
+					QueryTimeout:          "300s",
+					CustomQueryParameters: "max_source_resolution=auto",
+					TimeInterval:          fmt.Sprintf("%ds", DynamicTimeInterval),
 				},
 			},
 		},