opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 03:19:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Store 'alertmanager_configuration' as JSON string instead of raw bytes (#42443)

Browse Source
This commit is contained in:
Joan López de la Franca Beltran
2021-12-01 17:49:57 +01:00
committed by GitHub
parent 41917c1473
commit 5183cc4dc4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cmd/grafana-cli/commands/secretsmigrations/reencrypt_secrets.go
View File

@ -123,7 +123,7 @@ type alertingSecret struct{}
func (s alertingSecret) reencrypt(secretsSrv *manager.SecretsService, sess *xorm.Session) error {
var results []struct {
Id int
AlertmanagerConfiguration []byte
AlertmanagerConfiguration string
}
selectSQL := "SELECT id, alertmanager_configuration FROM alert_configuration"
@ -133,7 +133,7 @@ func (s alertingSecret) reencrypt(secretsSrv *manager.SecretsService, sess *xorm
for _, result := range results {
result := result
postableUserConfig, err := notifier.Load(result.AlertmanagerConfiguration)
postableUserConfig, err := notifier.Load([]byte(result.AlertmanagerConfiguration))
if err != nil {
return err
}
@ -161,11 +161,12 @@ func (s alertingSecret) reencrypt(secretsSrv *manager.SecretsService, sess *xorm
}
}
result.AlertmanagerConfiguration, err = json.Marshal(postableUserConfig)
marshalled, err := json.Marshal(postableUserConfig)
if err != nil {
return err
}
result.AlertmanagerConfiguration = string(marshalled)
if _, err := sess.Table("alert_configuration").Where("id = ?", result.Id).Update(&result); err != nil {
return err
}