Merge branch 'develop'

Author: TheConnMan

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.4
+current_version = 0.3.0
 commit = False
 tag = False
 files = setup.py netuitive/__init__.py

Dockerfile

@@ -13,6 +13,7 @@ RUN pip install -r /opt/app/test_requirements.txt
 
 ADD . /opt/app/
 
+RUN flake8 netuitive
 RUN python setup.py test
 RUN python setup.py install
 

example/example.py

@@ -14,7 +14,7 @@
 MyElement.add_tag('Production', 'True')
 MyElement.add_tag('app_tier', 'True')
 
-timestamp = int(time.mktime(time.gmtime()))
+timestamp = int(time.mktime(time.localtime()))
 MyElement.add_sample('app.error', timestamp, 1, host='appserver01')
 MyElement.add_sample('app.request', timestamp, 10, host='appserver01')
 
@@ -26,5 +26,9 @@
 
 ApiClient.post_event(MyEvent)
 
+MyCheck = netuitive.Check('heartbeat', 'element', 60)
+
+ApiClient.post_check(MyCheck)
+
 if ApiClient.time_insync():
     print('we have time sync with the server')

netuitive/__init__.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 
 __author__ = 'Netuitive, Inc'
-__version__ = '0.2.4'
+__version__ = '0.3.0'
 
 from .client import Client  # nopep8 # flake8: noqa
 from .element import Element  # nopep8 # flake8: noqa
 from .event import Event  # nopep8 # flake8: noqa
+from .check import Check  # nopep8 # flake8: noqa
 from .util import to_ms_timestamp  # nopep8 # flake8: noqa

netuitive/check.py

@@ -0,0 +1,21 @@
+
+class Check(object):
+
+    """
+        A Check model
+        :param name: Check name
+        :type name: string
+        :param elementId: Associated Element ID
+        :type elementId: string
+        :param interval: Check interval in seconds
+        :type interval: int
+    """
+
+    def __init__(self,
+                 name,
+                 elementId,
+                 interval):
+
+        self.name = name
+        self.elementId = elementId
+        self.interval = interval

netuitive/client.py

@@ -41,6 +41,8 @@ def __init__(self, url='https://api.app.netuitive.com/ingest',
         self.timeurl = '{uri.scheme}://{uri.netloc}/time'.format(
             uri=urlparse(url))
         self.eventurl = self.dataurl.replace('/ingest/', '/ingest/events/', 1)
+        self.checkurl = self.dataurl.replace('/ingest/', '/check/', 1) \
+            .replace('/infrastructure', '', 1)
         self.agent = agent
         self.disabled = False
         self.kill_codes = [410, 418]
@@ -149,6 +151,48 @@ def post_event(self, event):
                 'error posting payload to api ingest endpoint (%s): %s',
                 self.eventurl, e)
 
+    def post_check(self, check):
+        """
+            :param check: Check to post to Metricly
+            :type check: object
+        """
+
+        if self.disabled is True:
+            logging.error('Posting has been disabled. '
+                          'See previous errors for details.')
+            return(False)
+
+        url = self.checkurl + '/' \
+            + check.name + '/' \
+            + check.elementId + '/' \
+            + str(check.interval)
+        try:
+            headers = {'User-Agent': self.agent}
+            request = urllib2.Request(
+                url, data='', headers=headers)
+            resp = urllib2.urlopen(request)
+            logging.debug("Response code: %d", resp.getcode())
+            resp.close()
+
+            return(True)
+
+        except urllib2.HTTPError as e:
+            logging.debug("Response code: %d", e.code)
+
+            if e.code in self.kill_codes:
+                self.disabled = True
+                logging.exception('Posting has been disabled.'
+                                  'See previous errors for details.')
+            else:
+                logging.exception(
+                    'error posting payload to api ingest endpoint (%s): %s',
+                    url, e)
+
+        except Exception as e:
+            logging.exception(
+                'error posting payload to api ingest endpoint (%s): %s',
+                url, e)
+
     def check_time_offset(self, epoch=None):
         req = urllib2.Request(self.timeurl,
                               headers={'User-Agent': self.agent})

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='netuitive',
-    version='0.2.4',
+    version='0.3.0',
     description="Python Client for Netuitive Cloud",
     long_description=readme + '\n\n' + history,
     author="Netuitive",

tests/test_netuitive.py

@@ -509,5 +509,20 @@ def tearDown(self):
         pass
 
 
+class TestCheck(unittest.TestCase):
+
+    def setUp(self):
+        self.check = netuitive.Check('checkName', 'elementId', 60)
+
+    def test_check(self):
+
+        self.assertEqual(self.check.name, 'checkName')
+        self.assertEqual(self.check.elementId, 'elementId')
+        self.assertEqual(self.check.interval, 60)
+
+    def tearDown(self):
+        pass
+
+
 if __name__ == '__main__':
     unittest.main()

tests/test_netuitive_client.py

@@ -397,6 +397,122 @@ def test_not_kill_switch_504(self, mock_logging, mock_post):
     def tearDown(self):
         pass
 
+class TestClientCheckPost(unittest.TestCase):
+
+    def setUp(self):
+        pass
+
+    @mock.patch('netuitive.client.urllib2.urlopen')
+    @mock.patch('netuitive.client.logging')
+    def test_success(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=202)
+
+        # test infrastructure endpoint url creation
+        a = netuitive.Client(api_key='apikey')
+
+        c = netuitive.Check('check', 'test', 60)
+
+        resp = a.post_check(c)
+
+        self.assertTrue(resp)
+
+        self.assertEqual(mock_logging.exception.call_args_list, [])
+
+    @mock.patch('netuitive.client.urllib2.urlopen')
+    @mock.patch('netuitive.client.logging')
+    def test_failure_general_http(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=500)
+
+        # test infrastructure endpoint url creation
+        a = netuitive.Client(api_key='apikey')
+        mock_post.side_effect = urllib2.HTTPError(a.url, 500, '', {}, None)
+
+        e = netuitive.Check('check', 'test', 60)
+
+        resp = a.post_event(e)
+
+        self.assertNotEqual(resp, True)
+
+        self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'error posting payload to api ingest endpoint (%s): %s')
+
+    @mock.patch('netuitive.client.urllib2.urlopen')
+    @mock.patch('netuitive.client.logging')
+    def test_failure_general(self, mock_logging, mock_post):
+        mock_post.side_effect = urllib2.URLError('something')
+
+        # test infrastructure endpoint url creation
+        a = netuitive.Client(api_key='apikey')
+
+        c = netuitive.Check('check', 'test', 60)
+
+        resp = a.post_check(c)
+
+        self.assertNotEqual(resp, True)
+
+        self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'error posting payload to api ingest endpoint (%s): %s')
+
+    @mock.patch('netuitive.client.urllib2.urlopen')
+    @mock.patch('netuitive.client.logging')
+    def test_kill_switch_410(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=410)
+        # test infrastructure endpoint url creation
+        a = netuitive.Client(api_key='apikey')
+        mock_post.side_effect = urllib2.HTTPError(a.url, 410, '', {}, None)
+
+        c = netuitive.Check('check', 'test', 60)
+
+        resp = a.post_check(c)
+        resp2 = a.post_check(c)
+
+        self.assertNotEqual(resp, True)
+        self.assertFalse(resp2)
+        self.assertTrue(a.disabled)
+        self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'Posting has been disabled.See previous errors for details.')
+
+    @mock.patch('netuitive.client.urllib2.urlopen')
+    @mock.patch('netuitive.client.logging')
+    def test_kill_switch_418(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=418)
+
+        # test infrastructure endpoint url creation
+        a = netuitive.Client(api_key='apikey')
+        mock_post.side_effect = urllib2.HTTPError(a.url, 418, '', {}, None)
+
+        c = netuitive.Check('check', 'test', 60)
+
+        resp = a.post_check(c)
+        resp2 = a.post_check(c)
+
+        self.assertNotEqual(resp, True)
+        self.assertFalse(resp2)
+        self.assertTrue(a.disabled)
+        self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'Posting has been disabled.See previous errors for details.')
+
+    @mock.patch('netuitive.client.urllib2.urlopen')
+    @mock.patch('netuitive.client.logging')
+    def test_not_kill_switch_504(self, mock_logging, mock_post):
+
+        mock_post.return_value = MockResponse(code=504)
+        # test infrastructure endpoint url creation
+        a = netuitive.Client(api_key='apikey')
+        mock_post.side_effect = urllib2.HTTPError(a.url, 504, '', {}, None)
+
+        c = netuitive.Check('check', 'test', 60)
+
+        resp = a.post_check(c)
+        resp2 = a.post_check(c)
+
+        self.assertNotEqual(resp, True)
+        self.assertFalse(resp2)
+        self.assertFalse(a.disabled)
+        self.assertEqual(mock_logging.exception.call_args_list[0][0][0], 'error posting payload to api ingest endpoint (%s): %s')
+
+    def tearDown(self):
+        pass
 
 class TestClientTimeOffset(unittest.TestCase):