Merge pull request #828 from jettero/4.0-pulsar-fix

4.0 pulsar fix

Author: jettero

hubblestack/extmods/modules/pulsar.py

@@ -185,7 +185,7 @@ def __init__(self, configfile=None, verbose=False):
                 self.nc_config['paths'] = configfile
             else:
                 self.nc_config['paths'] = [configfile]
-        else:
+        elif 'paths' not in self.nc_config:
             self.nc_config['paths'] = []
         config = self.config
         config['verbose'] = verbose
@@ -904,8 +904,11 @@ def process(configfile='salt://hubblestack_pulsar/hubblestack_pulsar_config.yaml
                 # file really is new since the last time we thought about it
                 # (aka the last time we ran the process() function).
                 _, abspath, dirname, basename = cm.format_path(path)
-                config_path = config['paths'][0]
-                pulsar_config = config_path[config_path.rfind('/') + 1:len(config_path)]
+                try:
+                    config_path = config['paths'][0]
+                    pulsar_config = config_path[config_path.rfind('/') + 1:len(config_path)]
+                except IndexError:
+                    pulsar_config = 'unknown'
                 fake_sub = { 'change': 'IN_CREATE',
                         'path': abspath,  # goes to object_path in splunk
                         'tag':  dirname,  # goes to file_path in splunk

hubblestack/extmods/returners/splunk_pulsar_return.py

@@ -241,15 +241,16 @@ def _build_linux_event(alert, change):
              'pulsar_config': alert['pulsar_config']}
     if 'contents' in alert:
         event['contents'] = alert['contents']
-    if alert['stats']:  # Gather more data if the change wasn't a delete
+    # Gather more data if the change wasn't a delete
+    if 'stats' in alert and isinstance(alert['stats'], dict):
         stats = alert['stats']
-        event['object_id'] = stats['inode']
-        event['file_acl'] = stats['mode']
-        event['file_create_time'] = stats['ctime']
-        event['file_modify_time'] = stats['mtime']
-        event['file_size'] = stats['size'] / 1024.0  # Convert bytes to kilobytes
-        event['user'] = stats['user']
-        event['group'] = stats['group']
+        event['object_id'] = stats.get('inode')
+        event['file_acl'] = stats.get('mode')
+        event['file_create_time'] = stats.get('ctime')
+        event['file_modify_time'] = stats.get('mtime')
+        event['file_size'] = stats.get('size', 0) / 1024.0  # Convert bytes to kilobytes
+        event['user'] = stats.get('user')
+        event['group'] = stats.get('group')
         if object_type == 'file':
             chk = alert.get('checksum')
             if chk:

mk-requires.sh

@@ -3,8 +3,7 @@
 D="$(dirname "$0")"
 F="$D/requirements.txt"
 
-echo "# This file was generated by $0" > "$F"
-echo "# $(date -u)" >> "$F"
+echo "# This file was generated by $(basename "$0")" > "$F"
 echo >> "$F"
 
 bash "$D/pkg/generate-requirements.sh" "$@" | tee -a "$F"

requirements.txt

@@ -1,5 +1,4 @@
-# This file was generated by ./mk-requires.sh
-# Wed Mar 18 14:02:09 UTC 2020
+# This file was generated by mk-requires.sh
 
 ansi2html
 argparse