Merge pull request #216 from hubblestack/develop

Merge to master (prep v2.2.7)
hubblestack · Sep 28, 2017 · e316d7d · e316d7d
2 parents 92dda72 + 9f7aea1
commit e316d7d
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 25 deletions.
diff --git a/hubblestack/__init__.py b/hubblestack/__init__.py
@@ -1 +1 @@
-__version__ = '2.2.6'
+__version__ = '2.2.7'
diff --git a/...estack/extmods/returners/cloud_details.py → hubblestack/cloud_details.py b/...estack/extmods/returners/cloud_details.py → hubblestack/cloud_details.py
diff --git a/hubblestack/extmods/modules/nebula_osquery.py b/hubblestack/extmods/modules/nebula_osquery.py
@@ -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

diff --git a/hubblestack/extmods/returners/logstash_nebula_return.py b/hubblestack/extmods/returners/logstash_nebula_return.py
@@ -32,7 +32,7 @@
 import socket
 import requests
 from datetime import datetime
-from cloud_details import get_cloud_details
+from hubblestack.cloud_details import get_cloud_details
 from requests.auth import HTTPBasicAuth
 
 

diff --git a/hubblestack/extmods/returners/logstash_nova_return.py b/hubblestack/extmods/returners/logstash_nova_return.py
@@ -31,7 +31,7 @@
 import time
 import socket
 import requests
-from cloud_details import get_cloud_details
+from hubblestack.cloud_details import get_cloud_details
 from requests.auth import HTTPBasicAuth
 
 def returner(ret):

diff --git a/hubblestack/extmods/returners/logstash_pulsar_return.py b/hubblestack/extmods/returners/logstash_pulsar_return.py
@@ -32,7 +32,7 @@
 import json
 import requests
 from collections import defaultdict
-from cloud_details import get_cloud_details
+from hubblestack.cloud_details import get_cloud_details
 from requests.auth import HTTPBasicAuth
 
 

diff --git a/hubblestack/extmods/returners/splunk_nebula_return.py b/hubblestack/extmods/returners/splunk_nebula_return.py
@@ -40,7 +40,7 @@
 '''
 import socket
 # Import cloud details
-from cloud_details import get_cloud_details
+from hubblestack.cloud_details import get_cloud_details
 
 # Imports for http event forwarder
 import requests

diff --git a/hubblestack/extmods/returners/splunk_nova_return.py b/hubblestack/extmods/returners/splunk_nova_return.py
@@ -40,7 +40,7 @@
 '''
 import socket
 # Import cloud details
-from cloud_details import get_cloud_details
+from hubblestack.cloud_details import get_cloud_details
 
 # Imports for http event forwarder
 import requests

diff --git a/hubblestack/extmods/returners/splunk_pulsar_return.py b/hubblestack/extmods/returners/splunk_pulsar_return.py
@@ -40,7 +40,7 @@
 '''
 import socket
 # Import cloud details
-from cloud_details import get_cloud_details
+from hubblestack.cloud_details import get_cloud_details
 
 # Imports for http event forwarder
 import requests

diff --git a/hubblestack/splunklogging.py b/hubblestack/splunklogging.py
@@ -36,7 +36,7 @@
 '''
 import socket
 # Import cloud details
-from hubblestack.extmods.returners.cloud_details import get_cloud_details
+from hubblestack.cloud_details import get_cloud_details
 
 # Imports for http event forwarder
 import requests

diff --git a/pkg/amazonlinux2016.09/Dockerfile b/pkg/amazonlinux2016.09/Dockerfile
@@ -91,8 +91,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.6
-ENV HUBBLE_VERSION=2.2.6
+ENV HUBBLE_CHECKOUT=v2.2.7
+ENV HUBBLE_VERSION=2.2.7
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/amazonlinux2017.03/Dockerfile b/pkg/amazonlinux2017.03/Dockerfile
@@ -91,8 +91,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.6
-ENV HUBBLE_VERSION=2.2.6
+ENV HUBBLE_CHECKOUT=v2.2.7
+ENV HUBBLE_VERSION=2.2.7
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/centos6/Dockerfile b/pkg/centos6/Dockerfile
@@ -93,8 +93,8 @@ RUN yum install -y rpmbuild gcc make rh-ruby23 rh-ruby23-ruby-devel \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.6
-ENV HUBBLE_VERSION=2.2.6
+ENV HUBBLE_CHECKOUT=v2.2.7
+ENV HUBBLE_VERSION=2.2.7
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/centos7/Dockerfile b/pkg/centos7/Dockerfile
@@ -90,8 +90,8 @@ RUN yum install -y ruby ruby-devel rpmbuild rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.6
-ENV HUBBLE_VERSION=2.2.6
+ENV HUBBLE_CHECKOUT=v2.2.7
+ENV HUBBLE_VERSION=2.2.7
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/coreos/Dockerfile b/pkg/coreos/Dockerfile
@@ -88,8 +88,8 @@ RUN pip install --upgrade pip \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.6
-ENV HUBBLE_VERSION=2.2.6
+ENV HUBBLE_CHECKOUT=v2.2.7
+ENV HUBBLE_VERSION=2.2.7
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/debian7/Dockerfile b/pkg/debian7/Dockerfile
@@ -115,8 +115,8 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.6
-ENV HUBBLE_VERSION=2.2.6
+ENV HUBBLE_CHECKOUT=v2.2.7
+ENV HUBBLE_VERSION=2.2.7
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/debian8/Dockerfile b/pkg/debian8/Dockerfile
@@ -96,8 +96,8 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.6
-ENV HUBBLE_VERSION=2.2.6
+ENV HUBBLE_CHECKOUT=v2.2.7
+ENV HUBBLE_VERSION=2.2.7
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

diff --git a/pkg/debian9/Dockerfile b/pkg/debian9/Dockerfile
@@ -92,8 +92,8 @@ RUN apt-get install -y ruby ruby-dev rubygems gcc make \
 #pyinstaller start
 #commands specified for ENTRYPOINT and CMD are executed when the container is run, not when the image is built
 #use the following variables to choose the version of hubble
-ENV HUBBLE_CHECKOUT=v2.2.6
-ENV HUBBLE_VERSION=2.2.6
+ENV HUBBLE_CHECKOUT=v2.2.7
+ENV HUBBLE_VERSION=2.2.7
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"