Merge pull request #11 from HubbleStack/develop

Merge to master (prep for v2016.9.1)

Author: basepi

README.rst

@@ -95,7 +95,8 @@ it to the minions.
     cd hubblestack-nebula.git
     mkdir -p /srv/salt/_modules/
     cp _modules/nebula_osquery.py /srv/salt/_modules/
-    cp pillar.example /srv/pillar/hubblestack_nebula.sls
+    mkdir /srv/salt/hubblestack_nebula
+    cp hubblestack_nebula/hubblestack_nebula_queries.yaml /srv/salt/hubblestack_nebula
 
     salt \* saltutil.sync_modules
 

_modules/nebula_osquery.py

@@ -49,11 +49,11 @@ def __virtual__():
 
 
 def queries(query_group,
-            query_file='salt://hubblestack_nebula_queries.yaml',
+            query_file='salt://hubblestack_nebula/hubblestack_nebula_queries.yaml',
             verbose=False):
     '''
     Run the set of queries represented by ``query_group`` from the
-    configuration in the pillar key ``nebular_osquery``.
+    configuration in the file query_file
 
     query_group
         Group of queries to run