Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 26, 2023
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3c427f
Set max source resolution to auto in Grafana datasource
douglascamata Oct 19, 2023
55ebcd9
Move custom query parameter into jsondata
douglascamata Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions operators/multiclusterobservability/controllers/multiclusterobservability/grafana.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,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 {
Expand Down Expand Up @@ -95,8 +96,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),
},
},
{
Expand All @@ -110,8 +112,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),
},
},
},
Expand Down