From 5df44def813b5e166847fa29d98c562ded3dabe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Mon, 1 May 2017 18:43:03 +0100
Subject: [PATCH 1/4] Add new attrs for tracking alert status and linking
 silences / inhibiting alerts

Those will replace Inhibited and Silenced
---
 models/models.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/models/models.go b/models/models.go
index 2efbd68c3..1d4f1ff69 100644
--- a/models/models.go
+++ b/models/models.go
@@ -35,6 +35,9 @@ type Alert struct {
 	StartsAt     time.Time         `json:"startsAt"`
 	EndsAt       time.Time         `json:"endsAt"`
 	GeneratorURL string            `json:"generatorURL"`
+	Status       string            `json:"Status"`
+	SilencedBy   []string          `json:"silencedBy"`
+	InhibitedBy  []string          `json:"inhibitedBy"`
 	Inhibited    bool              `json:"inhibited"`
 	Silenced     string            `json:"silenced"`
 	// unsee fields

From 487d7bcde8523636c55ca2a5fa5404bd96f85588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Mon, 1 May 2017 20:21:09 +0100
Subject: [PATCH 2/4] Use alert status, inhibitedBy & silencedBy fields instead
 of silenced & inhibited

---
 assets/templates/alertgroup.html | 56 +++++++++++++++++---------------
 bindata_assetfs.go               |  2 +-
 filters/filter_fuzzy.go          |  4 +--
 filters/filter_inhibited.go      |  2 +-
 filters/filter_silence_author.go | 30 +++++++++--------
 filters/filter_silence_jira.go   | 32 ++++++++++--------
 filters/filter_silenced.go       |  4 +--
 filters/filter_test.go           | 54 +++++++++++++++---------------
 main.go                          |  2 +-
 mapper/v04/alerts.go             | 19 ++++++++---
 mapper/v04/silences.go           |  3 +-
 mapper/v05/alerts.go             | 16 +++++++--
 mapper/v061/alerts.go            | 15 ++++++---
 models/models.go                 | 36 ++++++++++++++++++--
 timer.go                         | 21 +++---------
 views.go                         | 14 ++++----
 16 files changed, 183 insertions(+), 127 deletions(-)

diff --git a/assets/templates/alertgroup.html b/assets/templates/alertgroup.html
index 4a8e33cdb..497c6dce7 100644
--- a/assets/templates/alertgroup.html
+++ b/assets/templates/alertgroup.html
@@ -50,7 +50,7 @@
 
 <script type="application/json" id="alert-group-elements">
   <% var cls_indicator = 'incident-indicator-danger' %>
-  <% if (alert.silenced || alert.inhibited) { cls_indicator = 'incident-indicator-success' } %>
+  <% if (alert.status === "suppressed") { cls_indicator = 'incident-indicator-success' } %>
   <div>
     <% if (alert.generatorURL) { %>
       <a class="label label-list label-default"
@@ -74,12 +74,12 @@
         <%- text %>
       </a>
     <% }) %>
-    <% if (alert.inhibited) { %>
+    <% if (alert.inhibitedBy.length) { %>
       <%= Templates.Render('buttonLabel', {elem: 'span', elemClass: 'label label-list label-success', label: {key: '@inhibited', value: 'true', text: '@inhibited: true'}}) %>
     <% } else { %>
       <%= Templates.Render('buttonLabel', {elem: 'span', elemClass: 'label label-list label-danger', label: {key: '@inhibited', value: 'false', text: '@inhibited: false'}}) %>
     <% } %>
-    <% if (alert.silenced) { %>
+    <% if (alert.silencedBy.length) { %>
       <%= Templates.Render('buttonLabel', {elem: 'span', elemClass: 'label label-list label-success', label: {key: '@silenced', value: 'true', text: '@silenced: true'}}) %>
     <% } else { %>
       <%= Templates.Render('buttonLabel', {elem: 'span', elemClass: 'label label-list label-danger', label: {key: '@silenced', value: 'false', text: '@silenced: false'}}) %>
@@ -110,28 +110,30 @@
 </script>
 
 <script type="application/json" id="alert-group-silence">
-  <div>
-    <% var silence = silences[alert.silenced] %>
-    <% if (silence) { %>
-      <blockquote class="silence-comment">
-        <% if (silence.jiraURL) { %>
-          <a href="<%= silence.jiraURL %>" target="_blank">
-            <i class="fa fa-external-link"/>
+  <% _.each(alert.silencedBy, function(silenceID) { %>
+    <div>
+      <% var silence = silences[silenceID] %>
+      <% if (silence) { %>
+        <blockquote class="silence-comment">
+          <% if (silence.jiraURL) { %>
+            <a href="<%= silence.jiraURL %>" target="_blank">
+              <i class="fa fa-external-link"/>
+              <%- silence.comment %>
+            </a>
+          <% } else { %>
             <%- silence.comment %>
-          </a>
-        <% } else { %>
-          <%- silence.comment %>
-        <% } %>
-        <footer>
-          <cite>
-            <abbr class="label-ts" data-toggle="tooltip" data-placement="top" data-ts="<%= silence.startsAt %>">
-              <%- silence.createdBy %>
-            </abbr>
-          </cite>
-        </footer>
-      </blockquote>
-    <% } %>
-  </div>
+          <% } %>
+          <footer>
+            <cite>
+              <abbr class="label-ts" data-toggle="tooltip" data-placement="top" data-ts="<%= silence.startsAt %>">
+                <%- silence.createdBy %>
+              </abbr>
+            </cite>
+          </footer>
+        </blockquote>
+      <% } %>
+    </div>
+  <% }) %>
 </script>
 
 <script type="application/json" id="alert-group-label-map">
@@ -217,7 +219,7 @@
           <% }) %>
           <% var silencedText = '@silenced: false' %>
           <% var isSilenced = 'false' %>
-          <% if (alert.silenced) { %>
+          <% if (alert.silencedBy.length) { %>
             <% silencedText = '@silenced: true' %>
             <% isSilenced = 'true' %>
           <% } %>
@@ -226,7 +228,7 @@
 
           <% var inhibitedText = '@inhibited: false' %>
           <% var isInhibited = 'false' %>
-          <% if (alert.inhibited) { %>
+          <% if (alert.inhibitedBy.length) { %>
             <% inhibitedText = '@inhibited: true' %>
             <% isInhibited = 'true' %>
           <% } %>
@@ -241,7 +243,7 @@
               <%= Templates.Render('alertGroupAnnotations', {alert: alert}) %>
               <%= Templates.Render('alertGroupLabels', {alert: alert, group: group}) %>
               <%= Templates.Render('alertGroupElements', {alert: alert}) %>
-              <% if (alert.silenced) { %>
+              <% if (alert.silencedBy.length) { %>
                 <%= Templates.Render('alertGroupSilence', {alert: alert, silences: silences}) %>
               <% } %>
             </div>
diff --git a/bindata_assetfs.go b/bindata_assetfs.go
index e4c612a2f..64900a702 100644
--- a/bindata_assetfs.go
+++ b/bindata_assetfs.go
@@ -136,7 +136,7 @@ func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
-var _templatesAlertgroupHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x1a\x5d\x6f\xe3\xb8\xf1\x7d\x7f\xc5\x9c\x7b\x39\xc5\x88\x65\xef\xbe\x15\x86\xe5\x36\x77\x38\x2c\x8a\xee\xa2\xc0\xed\xf6\x29\x58\x04\xb4\x44\xdb\x8c\x65\x49\x4b\x52\xb9\x35\x72\xf9\xef\x05\x3f\xc5\x2f\x3b\xce\x26\xd7\x36\x0f\xb1\x44\x0e\x87\xc3\xf9\x9e\xa1\x16\xac\xa4\xa4\xe3\xc0\x0f\x1d\x2e\x46\xa8\xeb\x6a\x52\x22\x4e\xda\x66\x76\xc7\xda\x66\x04\xa4\x2a\x46\xa8\xc6\x94\xe7\x1b\xda\xf6\x5d\xce\x09\xaf\xf1\x68\xf9\x06\x60\x71\x01\x64\x0d\x97\xff\x5a\xdd\xe1\x92\x4f\x77\xf8\xc0\x2e\x25\xc8\xb4\x46\x2b\x5c\xb3\xf1\xb4\xc6\xcd\x86\x6f\x61\x09\x6f\xc7\xf0\x00\x17\x62\x8d\x5c\x75\x8f\x28\xac\x49\xcd\x31\x65\x50\xc0\xcd\x17\x67\xea\x76\x8a\x51\xb9\xf5\xf0\x4c\x60\xdd\x37\xa5\xa0\xe8\x52\x0e\xdc\xde\xa3\x7a\x02\xea\x71\x87\x0f\x02\xb5\x46\x36\xed\x7a\xb6\xbd\xb4\x33\x70\x05\x59\x91\xc1\x15\xd8\x65\x63\x78\x1c\x07\x74\xc8\x9d\x3e\x90\x66\x07\x05\x64\x7f\xfb\x2a\xe1\x0d\xba\xbb\x96\x34\x97\xd9\x24\x1b\xd6\xb0\x0e\x35\x50\xd6\x88\xb1\x62\xd4\xf5\x75\x9d\xd7\x78\xcd\xc1\x65\x4f\x4d\x9a\xdd\x48\x41\x03\x2c\x10\x6c\x29\x5e\x17\xa3\xc5\x45\xe1\xec\x74\xb1\x1c\x81\x64\x63\x31\x92\xef\xbc\x05\xbe\x25\x4c\xe1\x51\x70\xa3\x09\x54\x88\xa3\x9c\xb7\x9b\x8d\x80\xe3\x6d\x5b\x73\xd2\x8d\xd4\x68\x57\xa3\x12\xef\x71\xc3\xc5\x44\x67\xb7\x03\x58\x10\x43\xdd\x1a\xc1\x1a\x29\x6a\x66\x96\x9c\x19\xd2\xe7\x98\x89\x83\x24\xce\xb4\x42\xd5\x06\x83\x3c\x19\x25\x9b\x2d\x1f\x4e\x72\x91\x2b\xc2\xa6\x92\x48\x66\x64\x7b\x91\x40\x58\x91\x7b\xcb\x23\xd4\xe0\xda\x51\x19\xcd\xf8\xef\x50\x1b\x5f\x3f\xae\x15\x11\x9f\x5a\xca\x3f\xa2\xee\xe7\xc3\x3f\xf1\xc1\x47\x12\x2a\x4d\x80\xc9\x8a\x1f\x71\x2e\x95\x50\x23\x7c\x8f\xf9\x07\x01\x7e\x2d\x86\xd5\x4a\x41\xa1\x56\xb7\xe9\x3d\xaa\x7b\x3c\x0e\x11\x15\xf0\x19\xef\xbb\x1a\x71\xcc\xa6\xbf\xe1\xa6\xc2\xf4\x32\x5b\xf5\x9c\xb7\x8d\xc4\x95\x4d\xe0\x01\xd7\x78\x3f\x87\xac\x22\xf7\xd9\x04\xc4\xcb\x2f\x82\x3f\x73\xc8\x24\x5e\x85\x3d\xaf\x09\xe3\xd9\x44\x91\x34\x57\x3f\x7a\xe3\xb9\xfa\x79\x1c\x07\xdc\x70\x07\xc4\x2b\xe0\x9a\xe1\x80\x67\x8e\x34\x86\x6d\x14\xbe\xd1\x72\x31\xab\xc8\xbd\x87\xc1\x0a\x54\x4f\x98\xc1\xc5\x4c\xf9\x89\xe5\x9b\x37\xcf\xf5\x18\xa8\x69\x5a\x2e\x01\x98\xf1\x1b\x27\xc4\x28\x57\x4e\x9d\x35\xae\x2c\x87\x61\xd7\xa3\x38\x47\xfc\x1d\xd7\x35\x88\x7f\x39\xdb\xc3\x00\x9d\x8b\xa1\x41\x03\x03\x2b\xf9\xda\x63\x26\xa1\x4a\x42\xcb\x1a\x03\xc7\xdf\x78\xbe\xef\x39\xae\xac\x9d\x0a\x29\x0f\xe8\x84\x4e\x48\x2b\x3e\xdf\x46\x67\x81\xfa\x3b\xc8\xb4\x56\x05\xaa\x9e\x43\x08\xf2\xb4\xac\x5d\x53\x76\x0e\xe1\xaa\xeb\x0d\xec\x09\x63\xa4\xd9\x38\xe8\x41\xa1\xff\x32\x20\x72\xcc\xf9\x84\x5e\x8c\x5f\xa8\x18\xca\x56\xcf\xd6\x89\xa7\x4d\x5b\xf3\xd6\xf5\x04\x37\xd6\x88\xbf\x40\x51\x40\xdf\x54\x78\x4d\x1a\x5c\x79\xfc\x7e\x15\x67\xf0\x1c\x47\x20\xd8\x7b\xa6\xa9\x0f\xdc\x7f\x0d\x96\x8b\xfd\x71\xc3\x2d\xd3\xc5\xb1\xcb\x9a\xdd\x92\xa6\x12\x0b\x5b\x2a\xc2\x20\x69\x4a\x52\xe1\x86\xe7\x76\x34\xaf\x50\xb3\xc1\x34\xb3\x84\x48\x15\x96\x52\x61\xa4\xc6\x4d\x89\x2b\xf8\xe3\x0f\x15\xc0\xa6\xa4\xd9\x92\x15\xe1\x8a\xc7\xe7\x20\x67\x7d\x59\x62\xc6\x32\x7b\x50\xeb\x94\xbc\x9d\x36\xb8\xc1\x54\x2c\xf8\xf7\x6f\x1f\x7c\xf1\x21\xcf\xc3\x41\xe8\xe7\xf2\x0a\xaf\x51\x5f\xf3\xd1\x60\x07\x43\x58\x8e\x71\x0b\xcb\x1e\x20\x39\xa2\x1b\xcc\x8b\xd1\xed\xaa\x46\xcd\xce\x9d\x50\x9e\xe1\x7d\xab\xe2\x37\xd6\xe1\x9b\xb5\x3d\x2d\xb1\x03\x97\xf4\x11\xc1\xf4\xd9\x01\x1d\x7f\xe3\x98\x36\xa8\x0e\x22\x3b\xe8\x6d\xa3\x40\xef\x9a\xae\x35\x31\x6d\x4e\xa4\xd9\xb9\xc9\x55\x4f\xeb\x89\x74\x7d\xaf\xc7\xdb\x9e\xd6\xcf\x63\x66\x72\xd1\x7f\x87\x81\xc2\xe3\x8a\xd3\x3b\x47\x77\xb9\x38\x0e\x7c\x4c\x42\xd5\x5f\xe2\x09\x4e\xe5\x04\xfa\xd1\x58\x89\x75\x14\x0f\x3b\x7c\x98\x43\xf6\x77\x4b\x44\x36\x51\x9e\x7c\x0e\x19\xa7\x3d\xce\x94\x38\x3d\x90\x39\xc8\x99\xc7\xc0\xbf\x84\xb1\xe4\xcf\x39\x81\x76\x22\x67\x1d\x60\x8d\x6a\x76\xe4\x04\x6a\x2a\x3c\x42\x4a\x3c\xc6\x37\xfd\x2f\xa5\x63\x68\x38\x2e\x1c\x03\xf1\x7f\x29\x9b\x04\xf9\xa1\x68\x06\xfa\x23\xc9\xd8\x18\xa3\x82\xb1\x57\xed\xbd\x56\xd0\xd7\x98\x14\xa0\x53\x02\x4e\xa3\x12\x30\x11\xb2\xfd\x14\xda\xcd\x9f\x4e\xcb\x19\xca\x9e\xb2\x96\xe6\x5d\x4b\x1a\x8e\xa9\xe3\x8e\x84\x33\x93\xc1\x58\x49\xc4\x9f\x91\xbe\x4a\x51\xaa\x9c\x9d\xa6\xda\xad\x34\x13\x2b\x24\x2b\x1a\xb4\xc7\x6e\xc8\xd2\x4b\xed\x5c\x7a\xa9\xf1\x9b\xfb\xb6\x42\x75\x6a\x5e\x7b\xe4\xbf\x68\x29\x7e\x94\x70\x5e\x81\x13\x78\xd0\x95\xcc\xae\x6b\xc4\xb6\x36\x3b\xfe\xa4\xd6\x3a\x55\xec\x73\x52\x63\x70\x0a\x54\xa7\x8c\x74\x8d\xfa\xcc\x20\xa4\xdf\xd0\x06\xeb\x27\xce\xec\x91\x4f\x46\x91\x14\x59\xfe\x42\xe6\xb2\x9e\x71\x44\x39\xbb\x16\xb1\x62\x60\x55\xac\x3d\x39\x67\xb9\x18\x1c\x05\x79\x7d\x88\xc3\x62\xf0\xd2\x6e\xaf\xae\x89\xb3\x26\xd8\x92\xaa\xc2\x8d\x74\x07\x7e\x92\xe5\x11\x35\x14\x78\x3a\x9c\xe9\x91\x17\xe4\x90\x5a\x53\x46\x51\xaa\x26\x0c\x5d\x4f\x42\x61\x9e\xd8\x8d\xef\x8b\xbf\x04\x9e\x5a\x8f\xfb\x2e\x7a\x55\xb7\xe5\xee\x6b\xdf\x72\x6c\x18\xa0\xc1\xf2\xb2\xdd\x0b\x11\x79\x2c\x75\xf1\x4c\xef\x08\x45\x61\x82\x08\x61\x2f\x26\x00\x56\x1d\x19\x3f\x37\x59\x7a\xb6\x72\x76\x1a\x61\x84\x6c\x76\xd0\xf4\x06\xb4\x98\xcc\x02\x8e\x17\x73\x4f\xa2\x71\x0d\x44\xbe\xaf\xdb\x96\x63\xea\x61\x28\x09\xc7\x01\x6d\x68\xb5\xa2\xa1\x96\x3e\xcb\x5a\x3d\x7b\x30\xf4\x25\x2d\x22\x75\x0e\x8a\x11\xc7\xd5\xcf\x07\xff\xa8\x92\x25\xab\x95\x4f\xfc\xcc\xa7\x7e\x31\xf3\x0f\xb8\x98\x0d\x5a\x12\x95\x4a\x2f\x56\x72\xc5\x9a\x3d\xea\xdc\x4a\x49\x0e\x5e\x53\xea\xc4\xb1\x21\x86\xc9\xc9\x8f\xa8\x0b\x43\x55\x94\x54\x9b\x60\x75\x4d\xa9\x0a\x57\x0f\x2a\x92\x8a\xff\x13\x90\x71\xd7\x29\x36\x75\xd4\x75\x02\xd8\x04\xb6\x84\x33\x33\x24\x9e\x4d\x10\x73\xe2\x99\xbb\x09\x6b\x29\xbf\x1c\x7a\x28\x13\x58\xc5\x35\x33\x92\x88\x60\x01\x2b\xf9\x30\x06\x8a\x79\x4f\x1b\x78\x97\x86\x5b\x86\x70\x79\x0c\x28\xb3\x69\x01\xa8\xce\x7f\x14\xa1\x84\x5b\x84\x70\x1e\x42\x3d\xf6\x36\x38\xe6\x9b\x54\xb7\x71\xd5\x56\x07\xb0\xfe\x52\xbb\x2c\xdc\x21\x59\xde\x8d\xe2\x96\x91\x0f\x3a\x0a\x12\x17\xb6\x23\x5d\x87\x2b\x99\x58\x89\xf2\xf5\x4a\x64\x13\x7a\xd0\x4b\x24\xa4\x0f\xd2\xe3\x45\x01\xef\xe2\x0c\xc5\x43\x75\x55\xc0\xc8\x84\xca\x27\xfb\x3a\x47\xd7\xb2\x70\xf1\xf0\xf6\xf4\x09\x53\xbd\xdf\x51\xe4\x80\xdc\x8d\x5d\x9a\xfc\x58\x65\xd8\x45\x65\x3a\x2a\x58\x60\x84\xa5\xa7\x7f\xc8\x73\xfb\x52\xa2\x26\xe3\xd0\x33\x2c\xdb\x31\x94\x95\x2d\xc5\x20\x6d\x68\x0c\x5b\x4c\x31\x20\x06\x84\x43\xd5\x62\x26\x00\x59\xdf\x75\x2d\xe5\xb0\xa2\x18\xed\x48\xb3\x91\xc5\x76\xdd\xb6\x9d\x45\xf8\x3b\xe1\x5b\xc8\xb4\x92\x98\xf4\x54\xe0\xbf\xfb\xda\x63\x7a\x80\x3d\xe6\xdb\xb6\xb2\xe0\x79\xee\xd1\xfd\xa3\x63\xbf\xd7\x94\x3a\xf6\x4b\x74\x3a\x9c\xea\x1e\x0b\x79\xdb\xd3\x2e\xe1\xaf\xf0\xd3\x4f\x83\xc5\xd9\x16\xf6\xbb\xb0\x87\x1d\xb1\xfd\x89\xb2\x3a\x76\xa6\xae\x5a\xfe\xd2\xf6\x0d\x87\x22\xda\x38\x1f\x04\x71\x91\xc0\xe0\xe8\xaa\xc6\x10\x2b\xac\xf9\xbb\x72\xb4\x40\x01\x5f\x2c\xd5\x7e\x31\xde\x74\x1c\x7b\x0a\x0f\x4b\x21\x8a\xc2\x83\xaf\x6e\xe0\xf9\x05\x29\xf2\x48\x42\xc7\xa8\x91\xeb\x14\x77\xae\xae\x12\x93\xaf\x73\x2f\x60\x19\x3d\xb8\x69\xa1\x0f\x49\x2e\xc7\x4d\x7a\x4e\xc9\x3e\x32\xd7\x01\xf1\xab\x55\x80\x72\x1f\x8e\x36\xcf\xb8\x77\xb0\x54\x1c\xd3\x62\x3f\x19\x97\x3b\x94\x42\xe0\x89\x93\x28\x1f\xe3\x70\x28\xb5\x4f\x42\xf4\x5e\x62\x7b\x86\xc8\xff\xb4\xee\xac\xb7\x77\xac\x80\x27\xae\x6b\xdc\xc4\xdc\xf4\xd4\x5f\x9a\xb5\xd8\x94\x3c\xf4\xfc\x0a\xd2\xde\x42\x4e\x49\x35\x5c\x5f\x6c\x11\xdb\xba\x73\xe2\x7d\x48\xe3\x9c\x1e\xb1\x0c\xaf\x22\x06\xaa\x38\x6b\xbb\xb6\xa9\xe6\x3b\x2a\x39\xb9\xc7\xca\xce\xf5\x45\x5e\x02\x85\xe9\x2a\x3f\xa6\xae\x72\x14\xac\x29\x6f\xd4\x9b\x93\x5d\xc6\x81\x7f\x8b\x51\x25\xc3\x03\xfe\xc6\xf3\x12\xcb\xba\xdc\xe5\x7f\x4a\x01\x24\xf3\xde\x0b\x92\x3f\x8b\x52\x56\x28\x81\x3c\xc0\x5c\x31\xe3\x88\xc4\xfc\x84\xf0\x23\xea\xa0\x80\x87\xc7\xa8\xe9\x61\xd3\x01\x37\x16\x86\x97\xdc\x2a\x8e\xbb\x77\x5c\x62\x60\x02\x24\x4e\x20\x04\x7b\x09\x2c\x55\xe8\xbf\xad\xc9\x9e\x70\xc8\x13\x2e\x65\xc8\x17\x42\xff\x16\xf5\x80\xcf\xbd\x61\x4f\x7b\x49\x99\xb9\x15\xe0\xdd\xb8\xcf\xc1\xbb\x72\x3f\xe2\x14\xe3\x2b\x9a\xdb\xd3\x57\x34\xc1\x7a\xc3\xf8\x1b\x41\x42\xbc\x2c\x9c\xd6\xed\x2c\xbb\x91\x9f\x56\xab\xf3\xaa\xa4\xfa\xed\x63\x1c\x7c\x86\x6c\xda\xa2\x94\xde\x2a\x19\x3d\x12\x6e\x20\xba\x31\x76\x2b\xe5\xea\xb3\x62\x62\xdc\x47\x4b\xae\x22\xec\x93\xb9\x70\x29\x4c\x2b\x2e\x99\x9b\x9c\xe8\x80\x0e\x5a\x72\x9c\x04\xd9\x8a\x4c\x09\xcf\xdb\x3f\x01\x95\x64\x81\x27\x32\x77\xd7\x13\xa2\x0b\xc0\x4e\x74\x24\x07\x9a\x8e\x4b\xd1\x95\xa0\x87\xd9\x91\x64\x82\xdb\xa6\xeb\x6c\x39\x14\xf5\xa1\x8f\x48\xe9\x1f\x06\xee\x2c\x31\xa5\xef\x11\x06\xc0\x53\x64\x1c\x97\x94\x47\xc3\x77\x89\xca\xdb\xf8\x84\xac\x42\xb8\x53\xad\x7d\x87\xae\xf3\xc4\xe5\x23\x4f\xc9\xeb\x44\x0b\xc5\x46\x2f\x59\x16\x16\x90\xa5\xc5\x40\x60\x91\xfc\xbe\x45\xbb\x57\x17\xc1\xb1\xd2\x32\x8b\xce\x90\x2e\x4d\x4d\x44\x93\x2f\x51\xbb\xe4\xac\xba\xcd\x90\x7e\x3a\xa2\x5d\x0f\xdf\x50\x88\xb8\x26\x27\xe6\x2a\x78\xa4\x32\xba\xa7\xd0\xc9\x2c\x29\xc2\x34\x81\x63\xf1\xf2\x5c\xbc\xbf\xea\x2b\xe9\xf3\x68\x3c\xcf\xb7\x9d\xb3\xaf\xf6\x19\xf1\x81\x4c\xe3\x72\x6e\x9f\x8e\x90\x92\xa8\x52\x82\xa4\x34\x18\x08\x4a\xf4\xe8\x03\x1e\x71\xb6\x1f\x7e\x9c\x12\xf6\xeb\xbe\xe3\x07\xf5\x85\x94\x35\xc6\x71\x94\x10\x9c\x21\xaf\x8f\xa8\x13\x07\x34\x38\xe6\x30\x74\xa9\x74\x8a\x30\x37\x0f\xd1\xc7\x44\xd1\x27\x1f\xdf\x95\x9e\xaa\x2a\x40\x25\xda\xb9\xfa\xb2\xce\xfd\x7a\xd0\x16\x26\x91\x73\x11\x86\xeb\xcc\x0a\xcb\x7d\xf4\xbf\x3f\x50\x35\x5a\x62\x99\xa9\xde\x1e\x4a\x5d\xf2\x64\x13\x60\xfc\x50\x63\xf1\x68\x7d\xcd\x42\x70\x50\xec\x20\x2a\x51\x6d\x72\x66\x48\x6d\x7a\xb1\x94\x5c\x96\xe8\xa6\xa5\x1e\x1a\x2e\x51\x24\x4a\x7d\x2f\x20\x41\xe4\x80\x07\x92\xbe\x0a\x1a\xae\x81\x72\x05\xa0\xf9\x92\x02\xd8\xe1\x83\x73\x55\x64\xbe\x3c\x4a\x41\xde\xa3\xda\x85\x34\xdf\x0c\x05\xb0\x47\x2e\x84\xfc\xcb\x20\xa5\x25\xce\x55\xd0\x50\xa6\x0d\x77\xe4\x8b\x99\xc3\x40\x57\x2f\xfe\x13\x00\x00\xff\xff\x31\x57\x49\xeb\x53\x2a\x00\x00")
+var _templatesAlertgroupHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x1a\xdb\x6e\xe3\x36\xf6\x7d\xbe\xe2\x54\xdb\x54\x31\x62\xd9\x33\x6f\x0b\xc3\xf2\x6e\xda\x2d\x06\xc5\x4e\xb0\x40\x3b\xfb\x14\x0c\x02\x5a\xa2\x6d\xc6\xb2\xa4\x21\xa9\x74\x8c\x20\xff\x5e\xf0\x22\x8a\x37\x39\xce\x4c\x5a\x34\x0f\xb1\x44\x1e\x1e\x9e\xfb\x85\xd4\x92\x15\x94\xb4\x1c\xf8\xb1\xc5\x79\x82\xda\xb6\x22\x05\xe2\xa4\xa9\xe7\xf7\xac\xa9\x13\x20\x65\x9e\xa0\x0a\x53\x9e\x6d\x69\xd3\xb5\x19\x27\xbc\xc2\xc9\xea\x0d\xc0\xf2\x02\xc8\x06\x2e\xff\xb7\xbe\xc7\x05\x9f\xed\xf1\x91\x5d\x4a\x90\x59\x85\xd6\xb8\x62\x93\x59\x85\xeb\x2d\xdf\xc1\x0a\xde\x4e\xe0\x11\x2e\xc4\x1a\xb9\xea\x01\x51\xd8\x90\x8a\x63\xca\x20\x87\xdb\x4f\xd6\xd4\xdd\x0c\xa3\x62\xe7\xe0\x99\xc2\xa6\xab\x0b\x41\xd1\xa5\x1c\xb8\x7b\x40\xd5\x14\xd4\xe3\x1e\x1f\x05\x6a\x8d\x6c\xd6\x76\x6c\x77\x69\x66\xe0\x0a\xd2\x3c\x85\x2b\x30\xcb\x26\xf0\x34\xf1\xe8\x90\x3b\x7d\x20\xf5\x1e\x72\x48\xff\xf5\x59\xc2\xf7\xe8\xee\x1b\x52\x5f\xa6\xd3\x74\x58\xc3\x5a\x54\x43\x51\x21\xc6\xf2\xa4\xed\xaa\x2a\xab\xf0\x86\x83\x2d\x9e\x8a\xd4\xfb\x44\x41\x03\x2c\x11\xec\x28\xde\xe4\xc9\xf2\x22\xb7\x76\xba\x58\x25\x20\xc5\x98\x27\xf2\x9d\x37\xc0\x77\x84\x29\x3c\x0a\x2e\x99\x42\x89\x38\xca\x78\xb3\xdd\x0a\x38\xde\x34\x15\x27\x6d\xa2\x46\xdb\x0a\x15\xf8\x80\x6b\x2e\x26\x5a\xb3\x1d\xc0\x92\xf4\xd4\x6d\x10\x6c\x90\xa2\x66\x6e\xc8\x99\x23\xcd\xc7\x5c\x30\x12\xe1\x69\x8d\xca\x2d\x06\xc9\x19\x25\xdb\x1d\x1f\x38\xb9\xc8\x14\x61\x33\x49\x24\xeb\x75\x7b\x11\x41\x58\x92\x07\x23\x23\x54\xe3\xca\x32\x19\x2d\xf8\xaf\x30\x1b\xd7\x3e\xae\x15\x11\xbf\x35\x94\xdf\xa0\xf6\xc7\xe3\x7f\xf1\xd1\x45\xe2\x1b\x8d\x87\xc9\xa8\x1f\x71\x2e\x8d\x50\x23\x7c\x8f\xf9\x07\x01\x7e\x2d\x86\xd5\x4a\x41\xa1\x36\xb7\xd9\x03\xaa\x3a\x3c\xf1\x11\xe5\xf0\x11\x1f\xda\x0a\x71\xcc\x66\xbf\xe2\xba\xc4\xf4\x32\x5d\x77\x9c\x37\xb5\xc4\x95\x4e\xe1\x11\x57\xf8\xb0\x80\xb4\x24\x0f\xe9\x14\xc4\xcb\x4f\x42\x3e\x0b\x48\x25\x5e\x85\x3d\xab\x08\xe3\xe9\x54\x91\xb4\x50\x3f\x7a\xe3\x85\xfa\x79\x9a\x78\xd2\xb0\x07\xc4\x2b\xe0\x8a\x61\x4f\x66\x96\x36\x86\x6d\x14\xbe\x64\xb5\x9c\x97\xe4\xc1\xc1\x60\x14\xaa\x27\xfa\xc1\xe5\x5c\xc5\x89\xd5\x9b\x37\x2f\x8d\x18\xa8\xae\x1b\x2e\x01\x58\x1f\x37\x4e\xa8\x51\xae\x9c\x59\x6b\x6c\x5d\x0e\xc3\x76\x44\xb1\x58\xfc\x1d\x57\x15\x88\x7f\x19\x3b\xc0\x00\x9d\x89\xa1\xc1\x02\x3d\x2f\xf9\xdc\x61\x26\xa1\x0a\x42\x8b\x0a\x03\xc7\x5f\x78\x76\xe8\x38\x2e\x8d\x9f\x0a\x2d\x0f\xe8\x84\x4d\x48\x2f\x3e\xdf\x47\xe7\x9e\xf9\x5b\xc8\xb4\x55\x79\xa6\x9e\x81\x0f\xf2\xbc\xae\x6d\x57\xb6\x98\xb0\xcd\xf5\x16\x0e\x84\x31\x52\x6f\x2d\xf4\xa0\xd0\x7f\x1a\x10\x59\xee\x7c\xc2\x2e\x26\xdf\x68\x18\xca\x57\xcf\xb6\x89\xe7\x5d\x5b\xcb\xd6\x8e\x04\xb7\xc6\x89\x3f\x41\x9e\x43\x57\x97\x78\x43\x6a\x5c\x3a\xf2\x7e\x95\x60\xf0\x92\x40\x20\xc4\x7b\xa6\xab\x0f\xd2\x7f\x0d\x91\x8b\xfd\x71\xcd\x8d\xd0\x05\xdb\x45\xc5\xee\x48\x5d\x8a\x85\x0d\x15\x69\x90\xd4\x05\x29\x71\xcd\x33\x33\x9a\x95\xa8\xde\x62\x9a\x1a\x42\xa4\x09\x4b\xad\x30\x8e\x78\xc7\x20\xcf\x73\x48\x58\xd7\xb6\x14\x33\x86\xcb\x44\xc8\xf7\x1c\xc4\xac\x2b\x0a\xcc\x58\x6a\x98\x34\x01\xc9\xd9\x65\x8b\x6b\x4c\xc5\x82\xff\xff\xfa\xc1\x55\x1d\x72\xa2\x1b\xf8\x31\x2e\x2b\xf1\x06\x75\x15\x4f\x06\x1f\x18\x52\x72\x88\x5b\x78\xf5\x00\xc9\x11\xdd\x62\x9e\x27\x77\xeb\x0a\xd5\x7b\x7b\x42\x45\x85\xf7\x8d\xca\xdd\x58\xa7\x6e\xd6\x74\xb4\xc0\x16\x5c\x34\x3e\x78\xd3\x67\x27\x73\xfc\x85\x63\x5a\xa3\xca\xcb\xea\xa0\xb7\x0d\x92\xbc\xed\xb6\xc6\xbd\xb4\x2b\x91\x7a\x6f\x17\x56\x1d\xad\xa6\x32\xec\xbd\x9e\x6c\x3b\x5a\xbd\x4c\x98\xd1\x45\x7f\x8d\x00\x45\xb4\x15\xdc\x5b\xac\xdb\x52\x9c\x78\xf1\x45\xc9\x90\xd4\x3b\xb2\x26\x1c\x97\x3f\x1e\x75\xc9\xe2\xc5\x94\x17\x87\x83\x53\x85\x81\x7e\xec\xdd\xc5\x44\x8b\xc7\x3d\x3e\x2e\x20\xfd\xb7\xa1\x26\x9d\xaa\x70\xbe\x80\x94\xd3\x0e\xa7\x4a\xaf\x0e\xc8\x02\xe4\xcc\x93\x17\x64\xfc\x84\xf2\xe7\x70\xa0\x23\xc9\x59\x0c\x6c\x50\xc5\x46\x38\x50\x53\x3e\x0b\x31\x3d\x31\x52\xe1\xba\xf8\x9b\xa8\xa9\x27\x66\x5c\x4b\x3d\xc4\xdf\x52\x49\x11\xf2\x7d\x1d\x0d\xf4\x07\x2a\x32\x19\x47\xa5\x66\xa7\xf7\x7b\xad\x12\x40\x63\x52\x80\x56\x43\x38\x0b\x1a\xc2\x48\x02\x77\x0b\x6a\xbb\x9a\x3a\xad\x67\x28\x3a\xca\x1a\x9a\xb5\x0d\xa9\x39\xa6\x56\x80\x12\xe1\x4d\xa6\x66\xa5\x11\x77\x46\x46\x2f\x45\xa9\x0a\x7f\x9a\x6a\xbb\xef\x8c\xac\x90\xa2\xa8\xd1\x01\xdb\x49\x4c\x2f\x35\x73\xf1\xa5\x7d\x24\x3d\x34\x25\xaa\x62\xf3\x3a\x46\xff\x43\x6b\xf1\x46\xc2\x39\xed\x8e\x17\x53\xd7\xb2\xd6\xae\x10\xdb\x99\x5a\xf9\x37\xb5\xd6\xea\x69\x5f\x52\x28\x83\xd5\xae\x5a\x4d\xa5\xed\xdd\x67\xa6\x25\xfd\x86\xb6\x58\x3f\x71\x66\x58\x3e\x99\x57\x62\x64\xb9\x0b\x99\x2d\x7a\xc6\x11\xe5\xec\x5a\x64\x8f\x41\x54\xa1\xf5\x64\x9c\x65\x62\x30\xf1\xaa\x7c\x1f\x87\xc1\xe0\x14\xe1\x4e\x97\x13\xd6\x51\xb0\x23\x65\x89\x6b\x19\x0e\xdc\xb2\xcb\x21\x6a\x68\xf7\x74\x82\xd3\x23\xdf\x50\x51\x6a\x4b\xf1\xaa\x78\x3f\xf4\x5a\x1e\xab\x07\x7f\xf9\x8f\xd7\xc2\x79\x31\x42\x83\x41\xde\x3f\xb1\x5b\xb3\xd2\x8d\x1a\x22\xd4\xeb\x29\x3f\x10\xac\xab\xa6\xd8\x7f\xee\x1a\x8e\x7b\xd1\x69\xc0\xac\x68\x0e\x42\xb9\x89\x77\x26\x60\xe1\x9a\xdd\x13\x8a\xfc\x72\x53\x03\xda\xe7\x3a\x1e\xb8\x3a\xdd\x71\x6b\x1d\x77\xf5\x0b\x0a\x93\xc1\x4c\xfa\x5d\x34\xdd\x01\x45\x7d\xbd\x62\x38\x89\x35\x88\x67\x21\xb3\x5d\x4d\x8f\x6c\x9a\x86\x63\xea\xe1\x29\x08\xc7\x01\xa5\x68\xbd\xa6\xbe\xd5\xbf\xc8\xfb\x1d\xff\xea\xe9\x8c\x7a\x58\x9c\x23\x8a\x91\x2c\xc9\x7c\xb6\xa5\x88\xd6\x6b\x9f\x89\xb9\xcf\xc5\x72\xee\x33\xbb\x9c\x0f\x56\xf4\xd7\xb4\xc4\xd9\x01\xb5\x76\x83\x26\x07\xaf\x29\xb5\x12\xe6\xe0\x69\x72\xf2\x06\xb5\x7e\x4e\x0c\xea\xf9\x3e\x2b\x5e\x53\xaa\xf2\xe2\xa3\x4a\xd9\xe2\xff\x14\x64\x82\xb7\x7a\x5c\x9d\xde\xad\x4c\x39\x85\x1d\xe1\xac\x1f\x12\xcf\x7d\xb6\xb4\x12\xa7\xbd\x09\x6b\x28\xbf\x1c\x8e\x6e\xa6\xb0\x0e\x5b\x75\x24\x11\xc1\x12\xd6\xf2\x61\x02\x14\xf3\x8e\xd6\xf0\x2e\x0e\xb7\xf2\xe1\xb2\x10\x50\x16\xf2\x02\x50\xf1\x3f\x8a\x50\xc2\x2d\x7d\x38\x07\xa1\x1e\x7b\xeb\xb1\xf9\x26\x76\xc8\xb9\x6e\xca\x23\x98\xc0\xac\x63\x23\x6e\x91\xec\x2c\x93\xf0\xa4\xca\x05\x4d\xfc\xe8\xb7\x27\x6d\x8b\x4b\x59\xc1\x89\xce\xf9\x4a\x94\x2d\x7a\x30\x0c\x7e\x7a\x3c\xcf\xe1\x5d\x58\x0a\x39\xa8\xae\x72\x48\xfa\x9c\xfc\xec\x71\xd2\xe8\x5a\xe6\x2f\x1e\xde\x9e\xe7\x30\x76\xe4\xec\x85\xe1\xcc\xdd\xd8\xa6\xc9\x4d\x8a\xbd\xb8\xa8\xac\x7b\x85\x08\x7a\x65\xe9\xe9\xef\xb2\xcc\xbc\x14\xa8\x4e\x39\x74\x0c\xcb\x53\x20\xca\x8a\x86\x62\x90\x3e\x34\x81\x1d\xa6\x18\x10\x03\xc2\xa1\x6c\x30\x13\x80\xac\x6b\xdb\x86\x72\x58\x53\x8c\xf6\xa4\xde\xca\x3e\xbf\x6a\x9a\xd6\x20\xfc\x9d\xf0\x1d\xa4\xda\x48\xfa\x3a\x58\xe0\xbf\xff\xdc\x61\x7a\x84\x03\xe6\xbb\xa6\x34\xe0\x59\xe6\xd0\xfd\xbd\xe5\xbf\xd7\x94\x5a\xfe\x4b\x74\xdd\x1d\x3b\xb4\x16\xfa\x36\xdc\xae\xe0\x9f\xf0\xc3\x0f\x83\xc7\x99\x93\xf3\x77\xfe\xd1\x79\x20\xf6\x67\x3a\xfa\x30\x05\xd9\x66\xf9\x53\xd3\xd5\x1c\xf2\x60\xe3\x6c\x50\x44\x18\x7e\x1d\x5b\xd5\x18\x42\x83\xed\xff\xae\x2c\x2b\x50\xc0\x17\x2b\xb5\x5f\x88\x77\x2c\xd5\x9d\xc6\xc3\x62\x88\x82\xb4\xea\x9a\x1b\x38\x71\x41\xaa\x3c\x92\x3c\xc7\x12\xaf\x91\xce\xd5\x55\x64\xf2\x75\xae\x23\x8c\xa0\x87\x30\x2d\xec\x21\x2a\xe5\xf0\x6e\x80\x53\x72\x08\xdc\x75\x40\xfc\x6a\xad\xa6\xdc\x87\xa3\xed\x0b\xae\x3b\x0c\x15\x63\x56\xec\x56\xfd\x72\x87\x42\x28\x3c\xc2\x89\x8a\x31\x96\x84\x62\xfb\x44\x54\xef\x54\xd0\x67\xa8\xfc\x4f\x3b\x14\x76\xf6\x3e\x59\xbd\xf9\x4d\xad\xdd\x01\xf4\x75\xcb\xb7\xf6\x00\xc9\xea\x4d\x3c\xf2\x2b\x48\x73\xf9\x39\x23\xe5\x70\x6b\xb2\x43\x6c\x67\xcf\x89\xf7\xa1\xbe\xb3\x8e\xa6\x65\x7a\x15\x39\x50\xe5\x59\x73\x60\x1c\x3b\xf3\x47\x05\x27\x0f\x58\xf9\xb9\xbe\x3f\x8c\xa0\xe8\x0f\xb3\x9f\x62\x37\x48\x0a\xb6\xef\xa3\xd4\x9b\x55\x76\x86\x89\x7f\x87\x51\x29\xd3\x03\xfe\xc2\xb3\x02\xcb\x03\x00\x5b\xfe\x31\x03\x90\xc2\x7b\x2f\x48\xfe\x28\x7a\x66\x61\x04\x92\x81\x85\x12\xc6\x88\xc6\xdc\x82\xf0\x06\xb5\x90\xc3\xe3\x53\x70\xba\x62\xca\x01\x3b\x17\xfa\x77\xeb\x2a\x8f\xdb\x57\x6b\x62\x60\x0a\x24\x2c\x20\x84\x78\x09\xac\x54\xea\xbf\xab\xc8\x81\x70\xc8\x22\x21\x65\xa8\x17\xfc\xf8\x16\x1c\x3f\x9f\x7b\xb1\x1f\x8f\x92\xb2\x72\xcb\xc1\xb9\xe8\x5f\x80\x73\xd3\x3f\x12\x14\xc3\x9b\xa1\xbb\xd3\x37\x43\xde\xfa\x5e\xf0\xb7\x82\x84\x70\x99\x3f\xad\xcf\xcd\xcc\x46\x6e\x59\xad\xf8\x55\x45\xf5\xdb\xa7\x30\xf9\x0c\xd5\xb4\x41\x29\xa3\x55\x34\x7b\x44\xc2\x40\x70\x51\x6d\xf7\xd5\xe5\x47\x25\xc4\xf0\xc0\x2e\xba\x8a\x30\x7d\xaa\x23\xcc\x2a\x1d\x01\x3c\xf7\xcc\x75\x30\x97\x71\x5a\xe4\xe1\x67\x4c\x8b\x0e\x21\x11\xa8\xa8\x2c\x1c\xdd\xd9\xbb\x9e\xd0\xa1\x07\x76\xe2\x0c\x74\xa0\x69\x5c\x9d\xb6\x2a\x1d\xcc\x96\x4a\x23\x62\xef\x0f\xbc\x8d\x84\x82\x23\xf0\x11\x75\xfd\xd2\xc3\x9d\xa5\xaf\x67\xee\x32\x86\x15\xa7\xe8\x19\x57\x99\x43\xcc\x57\xe9\xcc\xd9\xf8\x84\xd2\x7c\xb8\x53\xd7\x0b\x16\x5d\xe7\xe9\xcd\x45\x1e\x53\xdc\x68\x2d\x60\xe5\x33\xd9\x28\xe6\x90\xc6\xf5\x41\x60\x19\xfd\xd0\x46\x07\x5c\x1b\xc1\x58\xb3\x99\x06\x3c\xc4\x9b\xd5\x3e\xc7\xc9\x97\xe0\x64\xe5\xac\x4e\xae\x27\xfd\x74\x8e\xbb\x1e\x3e\xe6\x10\x99\x4e\x4e\x2c\x54\x3a\x89\xd5\x78\xcf\xa1\x93\x75\x53\x80\x69\x0a\x63\x19\xf4\x5c\xbc\x3f\xeb\xbb\xf1\xf3\x68\x7c\x61\xb4\x3b\x87\x00\x1d\x45\x42\xce\xfa\x13\xd0\x85\x79\x1a\xa1\x29\xd2\xc0\x78\xf5\xaa\x37\xe0\x75\xef\xc1\x27\x45\x82\xc9\xef\xbe\x9f\x11\xf6\xf3\xa1\xe5\x47\xf5\xcd\x96\xf1\xca\x49\x50\x2b\x9c\xa1\xb8\x1b\xd4\x0a\x06\x7b\x1c\x0b\x18\x0e\xb0\x74\xf5\xb0\xe8\x1f\x82\xcf\x9b\x82\x13\xb7\xaf\xaa\x5c\x55\x83\xa0\x6a\xf0\x4c\x7d\xeb\x67\x7f\xcf\x68\x7a\x96\x20\xca\x08\x0f\xb6\x66\x85\x0b\x3f\xb9\x5f\x44\xa8\xf6\x2d\xb2\xac\x6f\xec\x1e\x0b\xdd\x0d\xa5\x53\x60\xfc\x58\x61\xf1\x68\x82\xce\x52\x48\x50\xec\x20\x9a\x54\xed\x7b\xfd\x90\xda\xf4\x62\x25\xa5\x2c\xd1\xcd\x0a\x3d\x34\x5c\xe4\x48\x94\xfa\x6e\x42\x82\xc8\x01\x07\x24\x7e\x1d\x35\x5c\x45\x65\x0a\x40\xcb\x25\x06\xb0\xc7\x47\xeb\xba\xaa\xff\x16\x2a\x06\xf9\x80\x2a\x1b\xb2\xff\x8a\xc9\x83\x1d\xb9\x94\x72\x2f\xa4\x94\x95\x58\xd7\x51\x43\x07\x37\xdc\xdc\x2f\xe7\x96\x00\x6d\xbb\xf8\x23\x00\x00\xff\xff\xca\x36\x7c\xcd\xe5\x2a\x00\x00")
 
 func templatesAlertgroupHtmlBytes() ([]byte, error) {
 	return bindataRead(
diff --git a/filters/filter_fuzzy.go b/filters/filter_fuzzy.go
index 3a990d6c1..c2d7d19de 100644
--- a/filters/filter_fuzzy.go
+++ b/filters/filter_fuzzy.go
@@ -41,8 +41,8 @@ func (filter *fuzzyFilter) Match(alert *models.Alert, matches int) bool {
 			}
 		}
 
-		if alert.Silenced != "" {
-			if silence := store.Store.GetSilence(alert.Silenced); silence != nil {
+		for _, silenceID := range alert.SilencedBy {
+			if silence := store.Store.GetSilence(silenceID); silence != nil {
 				if filter.Matcher.Compare(silence.Comment, filter.Value) {
 					filter.Hits++
 					return true
diff --git a/filters/filter_inhibited.go b/filters/filter_inhibited.go
index d435db30d..d59fe4d1d 100644
--- a/filters/filter_inhibited.go
+++ b/filters/filter_inhibited.go
@@ -30,7 +30,7 @@ func (filter *inhibitedFilter) init(name string, matcher *matcherT, rawText stri
 
 func (filter *inhibitedFilter) Match(alert *models.Alert, matches int) bool {
 	if filter.IsValid {
-		isMatch := filter.Matcher.Compare(alert.Inhibited, filter.Value)
+		isMatch := filter.Matcher.Compare(alert.IsInhibited(), filter.Value)
 		if isMatch {
 			filter.Hits++
 		}
diff --git a/filters/filter_silence_author.go b/filters/filter_silence_author.go
index 50fcba759..b4e0928cc 100644
--- a/filters/filter_silence_author.go
+++ b/filters/filter_silence_author.go
@@ -15,9 +15,11 @@ type silenceAuthorFilter struct {
 func (filter *silenceAuthorFilter) Match(alert *models.Alert, matches int) bool {
 	if filter.IsValid {
 		var isMatch bool
-		if alert.Silenced != "" {
-			if silence := store.Store.GetSilence(alert.Silenced); silence != nil {
-				isMatch = filter.Matcher.Compare(filter.Value, silence.CreatedBy)
+		if alert.IsSilenced() {
+			for _, silenceID := range alert.SilencedBy {
+				if silence := store.Store.GetSilence(silenceID); silence != nil {
+					isMatch = filter.Matcher.Compare(filter.Value, silence.CreatedBy)
+				}
 			}
 		} else {
 			isMatch = filter.Matcher.Compare("", filter.Value)
@@ -39,16 +41,18 @@ func newSilenceAuthorFilter() FilterT {
 func sinceAuthorAutocomplete(name string, operators []string, alerts []models.Alert) []models.Autocomplete {
 	tokens := map[string]models.Autocomplete{}
 	for _, alert := range alerts {
-		if alert.Silenced != "" {
-			if silence := store.Store.GetSilence(alert.Silenced); silence != nil {
-				for _, operator := range operators {
-					token := fmt.Sprintf("%s%s%s", name, operator, silence.CreatedBy)
-					tokens[token] = makeAC(token, []string{
-						name,
-						strings.TrimPrefix(name, "@"),
-						fmt.Sprintf("%s%s", name, operator),
-						silence.CreatedBy,
-					})
+		if alert.IsSilenced() {
+			for _, silenceID := range alert.SilencedBy {
+				if silence := store.Store.GetSilence(silenceID); silence != nil {
+					for _, operator := range operators {
+						token := fmt.Sprintf("%s%s%s", name, operator, silence.CreatedBy)
+						tokens[token] = makeAC(token, []string{
+							name,
+							strings.TrimPrefix(name, "@"),
+							fmt.Sprintf("%s%s", name, operator),
+							silence.CreatedBy,
+						})
+					}
 				}
 			}
 		}
diff --git a/filters/filter_silence_jira.go b/filters/filter_silence_jira.go
index d21bd1c4d..b76f5b1c5 100644
--- a/filters/filter_silence_jira.go
+++ b/filters/filter_silence_jira.go
@@ -15,9 +15,11 @@ type silenceJiraFilter struct {
 func (filter *silenceJiraFilter) Match(alert *models.Alert, matches int) bool {
 	if filter.IsValid {
 		var isMatch bool
-		if alert.Silenced != "" {
-			if silence := store.Store.GetSilence(alert.Silenced); silence != nil {
-				isMatch = filter.Matcher.Compare(silence.JiraID, filter.Value)
+		if alert.IsSilenced() {
+			for _, silenceID := range alert.SilencedBy {
+				if silence := store.Store.GetSilence(silenceID); silence != nil {
+					isMatch = filter.Matcher.Compare(silence.JiraID, filter.Value)
+				}
 			}
 		} else {
 			isMatch = filter.Matcher.Compare("", filter.Value)
@@ -39,17 +41,19 @@ func newSilenceJiraFilter() FilterT {
 func sinceJiraIDAutocomplete(name string, operators []string, alerts []models.Alert) []models.Autocomplete {
 	tokens := map[string]models.Autocomplete{}
 	for _, alert := range alerts {
-		if alert.Silenced != "" {
-			silence := store.Store.GetSilence(alert.Silenced)
-			if silence != nil && silence.JiraID != "" {
-				for _, operator := range operators {
-					token := fmt.Sprintf("%s%s%s", name, operator, silence.JiraID)
-					tokens[token] = makeAC(token, []string{
-						name,
-						strings.TrimPrefix(name, "@"),
-						fmt.Sprintf("%s%s", name, operator),
-						silence.JiraID,
-					})
+		if alert.IsSilenced() {
+			for _, silenceID := range alert.SilencedBy {
+				silence := store.Store.GetSilence(silenceID)
+				if silence != nil && silence.JiraID != "" {
+					for _, operator := range operators {
+						token := fmt.Sprintf("%s%s%s", name, operator, silence.JiraID)
+						tokens[token] = makeAC(token, []string{
+							name,
+							strings.TrimPrefix(name, "@"),
+							fmt.Sprintf("%s%s", name, operator),
+							silence.JiraID,
+						})
+					}
 				}
 			}
 		}
diff --git a/filters/filter_silenced.go b/filters/filter_silenced.go
index b4b32b073..1a67f0c44 100644
--- a/filters/filter_silenced.go
+++ b/filters/filter_silenced.go
@@ -30,9 +30,7 @@ func (filter *silencedFilter) init(name string, matcher *matcherT, rawText strin
 
 func (filter *silencedFilter) Match(alert *models.Alert, matches int) bool {
 	if filter.IsValid {
-		var isSilenced bool
-		isSilenced = (alert.Silenced != "")
-		isMatch := filter.Matcher.Compare(isSilenced, filter.Value)
+		isMatch := filter.Matcher.Compare(alert.IsSilenced(), filter.Value)
 		if isMatch {
 			filter.Hits++
 		}
diff --git a/filters/filter_test.go b/filters/filter_test.go
index e642962f2..7a96857cf 100644
--- a/filters/filter_test.go
+++ b/filters/filter_test.go
@@ -34,13 +34,13 @@ var tests = []filterTest{
 	filterTest{
 		Expression: "@silenced=true",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "@silenced!=true",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		IsMatch:    false,
 	},
 	filterTest{
@@ -79,19 +79,19 @@ var tests = []filterTest{
 	filterTest{
 		Expression: "@inhibited=true",
 		IsValid:    true,
-		Alert:      models.Alert{Inhibited: true},
+		Alert:      models.Alert{Status: "suppressed", InhibitedBy: []string{"999"}},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "@inhibited=true",
 		IsValid:    true,
-		Alert:      models.Alert{Inhibited: false},
+		Alert:      models.Alert{Status: "active"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@inhibited!=true",
 		IsValid:    true,
-		Alert:      models.Alert{Inhibited: true},
+		Alert:      models.Alert{Status: "suppressed", InhibitedBy: []string{"999"}},
 		IsMatch:    false,
 	},
 	filterTest{
@@ -118,70 +118,70 @@ var tests = []filterTest{
 	filterTest{
 		Expression: "@silence_jira=1",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", JiraID: "1"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "@silence_jira=2",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@silence_jira!=3",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", JiraID: "x"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "@silence_jira!=4",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", JiraID: "4"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@silence_jira!=5",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "@silence_jira=~abc",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", JiraID: "xxabcxx"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "@silence_jira=~abc",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", JiraID: "xxx"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@silence_jira=~",
 		IsValid:    false,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", JiraID: "xxx"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@silence_jira~=",
 		IsValid:    false,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", JiraID: "xxx"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@silence_jira~=1",
 		IsValid:    false,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", JiraID: "xxx"},
 		IsMatch:    false,
 	},
@@ -189,56 +189,56 @@ var tests = []filterTest{
 	filterTest{
 		Expression: "@silence_author=john",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", CreatedBy: "john"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "@silence_author=john",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", CreatedBy: "bob"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@silence_author!=john",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", CreatedBy: "bob"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "@silence_author!=john",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", CreatedBy: "john"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@silence_author!=john",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "@silence_author=~",
 		IsValid:    false,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@silence_author===x",
 		IsValid:    false,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1"},
 		IsMatch:    false,
 	},
 	filterTest{
 		Expression: "@silence_author=!!xxx",
 		IsValid:    false,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1"},
 		IsMatch:    false,
 	},
@@ -404,28 +404,28 @@ var tests = []filterTest{
 	filterTest{
 		Expression: "abc",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", Comment: "abc"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "abc",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", Comment: "abcxxx"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "abc",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", Comment: "ABCD"},
 		IsMatch:    true,
 	},
 	filterTest{
 		Expression: "abc",
 		IsValid:    true,
-		Alert:      models.Alert{Silenced: "1"},
+		Alert:      models.Alert{Status: "suppressed", SilencedBy: []string{"1"}},
 		Silence:    models.Silence{ID: "1", Comment: "xzc"},
 		IsMatch:    false,
 	},
diff --git a/main.go b/main.go
index 145bc4f9d..6dd2cc4c0 100644
--- a/main.go
+++ b/main.go
@@ -45,7 +45,7 @@ var (
 			Name: "unsee_collected_alerts",
 			Help: "Total number of alerts collected from Alertmanager API",
 		},
-		[]string{"silenced", "inhibited"},
+		[]string{"status"},
 	)
 	metricAlertGroups = prometheus.NewGauge(
 		prometheus.GaugeOpts{
diff --git a/mapper/v04/alerts.go b/mapper/v04/alerts.go
index 131f35f25..7eef4ee86 100644
--- a/mapper/v04/alerts.go
+++ b/mapper/v04/alerts.go
@@ -6,6 +6,7 @@ package v04
 
 import (
 	"errors"
+	"strconv"
 	"time"
 
 	"github.com/blang/semver"
@@ -75,16 +76,26 @@ func (m AlertMapper) GetAlerts() ([]models.AlertGroup, error) {
 		alertList := models.AlertList{}
 		for _, b := range g.Blocks {
 			for _, a := range b.Alerts {
+				status := models.AlertStateActive
+				silencedBy := []string{}
+				if a.Silenced > 0 {
+					silencedBy = append(silencedBy, strconv.Itoa(a.Silenced))
+					status = models.AlertStateSuppressed
+				}
+				inhibitedBy := []string{}
+				if a.Inhibited {
+					inhibitedBy = append(inhibitedBy, "0")
+					status = models.AlertStateSuppressed
+				}
 				us := models.Alert{
 					Annotations:  a.Annotations,
 					Labels:       a.Labels,
 					StartsAt:     a.StartsAt,
 					EndsAt:       a.EndsAt,
 					GeneratorURL: a.GeneratorURL,
-					Inhibited:    a.Inhibited,
-				}
-				if a.Silenced > 0 {
-					us.Silenced = string(a.Silenced)
+					Status:       status,
+					InhibitedBy:  inhibitedBy,
+					SilencedBy:   silencedBy,
 				}
 				alertList = append(alertList, us)
 			}
diff --git a/mapper/v04/silences.go b/mapper/v04/silences.go
index 6d8396b96..239b1420e 100644
--- a/mapper/v04/silences.go
+++ b/mapper/v04/silences.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"math"
+	"strconv"
 	"time"
 
 	"github.com/blang/semver"
@@ -77,7 +78,7 @@ func (m SilenceMapper) GetSilences() ([]models.Silence, error) {
 
 	for _, s := range resp.Data.Silences {
 		us := models.Silence{
-			ID:        string(s.ID),
+			ID:        strconv.Itoa(s.ID),
 			Matchers:  s.Matchers,
 			StartsAt:  s.StartsAt,
 			EndsAt:    s.EndsAt,
diff --git a/mapper/v05/alerts.go b/mapper/v05/alerts.go
index fbcad099c..af3ed8c46 100644
--- a/mapper/v05/alerts.go
+++ b/mapper/v05/alerts.go
@@ -73,14 +73,26 @@ func (m AlertMapper) GetAlerts() ([]models.AlertGroup, error) {
 		alertList := models.AlertList{}
 		for _, b := range g.Blocks {
 			for _, a := range b.Alerts {
+				status := models.AlertStateActive
+				silencedBy := []string{}
+				if a.Silenced != "" {
+					silencedBy = append(silencedBy, a.Silenced)
+					status = models.AlertStateSuppressed
+				}
+				inhibitedBy := []string{}
+				if a.Inhibited {
+					inhibitedBy = append(inhibitedBy, "0")
+					status = models.AlertStateSuppressed
+				}
 				us := models.Alert{
 					Annotations:  a.Annotations,
 					Labels:       a.Labels,
 					StartsAt:     a.StartsAt,
 					EndsAt:       a.EndsAt,
 					GeneratorURL: a.GeneratorURL,
-					Inhibited:    a.Inhibited,
-					Silenced:     a.Silenced,
+					Status:       status,
+					InhibitedBy:  inhibitedBy,
+					SilencedBy:   silencedBy,
 				}
 				alertList = append(alertList, us)
 			}
diff --git a/mapper/v061/alerts.go b/mapper/v061/alerts.go
index dad9bbd41..bd88cfa92 100644
--- a/mapper/v061/alerts.go
+++ b/mapper/v061/alerts.go
@@ -75,9 +75,13 @@ func (m AlertMapper) GetAlerts() ([]models.AlertGroup, error) {
 		alertList := models.AlertList{}
 		for _, b := range g.Blocks {
 			for _, a := range b.Alerts {
-				silenceID := ""
-				if len(a.SilencedBy) > 0 {
-					silenceID = a.SilencedBy[0]
+				inhibitedBy := []string{}
+				if a.InhibitedBy != nil {
+					inhibitedBy = a.InhibitedBy
+				}
+				silencedBy := []string{}
+				if a.SilencedBy != nil {
+					silencedBy = a.SilencedBy
 				}
 				us := models.Alert{
 					Annotations:  a.Annotations,
@@ -85,8 +89,9 @@ func (m AlertMapper) GetAlerts() ([]models.AlertGroup, error) {
 					StartsAt:     a.StartsAt,
 					EndsAt:       a.EndsAt,
 					GeneratorURL: a.GeneratorURL,
-					Inhibited:    len(a.InhibitedBy) > 0,
-					Silenced:     silenceID,
+					Status:       a.Status,
+					InhibitedBy:  inhibitedBy,
+					SilencedBy:   silencedBy,
 				}
 				alertList = append(alertList, us)
 			}
diff --git a/models/models.go b/models/models.go
index 1d4f1ff69..8b6570d07 100644
--- a/models/models.go
+++ b/models/models.go
@@ -23,6 +23,23 @@ type Silence struct {
 	JiraURL string `json:"jiraURL"`
 }
 
+// AlertStateUnprocessed means that Alertmanager notify didn't yet process it
+// and AM doesn't know if alert is active or suppressed
+const AlertStateUnprocessed = "unprocessed"
+
+// AlertStateActive is the state in which we know that the alert should fire
+const AlertStateActive = "active"
+
+// AlertStateSuppressed means that we know that alert is silenced or inhibited
+const AlertStateSuppressed = "suppressed"
+
+// AlertStateList exports all alert states so other packages can get this list
+var AlertStateList = []string{
+	AlertStateUnprocessed,
+	AlertStateActive,
+	AlertStateSuppressed,
+}
+
 // Alert is vanilla alert + some additional attributes
 // unsee extends an alert object with:
 // * Links map, it's generated from annotations if annotation value is an url
@@ -35,16 +52,29 @@ type Alert struct {
 	StartsAt     time.Time         `json:"startsAt"`
 	EndsAt       time.Time         `json:"endsAt"`
 	GeneratorURL string            `json:"generatorURL"`
-	Status       string            `json:"Status"`
+	Status       string            `json:"status"`
 	SilencedBy   []string          `json:"silencedBy"`
 	InhibitedBy  []string          `json:"inhibitedBy"`
-	Inhibited    bool              `json:"inhibited"`
-	Silenced     string            `json:"silenced"`
 	// unsee fields
 	Links       map[string]string `json:"links"`
 	Fingerprint string            `json:"-"`
 }
 
+// IsSilenced will return true if alert should be considered silenced
+func (a Alert) IsSilenced() bool {
+	return (a.Status == AlertStateSuppressed && len(a.SilencedBy) > 0)
+}
+
+// IsInhibited will return true if alert should be considered silenced
+func (a Alert) IsInhibited() bool {
+	return (a.Status == AlertStateSuppressed && len(a.InhibitedBy) > 0)
+}
+
+// IsActive will return true if alert is not suppressed in any way
+func (a Alert) IsActive() bool {
+	return (a.Status == AlertStateActive)
+}
+
 // AlertList is flat list of UnseeAlert objects
 type AlertList []Alert
 
diff --git a/timer.go b/timer.go
index 588cbf404..eb9506cfe 100644
--- a/timer.go
+++ b/timer.go
@@ -60,10 +60,9 @@ func PullFromAlertmanager() {
 
 	acMap := map[string]models.Autocomplete{}
 
-	metricAlerts.With(prometheus.Labels{"silenced": "true", "inhibited": "true"}).Set(0)
-	metricAlerts.With(prometheus.Labels{"silenced": "true", "inhibited": "false"}).Set(0)
-	metricAlerts.With(prometheus.Labels{"silenced": "false", "inhibited": "true"}).Set(0)
-	metricAlerts.With(prometheus.Labels{"silenced": "false", "inhibited": "false"}).Set(0)
+	for _, state := range models.AlertStateList {
+		metricAlerts.With(prometheus.Labels{"status": state}).Set(0)
+	}
 
 	for _, ag := range alertGroups {
 		// used to generate group content hash
@@ -100,19 +99,7 @@ func PullFromAlertmanager() {
 		ag.Alerts = []models.Alert{}
 		for _, alert := range alerts {
 			ag.Alerts = append(ag.Alerts, alert)
-			if alert.Silenced != "" {
-				if alert.Inhibited {
-					metricAlerts.With(prometheus.Labels{"silenced": "true", "inhibited": "true"}).Inc()
-				} else {
-					metricAlerts.With(prometheus.Labels{"silenced": "true", "inhibited": "false"}).Inc()
-				}
-			} else {
-				if alert.Inhibited {
-					metricAlerts.With(prometheus.Labels{"silenced": "false", "inhibited": "true"}).Inc()
-				} else {
-					metricAlerts.With(prometheus.Labels{"silenced": "false", "inhibited": "false"}).Inc()
-				}
-			}
+			metricAlerts.With(prometheus.Labels{"status": alert.Status}).Inc()
 		}
 
 		for _, hint := range transform.BuildAutocomplete(ag.Alerts) {
diff --git a/views.go b/views.go
index fe4494b81..d00e66538 100644
--- a/views.go
+++ b/views.go
@@ -162,18 +162,20 @@ func alerts(c *gin.Context) {
 				}
 				io.WriteString(h, string(aj))
 
-				if alert.Silenced != "" {
-					if silence := store.Store.GetSilence(alert.Silenced); silence != nil {
-						silences[alert.Silenced] = *silence
-					}
+				if alert.IsSilenced() {
 					countLabel(counters, "@silenced", "true")
+					for _, silenceID := range alert.SilencedBy {
+						if silence := store.Store.GetSilence(silenceID); silence != nil {
+							silences[silenceID] = *silence
+						}
+					}
 				} else {
 					countLabel(counters, "@silenced", "false")
 				}
 
-				countLabel(counters, "@inhibited", strconv.FormatBool(alert.Inhibited))
+				countLabel(counters, "@inhibited", strconv.FormatBool(alert.IsInhibited()))
 
-				if alert.Silenced == "" && !alert.Inhibited {
+				if alert.IsActive() {
 					agCopy.ActiveCount++
 				}
 

From 72808c00029e142909c934c6817e1e61e7eba5d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Mon, 1 May 2017 20:48:13 +0100
Subject: [PATCH 3/4] Add 0.6.1 mock data

---
 Makefile                          |   2 +-
 alertmanager/alertmanager_test.go |   2 +-
 mock/0.6.1/api/v1/alerts/groups   | 317 ++++++++++++++++++++++++++++++
 mock/0.6.1/api/v1/silences        |  40 ++++
 mock/0.6.1/api/v1/status          |  32 +++
 views_test.go                     |   2 +-
 6 files changed, 392 insertions(+), 3 deletions(-)
 create mode 100644 mock/0.6.1/api/v1/alerts/groups
 create mode 100644 mock/0.6.1/api/v1/silences
 create mode 100644 mock/0.6.1/api/v1/status

diff --git a/Makefile b/Makefile
index cccbd4d34..b8f740e40 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ NAME    := unsee
 VERSION := $(shell git describe --tags --always --dirty='-dev')
 
 # Alertmanager instance used when running locally, points to mock data
-MOCK_PATH        := $(CURDIR)/mock/0.5
+MOCK_PATH        := $(CURDIR)/mock/0.6.1
 ALERTMANAGER_URI := file://$(MOCK_PATH)
 # Listen port when running locally
 PORT := 8080
diff --git a/alertmanager/alertmanager_test.go b/alertmanager/alertmanager_test.go
index 8d385df3e..3bd773515 100644
--- a/alertmanager/alertmanager_test.go
+++ b/alertmanager/alertmanager_test.go
@@ -12,7 +12,7 @@ import (
 	httpmock "gopkg.in/jarcoal/httpmock.v1"
 )
 
-var testVersions = []string{"0.4", "0.5"}
+var testVersions = []string{"0.4", "0.5", "0.6.1"}
 
 func TestGetAlerts(t *testing.T) {
 	log.SetLevel(log.ErrorLevel)
diff --git a/mock/0.6.1/api/v1/alerts/groups b/mock/0.6.1/api/v1/alerts/groups
new file mode 100644
index 000000000..17ed2076d
--- /dev/null
+++ b/mock/0.6.1/api/v1/alerts/groups
@@ -0,0 +1,317 @@
+{
+  "status": "success",
+  "data": [
+    {
+      "labels": {
+        "alertname": "Free_Disk_Space_Too_Low",
+        "cluster": "staging"
+      },
+      "groupKey": "{}:{alertname=\"Free_Disk_Space_Too_Low\", cluster=\"staging\"}",
+      "blocks": [
+        {
+          "routeOpts": {
+            "receiver": "default",
+            "groupBy": [
+              "alertname",
+              "cluster",
+              "service"
+            ],
+            "groupWait": 30000000000,
+            "groupInterval": 300000000000,
+            "repeatInterval": 10800000000000
+          },
+          "alerts": [
+            {
+              "labels": {
+                "alertname": "Free_Disk_Space_Too_Low",
+                "cluster": "staging",
+                "instance": "server5",
+                "job": "node_exporter"
+              },
+              "annotations": {
+                "alert": "Less than 10% disk space is free",
+                "dashboard": "http://localhost/dashboard.html"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "active",
+              "inhibitedBy": [],
+              "silencedBy": []
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "labels": {
+        "alertname": "HTTP_Probe_Failed",
+        "cluster": "dev"
+      },
+      "groupKey": "{}:{alertname=\"HTTP_Probe_Failed\", cluster=\"dev\"}",
+      "blocks": [
+        {
+          "routeOpts": {
+            "receiver": "default",
+            "groupBy": [
+              "alertname",
+              "cluster",
+              "service"
+            ],
+            "groupWait": 30000000000,
+            "groupInterval": 300000000000,
+            "repeatInterval": 10800000000000
+          },
+          "alerts": [
+            {
+              "labels": {
+                "alertname": "HTTP_Probe_Failed",
+                "cluster": "dev",
+                "instance": "web2",
+                "job": "node_exporter"
+              },
+              "annotations": {
+                "summary": "Example summary"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "active",
+              "inhibitedBy": [],
+              "silencedBy": []
+            },
+            {
+              "labels": {
+                "alertname": "HTTP_Probe_Failed",
+                "cluster": "dev",
+                "instance": "web1",
+                "job": "node_exporter"
+              },
+              "annotations": {
+                "help": "Example help annotation",
+                "summary": "Example summary",
+                "url": "http://localhost/example.html"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "suppressed",
+              "inhibitedBy": [],
+              "silencedBy": [
+                "419caf4f-c9d3-4a73-bb78-cfef2bc703e9"
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "labels": {
+        "alertname": "Host_Down"
+      },
+      "groupKey": "{}:{alertname=\"Host_Down\"}",
+      "blocks": [
+        {
+          "routeOpts": {
+            "receiver": "default",
+            "groupBy": [
+              "alertname",
+              "cluster",
+              "service"
+            ],
+            "groupWait": 30000000000,
+            "groupInterval": 300000000000,
+            "repeatInterval": 10800000000000
+          },
+          "alerts": [
+            {
+              "labels": {
+                "alertname": "Host_Down",
+                "cluster": "dev",
+                "instance": "server6",
+                "job": "node_ping"
+              },
+              "annotations": {
+                "summary": "Example summary"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "suppressed",
+              "inhibitedBy": [],
+              "silencedBy": [
+                "337b3ba9-aa95-4562-924b-be95335bafae"
+              ]
+            },
+            {
+              "labels": {
+                "alertname": "Host_Down",
+                "cluster": "dev",
+                "instance": "server7",
+                "job": "node_ping"
+              },
+              "annotations": {
+                "summary": "Example summary"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "suppressed",
+              "inhibitedBy": [],
+              "silencedBy": [
+                "337b3ba9-aa95-4562-924b-be95335bafae"
+              ]
+            },
+            {
+              "labels": {
+                "alertname": "Host_Down",
+                "cluster": "dev",
+                "instance": "server8",
+                "job": "node_ping"
+              },
+              "annotations": {
+                "summary": "Example summary"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "suppressed",
+              "inhibitedBy": [],
+              "silencedBy": [
+                "337b3ba9-aa95-4562-924b-be95335bafae"
+              ]
+            },
+            {
+              "labels": {
+                "alertname": "Host_Down",
+                "cluster": "prod",
+                "instance": "server1",
+                "job": "node_ping"
+              },
+              "annotations": {
+                "summary": "Example summary",
+                "url": "http://localhost/example.html"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "active",
+              "inhibitedBy": [],
+              "silencedBy": []
+            },
+            {
+              "labels": {
+                "alertname": "Host_Down",
+                "cluster": "prod",
+                "instance": "server2",
+                "job": "node_ping"
+              },
+              "annotations": {
+                "summary": "Example summary"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "active",
+              "inhibitedBy": [],
+              "silencedBy": []
+            },
+            {
+              "labels": {
+                "alertname": "Host_Down",
+                "cluster": "staging",
+                "instance": "server4",
+                "job": "node_ping"
+              },
+              "annotations": {
+                "summary": "Example summary"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "active",
+              "inhibitedBy": [],
+              "silencedBy": []
+            },
+            {
+              "labels": {
+                "alertname": "Host_Down",
+                "cluster": "staging",
+                "instance": "server5",
+                "job": "node_ping"
+              },
+              "annotations": {
+                "summary": "Example summary"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "active",
+              "inhibitedBy": [],
+              "silencedBy": []
+            },
+            {
+              "labels": {
+                "alertname": "Host_Down",
+                "cluster": "staging",
+                "instance": "server3",
+                "job": "node_ping"
+              },
+              "annotations": {
+                "summary": "Example summary"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "active",
+              "inhibitedBy": [],
+              "silencedBy": []
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "labels": {
+        "alertname": "Memory_Usage_Too_High",
+        "cluster": "prod"
+      },
+      "groupKey": "{}:{alertname=\"Memory_Usage_Too_High\", cluster=\"prod\"}",
+      "blocks": [
+        {
+          "routeOpts": {
+            "receiver": "default",
+            "groupBy": [
+              "alertname",
+              "cluster",
+              "service"
+            ],
+            "groupWait": 30000000000,
+            "groupInterval": 300000000000,
+            "repeatInterval": 10800000000000
+          },
+          "alerts": [
+            {
+              "labels": {
+                "alertname": "Memory_Usage_Too_High",
+                "cluster": "prod",
+                "instance": "server2",
+                "job": "node_exporter"
+              },
+              "annotations": {
+                "alert": "Memory usage exceeding threshold",
+                "dashboard": "http://localhost/dashboard.html"
+              },
+              "startsAt": "2017-05-01T20:34:21.20891774+01:00",
+              "endsAt": "0001-01-01T00:00:00Z",
+              "generatorURL": "",
+              "Status": "active",
+              "inhibitedBy": [],
+              "silencedBy": []
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/mock/0.6.1/api/v1/silences b/mock/0.6.1/api/v1/silences
new file mode 100644
index 000000000..32b6de44e
--- /dev/null
+++ b/mock/0.6.1/api/v1/silences
@@ -0,0 +1,40 @@
+{
+  "status": "success",
+  "data": [
+    {
+      "id": "419caf4f-c9d3-4a73-bb78-cfef2bc703e9",
+      "matchers": [
+        {
+          "name": "instance",
+          "value": "web1",
+          "isRegex": false
+        }
+      ],
+      "startsAt": "2017-05-01T19:34:21.205359295Z",
+      "endsAt": "2063-01-01T00:00:00Z",
+      "updatedAt": "2017-05-01T19:34:21.205359295Z",
+      "createdBy": "john@example.com",
+      "comment": "Silenced instance"
+    },
+    {
+      "id": "337b3ba9-aa95-4562-924b-be95335bafae",
+      "matchers": [
+        {
+          "name": "alertname",
+          "value": "Host_Down",
+          "isRegex": false
+        },
+        {
+          "name": "cluster",
+          "value": "dev",
+          "isRegex": false
+        }
+      ],
+      "startsAt": "2017-05-01T19:34:21.207248344Z",
+      "endsAt": "2063-01-01T00:00:00Z",
+      "updatedAt": "2017-05-01T19:34:21.207248344Z",
+      "createdBy": "john@example.com",
+      "comment": "Silenced Host_Down alerts in the dev cluster"
+    }
+  ]
+}
diff --git a/mock/0.6.1/api/v1/status b/mock/0.6.1/api/v1/status
new file mode 100644
index 000000000..3c32ceb70
--- /dev/null
+++ b/mock/0.6.1/api/v1/status
@@ -0,0 +1,32 @@
+{
+  "status": "success",
+  "data": {
+    "configJSON": {
+      "global": {},
+      "route": {},
+      "inhibit_rules": [],
+      "receivers": [],
+      "templates": []
+    },
+    "versionInfo": {
+      "branch": "HEAD",
+      "buildDate": "20170501-19:31:12",
+      "buildUser": "lukasz@localhost",
+      "goVersion": "go1.8.1",
+      "revision": "5aeaf2cb988b0094b7998bbe6568bba23a0eb9c2",
+      "version": "0.6.1"
+    },
+    "uptime": "2017-05-01T20:31:38.102687341+01:00",
+    "meshStatus": {
+      "name": "28:d2:44:df:95:eb",
+      "nickName": "localhost",
+      "peers": [
+        {
+          "name": "28:d2:44:df:95:eb",
+          "nickName": "localhost",
+          "uid": 18388267050726621000
+        }
+      ]
+    }
+  }
+}
diff --git a/views_test.go b/views_test.go
index ccf443cdc..9192c99e4 100644
--- a/views_test.go
+++ b/views_test.go
@@ -20,7 +20,7 @@ import (
 	"gopkg.in/jarcoal/httpmock.v1"
 )
 
-var testVersions = []string{"0.4", "0.5"}
+var testVersions = []string{"0.4", "0.5", "0.6.1"}
 
 func mockConfig() {
 	log.SetLevel(log.ErrorLevel)

From b42953e87fdf33adff79aed715e29dc4e787b538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Mon, 1 May 2017 22:13:15 +0100
Subject: [PATCH 4/4] Add validation tests

---
 views_test.go | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/views_test.go b/views_test.go
index 9192c99e4..094752be9 100644
--- a/views_test.go
+++ b/views_test.go
@@ -22,6 +22,15 @@ import (
 
 var testVersions = []string{"0.4", "0.5", "0.6.1"}
 
+func stringInSlice(stringArray []string, value string) bool {
+	for _, s := range stringArray {
+		if s == value {
+			return true
+		}
+	}
+	return false
+}
+
 func mockConfig() {
 	log.SetLevel(log.ErrorLevel)
 	os.Setenv("ALERTMANAGER_URI", "http://localhost")
@@ -150,6 +159,41 @@ func TestAlerts(t *testing.T) {
 				if len(a.Links) != 1 {
 					t.Errorf("Invalid number of links, got %d, expected 1, %v", len(a.Links), a)
 				}
+				if a.InhibitedBy == nil {
+					t.Errorf("InhibitedBy is nil, %v", a)
+				}
+				if a.SilencedBy == nil {
+					t.Errorf("SilencedBy is nil, %v", a)
+				}
+			}
+		}
+	}
+}
+
+func TestValidateAllAlerts(t *testing.T) {
+	mockConfig()
+	for _, version := range testVersions {
+		mockAlerts(version)
+		r := ginTestEngine()
+		req, _ := http.NewRequest("GET", "/alerts.json?q=alertname=HTTP_Probe_Failed,instance=web1", nil)
+		resp := httptest.NewRecorder()
+		r.ServeHTTP(resp, req)
+		if resp.Code != http.StatusOK {
+			t.Errorf("GET /alerts.json returned status %d", resp.Code)
+		}
+		ur := models.AlertsResponse{}
+		json.Unmarshal(resp.Body.Bytes(), &ur)
+		for _, ag := range ur.AlertGroups {
+			for _, a := range ag.Alerts {
+				if !stringInSlice(models.AlertStateList, a.Status) {
+					t.Errorf("Invalid alert status '%s', not in %v", a.Status, models.AlertStateList)
+				}
+				if a.InhibitedBy == nil {
+					t.Errorf("InhibitedBy is nil, %v", a)
+				}
+				if a.SilencedBy == nil {
+					t.Errorf("SilencedBy is nil, %v", a)
+				}
 			}
 		}
 	}