Fix auto-unshelve by housekeeping (alerta#988)

satterly · web-flow · commit 4fa09ba23e92 · 2019-06-03T20:37:41.000+02:00
diff --git a/alerta/database/backends/mongodb/base.py b/alerta/database/backends/mongodb/base.py
@@ -1592,7 +1592,7 @@ def housekeeping(self, expired_threshold, info_threshold):
             {'$match': {'status': 'shelved'}},
             {'$unwind': '$history'},
             {'$match': {
-                'history.type': 'action',
+                'history.type': 'shelve',
                 'history.status': 'shelved'
             }},
             {'$sort': {'history.updateTime': -1}},
diff --git a/alerta/database/backends/postgres/base.py b/alerta/database/backends/postgres/base.py
@@ -1252,7 +1252,7 @@ def housekeeping(self, expired_threshold, info_threshold):
             SELECT DISTINCT ON (a.id) a.id, a.event, a.last_receive_id, h.update_time, a.timeout
               FROM alerts a, UNNEST(history) h
              WHERE a.status='shelved'
-               AND h.type='action'
+               AND h.type='shelve'
                AND h.status='shelved'
           ORDER BY a.id, h.update_time DESC
         )

Original file line number	Diff line number	Diff line change
`@@ -1252,7 +1252,7 @@ def housekeeping(self, expired_threshold, info_threshold):`
`1252`	`1252`	`SELECT DISTINCT ON (a.id) a.id, a.event, a.last_receive_id, h.update_time, a.timeout`
`1253`	`1253`	`FROM alerts a, UNNEST(history) h`
`1254`	`1254`	`WHERE a.status='shelved'`
`1255`		`- AND h.type='action'`
	`1255`	`+ AND h.type='shelve'`
`1256`	`1256`	`AND h.status='shelved'`
`1257`	`1257`	`ORDER BY a.id, h.update_time DESC`
`1258`	`1258`	`)`