From 8ced9d0a1c41b2806591e8ebacf8d36ad8225f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Sat, 1 Jul 2017 10:03:07 -0700
Subject: [PATCH] Always sort InhibitedBy & SilencedBy to ensure order don't
 change between update

---
 mapper/v04/alerts.go  | 3 +++
 mapper/v05/alerts.go  | 3 +++
 mapper/v061/alerts.go | 3 +++
 mapper/v062/alerts.go | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/mapper/v04/alerts.go b/mapper/v04/alerts.go
index 6f4d577b3..65bed864f 100644
--- a/mapper/v04/alerts.go
+++ b/mapper/v04/alerts.go
@@ -6,6 +6,7 @@ package v04
 
 import (
 	"errors"
+	"sort"
 	"strconv"
 	"time"
 
@@ -111,6 +112,8 @@ func (m AlertMapper) GetAlerts(uri string, timeout time.Duration) ([]models.Aler
 					InhibitedBy:  inhibitedBy,
 					SilencedBy:   silencedBy,
 				}
+				sort.Strings(a.InhibitedBy)
+				sort.Strings(a.SilencedBy)
 				alertList = append(alertList, a)
 			}
 			ug := models.AlertGroup{
diff --git a/mapper/v05/alerts.go b/mapper/v05/alerts.go
index 586d602cf..228acd669 100644
--- a/mapper/v05/alerts.go
+++ b/mapper/v05/alerts.go
@@ -6,6 +6,7 @@ package v05
 
 import (
 	"errors"
+	"sort"
 	"time"
 
 	"github.com/blang/semver"
@@ -110,6 +111,8 @@ func (m AlertMapper) GetAlerts(uri string, timeout time.Duration) ([]models.Aler
 					InhibitedBy:  inhibitedBy,
 					SilencedBy:   silencedBy,
 				}
+				sort.Strings(a.InhibitedBy)
+				sort.Strings(a.SilencedBy)
 				alertList = append(alertList, a)
 			}
 			ug := models.AlertGroup{
diff --git a/mapper/v061/alerts.go b/mapper/v061/alerts.go
index 5b0f8f43d..938d0648d 100644
--- a/mapper/v061/alerts.go
+++ b/mapper/v061/alerts.go
@@ -7,6 +7,7 @@ package v061
 
 import (
 	"errors"
+	"sort"
 	"time"
 
 	"github.com/blang/semver"
@@ -109,6 +110,8 @@ func (m AlertMapper) GetAlerts(uri string, timeout time.Duration) ([]models.Aler
 					InhibitedBy:  inhibitedBy,
 					SilencedBy:   silencedBy,
 				}
+				sort.Strings(a.InhibitedBy)
+				sort.Strings(a.SilencedBy)
 				alertList = append(alertList, a)
 			}
 			ug := models.AlertGroup{
diff --git a/mapper/v062/alerts.go b/mapper/v062/alerts.go
index 7f2016b8e..f169cfec9 100644
--- a/mapper/v062/alerts.go
+++ b/mapper/v062/alerts.go
@@ -7,6 +7,7 @@ package v062
 
 import (
 	"errors"
+	"sort"
 	"time"
 
 	"github.com/blang/semver"
@@ -113,6 +114,8 @@ func (m AlertMapper) GetAlerts(uri string, timeout time.Duration) ([]models.Aler
 					InhibitedBy:  inhibitedBy,
 					SilencedBy:   silencedBy,
 				}
+				sort.Strings(a.InhibitedBy)
+				sort.Strings(a.SilencedBy)
 				alertList = append(alertList, a)
 			}
 			ug := models.AlertGroup{