More work and refactor

Author: gianlucaborello

.travis.yml

@@ -14,11 +14,13 @@ script:
 - examples/get_data_datasource.py XXX
 - examples/get_data_simple.py XXX
 - examples/list_alerts.py XXX
+- examples/list_alert_notifications.py XXX
 - examples/list_dashboards.py XXX
 - examples/list_hosts.py XXX
 - examples/list_metrics.py XXX
 - examples/post_event.py XXX "test event name" "test event description"
 - examples/list_events.py XXX
+- examples/delete_event.py XXX
 - examples/print_data_retention_info.py XXX
 - examples/print_explore_grouping.py XXX
 - examples/print_user_info.py XXX
@@ -33,11 +35,13 @@ script:
 - examples/get_data_datasource.py XXX
 - examples/get_data_simple.py XXX
 - examples/list_alerts.py XXX
+- examples/list_alert_notifications.py XXX
 - examples/list_dashboards.py XXX
 - examples/list_hosts.py XXX
 - examples/list_metrics.py XXX
 - examples/post_event.py XXX "test event name" "test event description"
 - examples/list_events.py XXX
+- examples/delete_event.py XXX
 - examples/print_data_retention_info.py XXX
 - examples/print_explore_grouping.py XXX
 - examples/print_user_info.py XXX

README.md

@@ -97,19 +97,25 @@ A dictionary showing the details of the new dashboard.
 **Example**  
 [examples/create_dashboard.py](examples/create_dashboard.py).  
 
-#### `delete_alert(self, name)`  
+#### `delete_alert(self, alert)`  
 **Description**  
-Deletes an alert given its name.  
+Deletes an alert.  
+**Arguments**  
+- **alert**: the alert object as returned by `get_alerts()`.
+
 **Success Return Value**  
 A string with the number of alerts deleted.  
 **Example**  
 [examples/delete_alert.py](examples/delete_alert.py).  
 
-#### `delete_dashboard(self, dashname)`  
+#### `delete_dashboard(self, dashboard)`  
 **Description**  
-Deletes a dashboard given its name.  
+Deletes a dashboard.  
+**Arguments**  
+- **dashboard**: the dashboard object as returned by `get_dashboards()`.
+
 **Success Return Value**  
-A string with the number of dashboards deleted.  
+`None`.  
 **Example**  
 [examples/delete_dashboard.py](examples/delete_dashboard.py).  
 
@@ -216,7 +222,7 @@ You can use this method you use to send an event to Sysdig Cloud. The events you
 **Arguments**  
 - **name**: the name of the new event.  
 - **description**: a longer description offering detailed information about the event.
-- **severity**: the UTC time (in seconds) of the end of the data window, or 0 to indicate "now". A negative value can also be optionally used to indicate a relative time in the past from now. For example, -3600 means "one hour ago".
+- **severity**: severity, syslog style (from 0 to 7).
 - **host**: the host generating the event. Can be used for filtering/segmenting purposes in Sysdig Cloud.
 - **tags**: a list of key-value dictionaries that can be used to tag the event. Can be used for filtering/segmenting purposes in Sysdig Cloud.
 

examples/delete_alert.py

@@ -23,7 +23,15 @@
 #
 sdclient = SdcClient(sdc_token)
 
-res = sdclient.delete_alert("tomcat cpu > 80% on any host")
-print res[1]
+res = sdclient.get_alerts()
 if not res[0]:
+    print res[1]
     sys.exit(1)
+
+for alert in res[1]['alerts']:
+    if alert['name'] == "tomcat cpu > 80% on any host":
+        print "Deleting alert"
+        res = sdclient.delete_alert(alert)
+        if not res[0]:
+            print res[1]
+            sys.exit(1)

examples/delete_dashboard.py

@@ -23,12 +23,21 @@
 #
 sdclient = SdcClient(sdc_token)
 
-res = sdclient.delete_dashboard("API test - cassandra in prod")
-print res[1]
+#
+# List the dashboards
+#
+res = sdclient.get_dashboards()
 if not res[0]:
+    print res[1]
     sys.exit(1)
 
-res = sdclient.delete_dashboard("API test - cassandra in dev")
-print res[1]
-if not res[0]:
-    sys.exit(1)
+#
+# Delete all the dashboards containing "API test"
+#
+for dashboard in res[1]['dashboards']:
+    if 'API test' in dashboard['name']:
+        print "Deleting " + dashboard['name']
+        res = sdclient.delete_dashboard(dashboard)
+        if not res[0]:
+            print res[1]
+            sys.exit(1)

examples/list_alert_notifications.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+#
+# Get alert notifications from Sysdig Cloud
+#
+
+import os
+import sys
+import time
+sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), '..'))
+from sdcclient import SdcClient
+
+#
+# Parse arguments
+#
+if len(sys.argv) != 2:
+    print 'usage: %s <sysdig-token>' % sys.argv[0]
+    print 'You can find your token at https://app.sysdigcloud.com/#/settings/user'
+    sys.exit(1)
+
+sdc_token = sys.argv[1]
+
+#
+# Instantiate the SDC client
+#
+sdclient = SdcClient(sdc_token)
+
+#
+# Get the notifications in the last day
+#
+res = sdclient.get_notifications(from_ts=int(time.time()-86400), to_ts=int(time.time()))
+
+print res[1]
+if not res[0]:
+	sys.exit(1)
+
+#
+# Get the notifications in the active state
+#
+res = sdclient.get_notifications(from_ts=int(time.time()-86400), to_ts=int(time.time()), state='ACTIVE')
+
+print res[1]
+if not res[0]:
+	sys.exit(1)
+
+#
+# Get the notifications in the active state
+#
+res = sdclient.get_notifications(from_ts=int(time.time()-86400), to_ts=int(time.time()), state='OK')
+
+print res[1]
+if not res[0]:
+	sys.exit(1)
+
+#
+# Get the resolved notifications
+#
+res = sdclient.get_notifications(from_ts=int(time.time()-86400), to_ts=int(time.time()), resolved=True)
+
+print res[1]
+if not res[0]:
+	sys.exit(1)

examples/list_dashboards.py

@@ -29,7 +29,7 @@
 res = sdclient.get_dashboards()
 
 #
-# Show the list of alerts
+# Show the list of dashboards
 #
 if res[0]:
     data = res[1]

sdcclient/_client.py

@@ -55,6 +55,26 @@ def get_alerts(self):
             return [False, self.lasterr]
         return [True, r.json()]
 
+    def get_notifications(self, from_ts, to_ts, state=None, resolved=None):
+        params = {}
+
+        if from_ts is not None:
+            params['from'] = from_ts * 1000000
+
+        if to_ts is not None:
+            params['to'] = to_ts * 1000000
+
+        if state is not None:
+            params['state'] = state
+
+        if resolved is not None:
+            params['resolved'] = resolved
+
+        r = requests.get(self.url + '/api/notifications', headers=self.hdrs, params=params)
+        if not self.__checkResponse(r):
+            return [False, self.lasterr]
+        return [True, r.json()]
+
     def create_alert(self, name, description, severity, for_atleast_s, condition, segmentby=[],
                      segment_condition='ANY', filter='', notify='', enabled=True, annotations={}):
         #
@@ -107,25 +127,15 @@ def create_alert(self, name, description, severity, for_atleast_s, condition, se
             return [False, self.lasterr]
         return [True, r.json()]
 
-    def delete_alert(self, name):
-        r = requests.get(self.url + '/api/alerts', headers=self.hdrs)
+    def delete_alert(self, alert):
+        if 'id' not in alert:
+            return [False, "Invalid alert format"]
+
+        r = requests.delete(self.url + '/api/alerts/' + str(alert['id']), headers=self.hdrs)
         if not self.__checkResponse(r):
             return [False, self.lasterr]
-        j = r.json()
-
-        deleted = 0
 
-        for db in j['alerts']:
-            if 'name' in db:
-                if db['name'] == name:
-                    r = requests.delete(self.url + '/api/alerts/' + str(db['id']), headers=self.hdrs)
-                    if not self.__checkResponse(r):
-                        return [False, self.lasterr]
-                    deleted += 1
-
-        if deleted == 0:
-            return [False, "alert not found"]
-        return [True, "alerts deleted: " + str(deleted)]
+        return [True, None]
 
     def get_notification_settings(self):
         r = requests.get(self.url + '/api/settings/notifications', headers=self.hdrs)
@@ -468,34 +478,16 @@ def create_dashboard_from_file(self, newdashname, filename, scope):
         #
         self.create_dashboard_from_template(newdashname, dboard, scope)
 
-    def delete_dashboard(self, dashname):
-        r = requests.get(self.url + '/ui/dashboards', headers=self.hdrs)
+    def delete_dashboard(self, dashboard):
+        if 'id' not in dashboard:
+            return [False, "Invalid dashboard format"]
+
+        r = requests.delete(self.url + '/ui/dashboards/' + str(dashboard['id']), headers=self.hdrs)
         if not self.__checkResponse(r):
             return [False, self.lasterr]
 
-        j = r.json()
-
-        deleted = 0
+        return [True, None]
 
-        for db in j['dashboards']:
-            if db['name'] == dashname:
-                r = requests.delete(self.url + '/ui/dashboards/' + str(db['id']), headers=self.hdrs)
-                if not self.__checkResponse(r):
-                    return [False, self.lasterr]
-                deleted += 1
-
-        if deleted == 0:
-            return [False, "dashboard not found"]
-        return [True, "dashboards deleted: " + str(deleted)]
-
-    '''
-        Annotations format:
-
-          "annotations": {
-          "key1": "value1",
-          "key2": "value2",
-          "key3": "value3"}
-    '''
     def post_event(self, name, description=None, severity=6, host=None, tags=None):
         edata = {
             'event': {