(cherry picked from commit 0dfd78c88c)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
This commit is contained in:
co-authored by
Alexander Weaver
parent
924180a25b
commit
ad2ea44977
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user