Merge pull request #4581 from zenoss/bugfix/ZEN-34584.7x

ZEN-34584 refactored zensyslog off the collection framework
zenoss · Oct 18, 2024 · 672074a · 672074a
2 parents 3a2c613 + b1a4d5d
commit 672074a
Show file tree

Hide file tree

Showing 29 changed files with 1,827 additions and 2,436 deletions.
diff --git a/Products/ZenCollector/configcache/tasks/deviceconfig.py b/Products/ZenCollector/configcache/tasks/deviceconfig.py
@@ -132,6 +132,21 @@ def buildDeviceConfig(
     )
 
     service = svcconfigclass(dmd, monitorname)
+    method = getattr(service, "remote_getDeviceConfigs", None)
+    if method is None:
+        log.warn(
+            "config service does not have required API  "
+            "device=%s collector=%s service=%s submitted=%f",
+            key.device,
+            key.monitor,
+            key.service,
+            submitted,
+        )
+        # Services without a remote_getDeviceConfigs method can't create
+        # device configs, so delete the config that may exist.
+        _delete_config(key, store, log)
+        return
+
     result = service.remote_getDeviceConfigs((deviceid,))
     config = result[0] if result else None
 

diff --git a/Products/ZenEvents/EventManagerBase.py b/Products/ZenEvents/EventManagerBase.py
@@ -180,7 +180,7 @@ class EventManagerBase(ZenModelRM):
     "expr": "^(?P<deviceModel>[^\[]+)\[(?P<deviceManufacturer>ADTRAN)\]:(?P<component>[^\|]+\|\d+\|\d+)\|(?P<summary>.*)",
     "keep": True
 },{
-    "description": "",
+    "description": "fortigate devices",
     "expr": "^date=.+ (?P<summary>devname=.+ log_id=(?P<eventClassKey>\d+) type=(?P<component>\S+).+)",
     "keep": True
 },{

diff --git a/Products/ZenEvents/SyslogMsgFilter.py b/Products/ZenEvents/SyslogMsgFilter.py