Merge pull request #38 from HubbleStack/develop

Merge to master (prep for v2016.10.3)

Author: basepi

README.rst

@@ -48,8 +48,8 @@ repo for updates and bugfixes!)
 
 .. code-block:: shell
 
-    wget https://spm.hubblestack.io/quasar/hubblestack_quasar-2016.9.0-1.spm
-    spm local install hubblestack_quasar-2016.9.0-1.spm
+    wget https://spm.hubblestack.io/quasar/hubblestack_quasar-2016.10.3-1.spm
+    spm local install hubblestack_quasar-2016.10.3-1.spm
 
 You should now be able to sync the new modules to your minion(s) using the
 ``sync_returners`` Salt utility:

_returners/slack_pulsar_returner.py

@@ -69,7 +69,7 @@
 # Import Salt Libs
 import salt.returners
 
-__version__ = 'v2016.10.1'
+__version__ = 'v2016.10.3'
 
 log = logging.getLogger(__name__)
 

_returners/splunk_nebula_return.py

@@ -30,7 +30,7 @@
 
 import logging
 
-__version__ = 'v2016.10.1'
+__version__ = 'v2016.10.3'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False
@@ -92,7 +92,7 @@ def returner(ret):
 
 def _get_options():
     try:
-        token = __salt__['config.get']('hubblestack:nebula:returner:splunk:token')
+        token = __salt__['config.get']('hubblestack:nebula:returner:splunk:token').strip()
         indexer = __salt__['config.get']('hubblestack:nebula:returner:splunk:indexer')
         sourcetype = __salt__['config.get']('hubblestack:nebula:returner:splunk:sourcetype')
         index = __salt__['config.get']('hubblestack:nebula:returner:splunk:index')
@@ -236,5 +236,7 @@ def flushBatch(self):
                 r = requests.post(self.server_uri, data=' '.join(self.batchEvents), headers=headers, verify=http_event_collector_SSL_verify, proxies=self.proxy, timeout=self.timeout)
             except requests.exceptions.Timeout:
                 log.error('Request to splunk timed out. Not retrying.')
+            except Exception as e:
+                log.error('Request to splunk threw an error: {0}'.format(e))
             self.batchEvents = []
             self.currentByteLength = 0

_returners/splunk_nova_return.py

@@ -30,7 +30,7 @@
 
 import logging
 
-__version__ = 'v2016.10.1'
+__version__ = 'v2016.10.3'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False
@@ -150,7 +150,7 @@ def event_return(event):
 
 def _get_options():
     try:
-        token = __salt__['config.get']('hubblestack:nova:returner:splunk:token')
+        token = __salt__['config.get']('hubblestack:nova:returner:splunk:token').strip()
         indexer = __salt__['config.get']('hubblestack:nova:returner:splunk:indexer')
         sourcetype = __salt__['config.get']('hubblestack:nova:returner:splunk:sourcetype')
         index = __salt__['config.get']('hubblestack:nova:returner:splunk:index')
@@ -294,5 +294,7 @@ def flushBatch(self):
                 r = requests.post(self.server_uri, data=' '.join(self.batchEvents), headers=headers, verify=http_event_collector_SSL_verify, proxies=self.proxy, timeout=self.timeout)
             except requests.exceptions.Timeout:
                 log.error('Request to splunk timed out. Not retrying.')
+            except Exception as e:
+                log.error('Request to splunk threw an error: {0}'.format(e))
             self.batchEvents = []
             self.currentByteLength = 0

_returners/splunk_pulsar_return.py

@@ -33,7 +33,7 @@
 
 import logging
 
-__version__ = 'v2016.10.1'
+__version__ = 'v2016.10.3'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False
@@ -184,7 +184,7 @@ def _dedupList(l):
 
 def _get_options():
     try:
-        token = __salt__['config.get']('hubblestack:pulsar:returner:splunk:token')
+        token = __salt__['config.get']('hubblestack:pulsar:returner:splunk:token').strip()
         indexer = __salt__['config.get']('hubblestack:pulsar:returner:splunk:indexer')
         sourcetype = __salt__['config.get']('hubblestack:pulsar:returner:splunk:sourcetype')
         index = __salt__['config.get']('hubblestack:pulsar:returner:splunk:index')
@@ -301,5 +301,7 @@ def flushBatch(self):
                 r = requests.post(self.server_uri, data=' '.join(self.batchEvents), headers=headers, verify=http_event_collector_SSL_verify, proxies=self.proxy, timeout=self.timeout)
             except requests.exceptions.Timeout:
                 log.error('Request to splunk timed out. Not retrying.')
+            except Exception as e:
+                log.error('Request to splunk threw an error: {0}'.format(e))
             self.batchEvents = []
             self.currentByteLength = 0