Fixed issue in senders, removing remnants of dict()'s so they now properly process QResultsModel

Author: projx

etc

@@ -0,0 +1 @@
+Subproject commit 5a51d9b4967983aeff5225ed2caf732e6c11f540

lib/base.py

@@ -164,7 +164,7 @@ def parse(self, poller : QPollConnector):
 
         elif result_type == QConsts.RESULT_TABLE:
             for key, item in poller.results.items():
-                parsed = self.format(item, poller.export_list())
+                parsed = self.format(item)
                 results.append(parsed)
         else:
             raise Exception('Error {} poller class has not correctly implemented get_result_type()'.format(poller.args.alias))

lib/formatters/csv.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from lib.base import QFormatConnector, QFormatterModel
+from lib.base import QFormatConnector, QFormatterModel, QResultsModel
 
 ########################################################################################################################
 ## Config Models
@@ -29,7 +29,7 @@ def prerequisites(self, initiator):
         pass
 
 
-    def format(self, row, export_keys : list) -> str:
+    def format(self, row : QResultsModel) -> str:
         """
         Takes a dictionary, converting into key-paired comma seperated row
         """
@@ -38,9 +38,8 @@ def format(self, row, export_keys : list) -> str:
         if self.args.prefix_timestamp and self.args.prefix_timestamp!=False and self.args.prefix_timestamp!="False":
             output = datetime.now().strftime(self.args.prefix_timestamp) + ","
 
-        for key in export_keys:
-            if key in row:
-                print(key)
-                output = output + f"{key}='{row[key]}',"
+        c = dict(row)
+        for key, value in c.items():
+            output = output + f"{key}='{value}',"
 
         return output

lib/formatters/dict.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
 import json
-from lib.base import QFormatConnector,  QFormatterModel
+from lib.base import QFormatConnector,  QFormatterModel, QResultsModel
 from pprint import pprint
 
 ########################################################################################################################
@@ -39,17 +39,12 @@ def prerequisites(self, initiator):
         pass
 
 
-    def format(self, row, export_keys : list) -> dict:
+    def format(self, row : QResultsModel) -> dict:
         """
-        Takes a dictionary, converting into key-paired comma seperated row
+        Takes a QResultsModel, returns it as a Dict, which is later sent to a compatible sender (e.g. OpenSearch)
         """
-        output = dict()
-        output = row
-        #if self.args["prefix_timestamp"]:
-        # for key in export_keys:
-        #    if key in row:
-        #       output[key] = row[key]
-        if self.args.prefix_timestamp and self.args.prefix_timestamp!=False and self.args.prefix_timestamp!="False":
-            output["time"] = datetime.now().strftime(self.args.prefix_timestamp)
-
-        return output
+
+        if self.args.prefix_timestamp and self.args.prefix_timestamp!=False:
+            row.time = datetime.now().strftime(self.args.prefix_timestamp)
+
+        return dict(row)

lib/formatters/json.py

@@ -1,8 +1,7 @@
 from datetime import datetime
-
 import json
-from lib.base import QFormatConnector,  QFormatterModel
-
+from lib.base import QFormatConnector,  QFormatterModel, QResultsModel
+from pprint import pprint
 
 ########################################################################################################################
 ## Config Models
@@ -38,14 +37,12 @@ def prerequisites(self, initiator):
         pass
 
 
-    def format(self, row, export_keys : list) -> str:
+    def format(self, row : QResultsModel) -> str:
         """
-        Takes a dictionary, converting into key-paired comma seperated row
+        Takes a QResultsModel, returns it as a JSON string, which is later sent to a compatible sender (e.g. SplunkHEC)
         """
-        output = ""
+
         if self.args.prefix_timestamp and self.args.prefix_timestamp!=False:
             row.time = datetime.now().strftime(self.args.prefix_timestamp)
 
-        output =  json.dumps(dict(row))
-
-        return output
+        return json.dumps(dict(row))

lib/pollers/snmp.py

@@ -101,7 +101,6 @@ class QSNMPNetResultModel(QResultsModel):
 
     sysName: str
     sysIP: str
-    deviceType: str = ""
     ifSpeedOut: int = None
     ifSpeedIn: int = None
     ifSpeedTotal: int
@@ -213,7 +212,7 @@ def query(self):
                     applog.debug("Skipping {} interface {}, its not in the configuration for this connector".format(args.host, row['ifDescr']))
         else:
             applog.debug("First run - Values such as ifAlias and host etc are not set on this initial run!")
-            results = cn
+            results = dict()
 
         self.previous_time = ct
         self.previous_net = cn

qasa.py

@@ -21,7 +21,7 @@ def global_setup(show_output = True):
     ## Determine path for config files
     workdir = dir_path = os.path.dirname(os.path.realpath(__file__))
     workdir += "/etc" if ENV_TYPE == "production" else "/etc-sample"
-    print("Workdir: {}".format(workdir))
+    applog.info("Workdir: {}".format(workdir))
 
     ## Load config files
     settings_path = workdir + "/settings.yml"