Skip to content

fix: move database field to jsonData for Grafana 12.x compatibility #2266

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

Merged
openshift-merge-bot merged 1 commit into from
Jan 27, 2026
Merged

fix: move database field to jsonData for Grafana 12.x compatibility #2266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions operator/pkg/controllers/grafana/grafana_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,9 @@ func GrafanaDataSource(databaseURI string, cert []byte, serviceAccountToken stri
IsDefault: true,
URL: objURI.Host,
User: objURI.User.Username(),
Database: database,
Editable: false,
JSONData: &JsonData{
Database: database,
QueryTimeout: "300s",
TimeInterval: "30s",
},
Expand Down Expand Up @@ -796,14 +796,14 @@ type GrafanaDatasource struct {
OrgID int `yaml:"orgId,omitempty"`
Type string `yaml:"type,omitempty"`
URL string `yaml:"url,omitempty"`
Database string `yaml:"database,omitempty"`
User string `yaml:"user,omitempty"`
Version int `yaml:"version,omitempty"`
JSONData *JsonData `yaml:"jsonData,omitempty"`
SecureJSONData *SecureJsonData `yaml:"secureJsonData,omitempty"`
}

type JsonData struct {
Database string `yaml:"database,omitempty"`
SSLMode string `yaml:"sslmode,omitempty"`
TLSAuth bool `yaml:"tlsAuth,omitempty"`
TLSAuthWithCACert bool `yaml:"tlsAuthWithCACert,omitempty"`
Expand Down