root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 75 Packages Projects Releases Wiki Activity

Attempt to preserve UID from migrated channel (#57639)

This commit is contained in:
Alexander Weaver 2022-10-31 11:29:07 -05:00 committed by GitHub
parent 96c3a8339e
commit 0dfd78c88c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/services/sqlstore/migrations/ualert/channel.go
View File

@ -177,9 +177,22 @@ func (m *migration) getNotificationChannelMap() (channelsPerOrg, defaultChannels
// Create a notifier (PostableGrafanaReceiver) from a legacy notification channel // Create a notifier (PostableGrafanaReceiver) from a legacy notification channel
func (m *migration) createNotifier(c *notificationChannel) (*PostableGrafanaReceiver, error) { func (m *migration) createNotifier(c *notificationChannel) (*PostableGrafanaReceiver, error) {
uid, err := m.generateChannelUID() uid := c.Uid
if err != nil { if uid == "" {
return nil, err new, err := m.generateChannelUID()
if err != nil {
return nil, err
}
m.mg.Logger.Info("Legacy notification had an empty uid, generating a new one", "id", c.ID, "uid", new)
uid = new
}
if _, seen := m.seenChannelUIDs[uid]; seen {
new, err := m.generateChannelUID()
if err != nil {
return nil, err
}
m.mg.Logger.Warn("Legacy notification had a UID that collides with a migrated record, generating a new one", "id", c.ID, "old", uid, "new", new)
uid = new
} }
settings, secureSettings, err := migrateSettingsToSecureSettings(c.Type, c.Settings, c.SecureSettings) settings, secureSettings, err := migrateSettingsToSecureSettings(c.Type, c.Settings, c.SecureSettings)