fix #26

Author: jerewill-cisco

input_module_intersight.py

@@ -60,6 +60,8 @@ def get_checkpoint(type):
                 f"{account_name}_last_{type}_record")
             helper.log_debug(
                 f"{s} | Checkpoint value for {type} records is {state}")
+            if (state == None or state == "None"):
+                raise Exception("State is none")
             return state
         except:
             # set the state if it's not set
@@ -215,7 +217,9 @@ def write_splunk(index, source, sourcetype, data):
         state = get_checkpoint('audit')
         # get the audit records
         RESPONSE = r_intersight(
-            f"{endpoint}?$orderby=ModTime%20asc&$filter=ModTime%20gt%20{state}")
+            f"{endpoint}?$inlinecount=allpages&$orderby=ModTime%20asc&$filter=ModTime%20gt%20{state}")
+        helper.log_info(
+            f"{s} | Found {RESPONSE.json()['Count']} audit records to retrieve")
         # process the audit records
         for data in RESPONSE.json()['Results']:
             # pop things we don't need
@@ -252,8 +256,9 @@ def write_splunk(index, source, sourcetype, data):
         state = get_checkpoint('alarm')
         # Let's get the alarm records
         RESPONSE = r_intersight(
-            f"{endpoint}?$orderby=ModTime%20asc&$filter=ModTime%20gt%20{state}")
-
+            f"{endpoint}?$inlinecount=allpages&$orderby=ModTime%20asc&$filter=ModTime%20gt%20{state}")
+        helper.log_info(
+            f"{s} | Found {RESPONSE.json()['Count']} alarm records to retrieve")
         # Process the alarm records
         for data in RESPONSE.json()['Results']:
             data = pop(['AffectedMo', 'Ancestors', 'Owners', 'PermissionResources',

splunk_em.py

@@ -6,7 +6,7 @@
 
 import input_module_intersight
 
-load_dotenv('_example.env')
+load_dotenv('_richfield.env')
 
 # This code allows us to execute the input for testing without needing additional code from splunk
 # by providing a minimal sub-out of the two classes that splunk passes to the input
@@ -24,7 +24,7 @@ def get_arg(self, arg_name):
         if arg_name == 'validate_ssl':
             return True
         if arg_name == 'enable_aaa_audit_records':
-            return False
+            return True
         if arg_name == 'enable_alarms':
             return True
         if arg_name == 'inventory_interval':
@@ -36,7 +36,7 @@ def get_arg(self, arg_name):
             basic = {'advisories', 'compute', 'contract', 'network', 'target', 'license'}
             hyperflex = {'compute', 'hyperflex'}
             thirdpartystorage = {'pure', 'netapp', 'hitachi'}
-            return all
+            return none
 
     # this function provides the input name
     def get_input_stanza(self):