Merge pull request #398 from hubblestack/develop

Merge to master (prep v2.3.4-3)

Author: basepi

hubblestack/extmods/grains/cloud_details.py

@@ -12,16 +12,14 @@
 def get_cloud_details():
     # Gather all cloud details and return them, along with the fieldnames
 
-    grains = {'cloud_host': False}
+    grains = {}
 
     aws = _get_aws_details()
     azure = _get_azure_details()
 
     if aws['cloud_details']:
-        grains['cloud_host'] = True
         grains.update(aws)
     if azure['cloud_details']:
-        grains['cloud_host'] = True
         grains.update(azure)
 
     return grains
@@ -37,14 +35,14 @@ def _get_aws_details():
 
     try:
         aws['cloud_account_id'] = requests.get('http://169.254.169.254/latest/dynamic/instance-identity/document',
-                                               timeout=1).json().get('accountId', 'unknown')
+                                               timeout=3).json().get('accountId', 'unknown')
         # AWS account id is always an integer number
         # So if it's an aws machine it must be a valid integer number
         # Else it will throw an Exception
         aws['cloud_account_id'] = int(aws['cloud_account_id'])
 
         aws['cloud_instance_id'] = requests.get('http://169.254.169.254/latest/meta-data/instance-id',
-                                                timeout=1).text
+                                                timeout=3).text
     except (requests.exceptions.RequestException, ValueError):
         # Not on an AWS box
         aws = None
@@ -63,7 +61,7 @@ def _get_azure_details():
     azureHeader = {'Metadata': 'true'}
     try:
         id = requests.get('http://169.254.169.254/metadata/instance/compute?api-version=2017-08-01',
-                          headers=azureHeader, timeout=1).json()
+                          headers=azureHeader, timeout=3).json()
         azure['cloud_instance_id'] = id['vmId']
         azure['cloud_account_id'] = id['subscriptionId']
 

pkg/amazonlinux2016.09/Dockerfile

@@ -125,9 +125,9 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build 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.3.4-2
+ENV HUBBLE_CHECKOUT=v2.3.4
 ENV HUBBLE_VERSION=2.3.4
-ENV HUBBLE_ITERATION=2
+ENV HUBBLE_ITERATION=1
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

pkg/centos6/Dockerfile

@@ -127,9 +127,9 @@ RUN yum install -y rpmbuild rpm-build 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.3.4-2
+ENV HUBBLE_CHECKOUT=v2.3.4
 ENV HUBBLE_VERSION=2.3.4
-ENV HUBBLE_ITERATION=2
+ENV HUBBLE_ITERATION=1
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

pkg/centos7/Dockerfile

@@ -124,9 +124,9 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build 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.3.4-2
+ENV HUBBLE_CHECKOUT=v2.3.4
 ENV HUBBLE_VERSION=2.3.4
-ENV HUBBLE_ITERATION=2
+ENV HUBBLE_ITERATION=1
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"

pkg/coreos/Dockerfile

@@ -136,10 +136,10 @@ RUN pip -v install -r pyinstaller-requirements.txt
 #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.3.4-2
+ENV HUBBLE_CHECKOUT=v2.3.4
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_VERSION=2.3.4
-ENV HUBBLE_ITERATION=2
+ENV HUBBLE_ITERATION=1
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"
 ENV _BINARY_LOG_LEVEL="INFO"

pkg/debian7/Dockerfile

@@ -163,10 +163,10 @@ 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.3.4-2
+ENV HUBBLE_CHECKOUT=v2.3.4
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_VERSION=2.3.4
-ENV HUBBLE_ITERATION=2
+ENV HUBBLE_ITERATION=1
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"
 ENV _BINARY_LOG_LEVEL="INFO"

pkg/debian8/Dockerfile

@@ -145,10 +145,10 @@ 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.3.4-2
+ENV HUBBLE_CHECKOUT=v2.3.4
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_VERSION=2.3.4
-ENV HUBBLE_ITERATION=2
+ENV HUBBLE_ITERATION=1
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"
 ENV _BINARY_LOG_LEVEL="INFO"

pkg/debian9/Dockerfile

@@ -140,10 +140,10 @@ 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.3.4-2
+ENV HUBBLE_CHECKOUT=v2.3.4
 ENV HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_VERSION=2.3.4
-ENV HUBBLE_ITERATION=2
+ENV HUBBLE_ITERATION=1
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"
 ENV _BINARY_LOG_LEVEL="INFO"

pkg/dev/amazonlinux2016.09/Dockerfile

@@ -129,7 +129,7 @@ RUN yum install -y ruby ruby-devel rpmbuild rpm-build rubygems gcc make \
 ARG HUBBLE_CHECKOUT=develop
 ARG HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_VERSION=2.3.4_develop
-ENV HUBBLE_ITERATION=2
+ENV HUBBLE_ITERATION=1
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"
 ENV _BINARY_LOG_LEVEL="INFO"

pkg/dev/centos6/Dockerfile

@@ -131,7 +131,7 @@ RUN yum install -y rpmbuild rpm-build gcc make rh-ruby23 rh-ruby23-ruby-devel \
 ARG HUBBLE_CHECKOUT=develop
 ARG HUBBLE_GIT_URL=https://github.com/hubblestack/hubble.git
 ENV HUBBLE_VERSION=2.3.4_develop
-ENV HUBBLE_ITERATION=2
+ENV HUBBLE_ITERATION=1
 ENV HUBBLE_SRC_PATH=/hubble_src
 ENV _HOOK_DIR="./pkg/"
 ENV _BINARY_LOG_LEVEL="INFO"