Merge pull request #39 from swenske/master

Author: jpavlav

alertmanager/alertmanager.py

@@ -21,9 +21,6 @@ class AlertManager(object):
 
     """
 
-    SUCCESS_STATUSES = ['success']
-    ERROR_STATUSES = ['error']
-
     def __init__(self, host, port=9093, req_obj=None):
         """
         Init method.
@@ -72,8 +69,7 @@ def _check_response(self, req):
 
         This is a protected method that should only be used by methods making
         API calls. The intention is to check out responses for a successful
-        HTTP status code along with a successful return from the Alert Manager
-        API.
+        HTTP status code from the Alert Manager API.
 
         Parameters
         ----------
@@ -89,21 +85,13 @@ def _check_response(self, req):
 
         Raises
         ------
-        ValueError
-            Raise a value error if the 'status' key of our response is in
-            our list of error statuses from Alert Manager.
         HTTPError
             Raise an http error if our response objects status_code attribute
             is not in requests.codes.ok (basically not a 200).
 
         """
-        if (req.status_code == requests.codes.ok
-                and req.json()['status'] in self.SUCCESS_STATUSES):
-            return True
-        elif (req.status_code == requests.codes.ok
-                and req.json()['status'] in self.ERROR_STATUSES):
-            raise ValueError('{} ==> {}'.format(req.json()['errorType'],
-                                                req.json()['error']))
+        if req.status_code == requests.codes.ok:
+            return True        
         else:
             raise HTTPError('{} ==> {}'.format(req.status_code, req.text))
 
@@ -161,13 +149,13 @@ def get_alerts(self, **kwargs):
             Return a list of Alert objects from our Alert Manager instance.
 
         """
-        route = "/api/v1/alerts"
+        route = "/api/v2/alerts"
         self._validate_get_alert_kwargs(**kwargs)
         if kwargs.get('filter'):
             kwargs['filter'] = self._handle_filters(kwargs['filter'])
         r = self._make_request("GET", route, params=kwargs)
         if self._check_response(r):
-            return [Alert(alert) for alert in r.json()['data']]
+            return [Alert(alert) for alert in r.json()]
 
     def _validate_get_alert_kwargs(self, **kwargs):
         """
@@ -287,10 +275,10 @@ def post_alerts(self, *alert):
             else:
                 converted = Alert.from_dict(obj)
                 payload.append(converted.validate_and_dump())
-        route = "/api/v1/alerts"
+        route = "/api/v2/alerts"
         r = self._make_request("POST", route, json=payload)
         if self._check_response(r):
-            return Alert.from_dict(r.json())
+            return Alert.from_dict({'status': [r.status_code]})
 
     def get_status(self):
         """
@@ -305,7 +293,7 @@ def get_status(self):
             Return the response from Alert Manager as an Alert object.
 
         """
-        route = "/api/v1/status"
+        route = "/api/v2/status"
         r = self._make_request("GET", route)
         if self._check_response(r):
             return Alert.from_dict(r.json())
@@ -327,7 +315,7 @@ def get_receivers(self):
             Return the response from Alert Manager as an Alert object.
 
         """
-        route = "/api/v1/receivers"
+        route = "/api/v2/receivers"
         r = self._make_request("GET", route)
         if self._check_response(r):
             return Alert.from_dict(r.json())
@@ -344,10 +332,10 @@ def get_alert_groups(self):
             Return the response from Alert Manager as an Alert object.
 
         """
-        route = "/api/v1/alerts/groups"
+        route = "/api/v2/alerts/groups"
         r = self._make_request("GET", route)
         if self._check_response(r):
-            return Alert.from_dict(r.json())
+            return [Alert(group) for group in r.json()]
 
     def get_silence(self, id=None):
         """
@@ -370,12 +358,13 @@ def get_silence(self, id=None):
             case a list of silences.
 
         """
-        route = "/api/v1/silences"
+        route = "/api/v2/silences"
         if id:
+            route = "/api/v2/silence/"
             route = urljoin(route, id)
         r = self._make_request("GET", route)
         if self._check_response(r):
-            return Alert.from_dict(r.json())
+            return [Alert(silence) for silence in r.json()]
 
     def get_silences(self, **kwargs):
         """
@@ -398,13 +387,13 @@ def get_silences(self, **kwargs):
             Return a list of Silence objects from our Alert Manager instance.
 
         """
-        route = "/api/v1/silences"
+        route = "/api/v2/silences"
         self._validate_get_silence_kwargs(**kwargs)
         if kwargs.get('filter'):
             kwargs['filter'] = self._handle_filters(kwargs['filter'])
         r = self._make_request("GET", route, params=kwargs)
         if self._check_response(r):
-            return [Alert(alert) for alert in r.json()['data']]
+            return [Alert(alert) for alert in r.json()]
 
     def post_silence(self, silence):
         """
@@ -440,7 +429,7 @@ def post_silence(self, silence):
         else:
             silence = Silence.from_dict(silence)
             silence = silence.validate_and_dump()
-        route = "/api/v1/silences"
+        route = "/api/v2/silences"
         r = self._make_request("POST", route, json=silence)
         if self._check_response(r):
             return Alert.from_dict(r.json())
@@ -464,8 +453,8 @@ def delete_silence(self, silence_id):
             Return the response from Alert Manager as an Alert object.
 
         """
-        route = "/api/v1/silence/"
+        route = "/api/v2/silence/"
         route = urljoin(route, silence_id)
         r = self._make_request("DELETE", route)
         if self._check_response(r):
-            return Alert.from_dict(r.json())
+            return Alert.from_dict({'status': [r.status_code]})

tests/alertmanager_test.py

@@ -32,34 +32,35 @@ def test_get_silences(self):
 
     def test_post_alerts(self):
         result = self.a_manager.post_alerts(self.alert)
-        self.assertIn('success', result.status)
+        self.assertIn(200, result.status)
 
     def test_get_status(self):
         result = self.a_manager.get_status()
-        self.assertIn('success', result.status)
+        self.assertIn('ready', result.cluster.status)
 
     def test_get_receivers(self):
         result = self.a_manager.get_status()
-        self.assertIn('success', result.status)
+        self.assertIn('ready', result.cluster.status)
 
     def test_get_alert_groups(self):
         result = self.a_manager.get_alert_groups()
-        self.assertIn('success', result.status)
+        self.assertTrue(result)
 
     def test_get_silence(self):
         result = self.a_manager.get_silence()
-        self.assertIn('success', result.status)
+        self.assertTrue(result)
 
     def test_post_silence(self):
         result = self.a_manager.post_silence(self.silence)
-        self.assertIn('success', result.status)
+        print(result)
+        self.assertTrue(result)
 
     def test_delete_silence(self):
         self.a_manager.post_silence(self.silence)
         time.sleep(2)
         silences = self.a_manager.get_silence()
-        for silence in silences['data']:
+        for silence in silences:
             if silence['status']['state'] == 'active':
                 silence_id = silence['id']
         result = self.a_manager.delete_silence(silence_id)
-        self.assertIn('success', result.status)
+        self.assertIn(200, result.status)

tests/data.py

@@ -1,3 +1,10 @@
+from datetime import datetime
+import time
+
+def am_fmt(ts):
+    """ format time to AM format """
+    return datetime.utcfromtimestamp(ts).strftime('%Y-%m-%dT%H:%M:%S.%fZ')
+
 TEST_ADD_MATCHER_DATA = {
     'matchers': [{'name': 'alertname', 'value': 'alert1', 'isRegex': False}],
     'endsAt': 'some_date_string'
@@ -41,5 +48,9 @@
 }
 
 TEST_SILENCE_POST_DATA = {
-    'matchers': [{'name': 'alertname', 'value': 'alert1', 'isRegex': False}]
+    "matchers": [{'name': 'alertname', 'value': 'alert1', 'isRegex': False}],
+    "startsAt": am_fmt(int(time.time())),
+    "endsAt": am_fmt(int(time.time()) + (60 * 60)),
+    "createdBy": "pytest",
+    "comment": "pytest"
 }