Merge branch 'xaviertorras-master'

* xaviertorras-master: Get Alerts UnArchived Conflicts: README.md
saschaludwig · Jun 22, 2014 · 773f5fc · 773f5fc
2 parents 162e031 + 9f4a800
commit 773f5fc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -130,11 +130,16 @@ connection is of bad quality to force a rescan.
 
 Return a list of Alerts.
 
+### `get_alerts_unarchived(self)`
+
+Return a list of unarchived Alerts.
+
 ### `get_events(self)`
 
 Return a list of Events.
 
 ### `get_aps(self)`
+
 Return a list of all AP:s, with significant information about each.
 
 ### `get_clients(self)`

diff --git a/unifi/controller.py b/unifi/controller.py
@@ -103,6 +103,13 @@ def get_alerts(self):
         """Return a list of all Alerts."""
 
         return self._read(self.api_url + 'list/alarm')
+
+    def get_alerts_unarchived(self):
+        """Return a list of Alerts unarchived."""
+
+        js = json.dumps({'_sort': '-time', 'archived':False})
+        params = urllib.urlencode({'json': js})
+        return self._read(self.api_url + 'list/alarm', params)
 
     def get_events(self):
         """Return a list of all Events."""