omdnotificationforwarder 2.7__tar.gz → 2.7.1__tar.gz

{omdnotificationforwarder-2.7 → omdnotificationforwarder-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdnotificationforwarder
-Version: 2.7
+Version: 2.7.1
 Summary: A framework for notification scripts for OMD
 Project-URL: Homepage, https://github.com/lausser/noteventificationforhandlerwarder
 Project-URL: Bug Tracker, https://github.com/lausser/noteventificationforhandlerwarder/issues

{omdnotificationforwarder-2.7 → omdnotificationforwarder-2.7.1}/bin/notificationforwarder

@@ -74,7 +74,7 @@ Example for an HTTP-based reporter:
                       help='Increase the log level to DEBUG',
                       default=False)
     parser.add_argument('--version', action='version',
-                      version=f'%(prog)s 2.7')
+                      version=f'%(prog)s 2.7.1')
 
     args = parser.parse_args()
     if not hasattr(args, 'formatter'):

{omdnotificationforwarder-2.7 → omdnotificationforwarder-2.7.1}/pyproject.toml

@@ -21,7 +21,7 @@ packages = ["src/notificationforwarder"]
 
 [project]
 name = "omdnotificationforwarder"
-version = "2.7"
+version = "2.7.1"
 authors = [
   { name="Gerhard Lausser", email="lausser@yahoo.com" },
 ]

{omdnotificationforwarder-2.7 → omdnotificationforwarder-2.7.1}/src/notificationforwarder/baseclass.py

@@ -280,6 +280,18 @@ class NotificationForwarder(object):
                 formatted_event.eventopts["formatter_summary"] = formatted_event.summary
                 self.report_event(formatted_event)
 
+    def forward_multiple(self, raw_event):
+        # this method requires a formatter which implements a method split_events!
+        instance = self.new_formatter()
+        try:
+            raw_event_list = instance.split_events(raw_event)
+            instance = None
+            logger.debug(f"received a payload with {len(raw_event_list)} single events")
+            for raw_event in raw_event_list:
+                self.forward(raw_event)
+        except Exception as e:
+            logger.critical(f"error split_events failed for {raw_event}")
+
     def enrich_raw_event(self, raw_event):
         if not "omd_site" in raw_event:
             raw_event["omd_site"] = os.environ.get("OMD_SITE", "get https://omd.consol.de/docs/omd")
@@ -372,7 +384,7 @@ class NotificationForwarder(object):
         sql_select = "SELECT id, payload FROM "+self.table_name+" ORDER BY id LIMIT 10"
         sql_delete_id = "DELETE FROM "+self.table_name+" WHERE id = ?"
         with open(self.db_lock_file, "w") as lock_file:
-            locked = acquire_lock_with_retry(lock_file)
+            locked = self.acquire_lock_with_retry(lock_file)
             if locked:
                 try:
                     outdated = int(time.time() - 60*self.max_spool_minutes)
@@ -449,6 +461,10 @@ class NotificationFormatter(metaclass=ABCMeta):
     def format_event(self):
         pass
 
+    @abstractmethod
+    def split_events(self):
+        pass
+
 
 class FormattedEvent(metaclass=ABCMeta):
     def __init__(self, eventopts):

{omdnotificationforwarder-2.7 → omdnotificationforwarder-2.7.1}/src/notificationforwarder/example/forwarder.py

@@ -39,3 +39,6 @@ class ExampleForwarder(NotificationForwarder):
         else:
            logger.critical("could not connect to the ticket system")
            return False
+
+    def probe(self):
+        return True