Merge branch 'develop'

Author: TheConnMan

.bumpversion.cfg

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

.travis.yml

@@ -29,4 +29,13 @@ script:
 
 after_success:
   - make coverage
-  - coveralls
+  - coveralls
+deploy:
+  provider: pypi
+  user: netuitive
+  password:
+    secure: QrivuUGSznm01ZniDcJ51hLIEM9pKkArxhQEljpYCABklqh0IneTyGQn7yQP0x+kaGOjD6RtkxFgfNg8HKCikw/KSVAU9kH07Qu5HVeECTdPf5dx5Y7xG9njzo0M8AuZwrQWLhlH2JUhYTx1P8NVye46SEpSt79Q3zx/TC0dbdLKTbznLN5DjUoYJz++FNQ3+Dh1E8k9McUc2Pjtbq3oMamuFylkDOh+4DEpx17WsRH/IMNAaLCfYHh+TjByBs+QahKPPKiYI3rGx1fr4su9LWq6e5bk8Yi36XVeLBp+CdoqRsTgXsH2OthGqvqpHopchaibenuw9EGx8BaAUCdhanolZ6jH+YeUwCjMW0ypF5WV3Jw4TmOYxpWtxPZ+yJN7MewaNW0HVyuJ75qhHFOWI+xzNTk2fk1dsG4Ed+t9Xfa79eEpTrProtnRUAIDHCp4iT6OYv1js2+rrG7M+f2oKxrFsYf/m5IQjzZDT2NLCf+hKsLdnce1XckklUKM4QbLgcDBY2JOXRkGEhxAgQ9VE78BO/RLZ6bBkv4xu+Rwt5dVPUkniwhQmRTx3GY4uzQAYlFaJ9lh5JV4BIXYWscRf791TSEWH5qfoGTkCEqz8mJ6ExpGzmYo9SbNS/rkEy8VxUHk08luSr1QkpatFHYF0TfrYplBtTKFnMs4PTAUIXg=
+  on:
+    tags: true
+    distributions: sdist bdist_wheel
+    repo: Netuitive/netuitive-client-python

netuitive/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 __author__ = 'Netuitive, Inc'
-__version__ = '0.2.3'
+__version__ = '0.2.4'
 
 from .client import Client  # nopep8 # flake8: noqa
 from .element import Element  # nopep8 # flake8: noqa

netuitive/client.py

@@ -42,8 +42,6 @@ def __init__(self, url='https://api.app.netuitive.com/ingest',
             uri=urlparse(url))
         self.eventurl = self.dataurl.replace('/ingest/', '/ingest/events/', 1)
         self.agent = agent
-        self.max_metrics = 10000
-        self.element_dict = {}
         self.disabled = False
         self.kill_codes = [410, 418]
         self.post_error_count = 0
@@ -66,46 +64,22 @@ def post(self, element):
             if element.id is None:
                 raise Exception('element id is not set')
 
-            if element.id not in self.element_dict:
-                self.element_dict[element.id] = []
+            payload = json.dumps(
+                [element], default=lambda o: o.__dict__, sort_keys=True)
+            logging.debug(payload)
 
-            for m in element.metrics:
-                if m.id not in self.element_dict[element.id]:
-                    self.element_dict[element.id].append(m.id)
-
-            metric_count = len(self.element_dict[element.id])
-
-            if metric_count <= self.max_metrics:
-
-                payload = json.dumps(
-                    [element], default=lambda o: o.__dict__, sort_keys=True)
-                logging.debug(payload)
-
-                headers = {'Content-Type': 'application/json',
-                           'User-Agent': self.agent}
-                request = urllib2.Request(
-                    self.dataurl, data=payload, headers=headers)
-                resp = urllib2.urlopen(request)
-                logging.debug("Response code: %d", resp.getcode())
-
-                resp.close()
-
-                self.post_error_count = 0
-
-                return(True)
-
-            else:
+            headers = {'Content-Type': 'application/json',
+                       'User-Agent': self.agent}
+            request = urllib2.Request(
+                self.dataurl, data=payload, headers=headers)
+            resp = urllib2.urlopen(request)
+            logging.debug("Response code: %d", resp.getcode())
 
-                errmsg = ('the {0} element has {1} metrics. '
-                          'the max is {2} metrics.'.format(
-                              element.id, metric_count, self.max_metrics))
+            resp.close()
 
-                logging.debug('{0} has the following metrics: {1}'.format(
-                    element.id,
-                    json.dumps(self.element_dict[element.id])))
+            self.post_error_count = 0
 
-                logging.error(errmsg)
-                raise Exception(errmsg)
+            return(True)
 
         except urllib2.HTTPError as e:
             logging.debug("Response code: %d", e.code)

setup.py

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

tests/test_netuitive_client.py

@@ -32,7 +32,6 @@
 except ImportError:
     import urllib2
 
-
 def getFixtureDirPath():
     path = os.path.join(
         os.path.dirname('tests/'),
@@ -177,47 +176,6 @@ def test_failure_general(self, mock_logging, mock_post):
         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_too_many_metrics(self, mock_logging, mock_post):
-
-        mock_post.return_value = MockResponse(code=202)
-        # test infrastructure endpoint url creation
-        a = netuitive.Client(api_key='apikey')
-        a.max_metrics = 100
-
-        e = netuitive.Element()
-
-        for i in range(101):
-            e.add_sample(
-                'metric-' + str(i), 1434110794, 1, 'COUNTER', host='hostname')
-
-        resp = a.post(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')
-    def test_just_enough_metrics(self, mock_post):
-
-        mock_post.return_value = MockResponse(code=202)
-        # test infrastructure endpoint url creation
-        a = netuitive.Client(api_key='apikey')
-        a.max_metrics = 100
-
-        e = netuitive.Element()
-
-        e.clear_samples()
-        for i in range(100):
-            e.add_sample(
-                'metric-' + str(i), 1434110794, 1, 'COUNTER', host='hostname')
-
-        resp = a.post(e)
-
-        self.assertEqual(resp, True)
-
     @mock.patch('netuitive.client.urllib2.urlopen')
     @mock.patch('netuitive.client.logging')
     def test_null_element_id(self, mock_logging, mock_post):