moira-python-client 4.1.4__tar.gz → 4.2.1__tar.gz

{moira-python-client-4.1.4 → moira_python_client-4.2.1}/CHANGELOG.md

@@ -1,8 +1,18 @@
+# 4.2.1
+
+Add support for name field in contacts
+
+# 4.2.0
+
+Add support for multiple clusters in trigger creation
+
+Now you can use `cluster_id` field in api to set non-default cluster for remote triggers. List of available clusters can be seen in api at `https://your-moira-url/api/config`
+
 # 4.1.0
 
 Add support for prometheus trigger creation.
 
-Now you canuse `trigger_source` field in api that overrides `is_remote` field
+Now you can use `trigger_source` field in api that overrides `is_remote` field
 
 # 4.0.2
 

{moira-python-client-4.1.4/moira_python_client.egg-info → moira_python_client-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moira-python-client
-Version: 4.1.4
+Version: 4.2.1
 Summary: Client for Moira - Alerting system based on Graphite data
 Home-page: https://github.com/moira-alert/python-moira-client
 Author: Alexander Lukyanchenko

moira_python_client-4.2.1/VERSION.txt

@@ -0,0 +1 @@
+4.2.1

{moira-python-client-4.1.4 → moira_python_client-4.2.1}/moira_client/client.py

@@ -21,6 +21,14 @@ class InvalidJSONError(Exception):
         """
         self.content = content
 
+class MoiraApiError(Exception):
+    def __init__(self, body):
+        """
+
+        :param body: response body
+        """
+        self.body = body
+
 
 class Client:
     def __init__(self, api_url, auth_custom=None, auth_user=None, auth_pass=None, login=None):
@@ -64,7 +72,12 @@ class Client:
         :raises: InvalidJSONError
         """
         r = requests.get(self._path_join(path), headers=self.headers, auth=self.auth, **kwargs)
-        r.raise_for_status()
+        
+        try:
+            r.raise_for_status()
+        except requests.exceptions.HTTPError as err:
+            raise MoiraApiError(r.content)
+
         try:
             return r.json()
         except ValueError:
@@ -81,7 +94,12 @@ class Client:
         :raises: InvalidJSONError
         """
         r = requests.delete(self._path_join(path), headers=self.headers, auth=self.auth, **kwargs)
-        r.raise_for_status()
+        
+        try:
+            r.raise_for_status()
+        except requests.exceptions.HTTPError as err:
+            raise MoiraApiError(r.content)
+
         try:
             return r.json()
         except ValueError:
@@ -98,7 +116,12 @@ class Client:
         :raises: InvalidJSONError
         """
         r = requests.put(self._path_join(path), headers=self.headers, auth=self.auth, **kwargs)
-        r.raise_for_status()
+
+        try:
+            r.raise_for_status()
+        except requests.exceptions.HTTPError as err:
+            raise MoiraApiError(r.content)
+
         try:
             return r.json()
         except ValueError:
@@ -115,7 +138,12 @@ class Client:
         :raises: InvalidJSONError
         """
         r = requests.post(self._path_join(path), headers=self.headers, auth=self.auth, **kwargs)
-        r.raise_for_status()
+        
+        try:
+            r.raise_for_status()
+        except requests.exceptions.HTTPError as err:
+            raise MoiraApiError(r.content)
+
         try:
             return r.json()
         except ValueError:

{moira-python-client-4.1.4 → moira_python_client-4.2.1}/moira_client/models/contact.py

@@ -21,6 +21,7 @@ class Contact(Base):
         self.type = type
         self.value = value
         self.user = kwargs.get('user', None)
+        self.name = kwargs.get('name', None)
         self._id = kwargs.get('id', None)
 
 
@@ -28,26 +29,34 @@ class ContactManager:
     def __init__(self, client):
         self._client = client
 
-    def add(self, value, contact_type):
+    def add(self, value, contact_type, name=None):
         """
         Add new contact
 
         :param value: str contact value
         :param contact_type: str contact type (one of CONTACT_* constants)
+        :param name: str contact name
         :return: Contact
 
         :raises: ResponseStructureError
         """
-        data = {
-            'value': value,
-            'type': contact_type
-        }
 
         contacts = self.fetch_by_current_user()
         for contact in contacts:
             if contact.value == value and contact.type == contact_type:
+                if name and contact.name != name:
+                    contact.name = name
+                    self.update(contact)
+                    return contact
                 return contact
 
+        data = {
+            'value': value,
+            'type': contact_type
+        }
+        if name:
+            data['name'] = name
+
         result = self._client.put(self._full_path(), json=data)
         if 'id' not in result:
             raise ResponseStructureError('No id in response', result)
@@ -135,6 +144,8 @@ class ContactManager:
             'type': contact.type,
             'value': contact.value,
         }
+        if contact.name:
+            data['name'] = contact.name
 
         try:
             self._client.put(self._full_path(contact.id), json=data)

{moira-python-client-4.1.4 → moira_python_client-4.2.1}/moira_client/models/trigger.py

@@ -37,6 +37,7 @@ class Trigger(Base):
             mute_new_metrics=False,
             alone_metrics=None,
             trigger_source=None,
+            cluster_id=None,
             **kwargs):
         """
 
@@ -57,6 +58,7 @@ class Trigger(Base):
         :param alone_metrics: dict with targets of alone metrics
         :param kwargs: additional parameters
         :param trigger_source: str specify trigger source, overrides is_remote 
+        :param cluster_id: str specify cluster id 
         """
         self._client = client
 
@@ -75,6 +77,7 @@ class Trigger(Base):
 
         self.is_remote = is_remote
         self.trigger_source = trigger_source
+        self.cluster_id = cluster_id
         self.mute_new_metrics = mute_new_metrics
         self.alone_metrics = alone_metrics
 
@@ -153,6 +156,8 @@ class Trigger(Base):
 
         if self.trigger_source:
             data['trigger_source'] = self.trigger_source
+        if self.cluster_id:
+            data['cluster_id'] = self.cluster_id
 
         if trigger_id:
             data['id'] = trigger_id
@@ -529,6 +534,7 @@ class TriggerManager:
             mute_new_metrics=False,
             alone_metrics=None,
             trigger_source=None,
+            cluster_id=None,
             **kwargs
     ):
         """
@@ -549,6 +555,7 @@ class TriggerManager:
         :param alone_metrics: dict with targets of alone metrics
         :param kwargs: additional trigger params
         :param trigger_source: str specify trigger source, overrides is_remote 
+        :param cluster_id: str specify cluster id 
         :return: Trigger
         """
         return Trigger(
@@ -568,6 +575,7 @@ class TriggerManager:
             mute_new_metrics=mute_new_metrics,
             alone_metrics=alone_metrics,
             trigger_source=trigger_source,
+            cluster_id=cluster_id,
             **kwargs
         )
 

{moira-python-client-4.1.4 → moira_python_client-4.2.1/moira_python_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moira-python-client
-Version: 4.1.4
+Version: 4.2.1
 Summary: Client for Moira - Alerting system based on Graphite data
 Home-page: https://github.com/moira-alert/python-moira-client
 Author: Alexander Lukyanchenko

moira-python-client-4.1.4/VERSION.txt

@@ -1 +0,0 @@
-4.1.4