Merge pull request #119 from hubblestack/develop

Merge to master (prep v2017.9.2)

Author: basepi

README.md

@@ -68,7 +68,7 @@ gitfs_remotes:
   - https://github.com/hubblestack/hubblestack_data.git:
     - root: ''
   - https://github.com/hubblestack/hubble-salt.git:
-    - base: v2017.9.1
+    - base: v2017.9.2
     - root: ''
 ```
 

_beacons/pulsar.py

@@ -39,7 +39,7 @@
     DEFAULT_MASK = None
 
 __virtualname__ = 'pulsar'
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 CONFIG = None
 CONFIG_STALENESS = 0
 

_modules/hubble.py

@@ -35,7 +35,7 @@
 from nova_loader import NovaLazyLoader
 
 __nova__ = {}
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 
 def audit(configs=None,

_modules/nebula_osquery.py

@@ -41,7 +41,7 @@
 
 log = logging.getLogger(__name__)
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 __virtualname__ = 'nebula'
 
 
@@ -201,7 +201,7 @@ def queries(query_group,
         for query_name, query_ret in r.iteritems():
             for result in query_ret['data']:
                 for key, value in result.iteritems():
-                    if value and isinstance(value, str) and value.startswith('__JSONIFY__'):
+                    if value and isinstance(value, basestring) and value.startswith('__JSONIFY__'):
                         result[key] = json.loads(value[len('__JSONIFY__'):])
 
     return ret

_modules/win_pulsar.py

@@ -28,7 +28,7 @@
 CONFIG = None
 CONFIG_STALENESS = 0
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 
 def __virtual__():

_returners/slack_pulsar_returner.py

@@ -69,7 +69,7 @@
 # Import Salt Libs
 import salt.returners
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 log = logging.getLogger(__name__)
 

_returners/splunk_nebula_return.py

@@ -50,7 +50,7 @@
 
 import logging
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False

_returners/splunk_nova_return.py

@@ -49,7 +49,7 @@
 
 import logging
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False

_returners/splunk_pulsar_return.py

@@ -51,7 +51,7 @@
 
 import logging
 
-__version__ = 'v2017.9.1'
+__version__ = 'v2017.9.2'
 
 _max_content_bytes = 100000
 http_event_collector_SSL_verify = False