Merge pull request #4564 from zenoss/bugfix/ZEN-35073.6x

ZEN-35073 Make sure trap filters are working
zenoss · Sep 27, 2024 · 89d7bee · 89d7bee
2 parents b921122 + 08a03e7
commit 89d7bee
Show file tree

Hide file tree

Showing 21 changed files with 725 additions and 486 deletions.
diff --git a/Products/DataCollector/SnmpClient.py b/Products/DataCollector/SnmpClient.py
@@ -17,9 +17,9 @@
 from twisted.internet.error import TimeoutError
 from pynetsnmp.twistedsnmp import snmpprotocol, Snmpv3Error
 
-from Products.ZenCollector.interfaces import IEventService
 from Products.ZenEvents import Event
 from Products.ZenEvents.ZenEventClasses import Status_Snmp
+from Products.ZenHub.interfaces import IEventService
 from Products.ZenUtils.Driver import drive
 from Products.ZenUtils.snmp import (
     SnmpAgentDiscoverer,

diff --git a/Products/DataCollector/SshClient.py b/Products/DataCollector/SshClient.py
@@ -33,8 +33,8 @@
 
 from Products.DataCollector import CollectorClient
 from Products.DataCollector.Exceptions import LoginFailed
-from Products.ZenCollector.interfaces import IEventService
 from Products.ZenEvents import Event
+from Products.ZenHub.interfaces import IEventService
 from Products.ZenUtils.IpUtil import getHostByName
 from Products.ZenUtils.Utils import getExitMessage
 

diff --git a/Products/DataCollector/zenmodeler.py b/Products/DataCollector/zenmodeler.py
@@ -53,8 +53,8 @@
 )
 from Products.ZenCollector.cyberark import get_cyberark
 from Products.ZenCollector.daemon import parseWorkerOptions, addWorkerOptions
-from Products.ZenCollector.interfaces import IEventService
 from Products.ZenEvents.ZenEventClasses import Heartbeat, Error
+from Products.ZenHub.interfaces import IEventService
 from Products.ZenHub.PBDaemon import FakeRemote, PBDaemon, HubDown
 from Products.ZenUtils.Driver import drive, driveLater
 from Products.ZenUtils.Utils import unused, zenPath, wait

diff --git a/Products/ZenCollector/cyberark.py b/Products/ZenCollector/cyberark.py
@@ -23,9 +23,9 @@
 from zope.component import queryUtility
 
 from Products.ZenEvents import Event
+from Products.ZenHub.interfaces import IEventService
 from Products.ZenUtils.GlobalConfig import getGlobalConfiguration
 
-from .interfaces import IEventService
 from .ExpiringCache import ExpiringCache
 
 _CFG_URL = "cyberark-url"

diff --git a/Products/ZenCollector/daemon.py b/Products/ZenCollector/daemon.py
@@ -47,7 +47,6 @@
     IConfigurationDispatchingFilter,
     IConfigurationListener,
     IDataService,
-    IEventService,
     IFrameworkFactory,
     IStatisticsService,
     ITaskSplitter,
@@ -56,7 +55,7 @@
 from .utils.maintenance import MaintenanceCycle, ZenHubHeartbeatSender
 
 
-@implementer(ICollector, IDataService, IEventService)
+@implementer(ICollector, IDataService)
 class CollectorDaemon(RRDDaemon):
     """The daemon class for the entire ZenCollector framework."""
 
@@ -110,7 +109,6 @@ def __init__(
         # that collector implementors can easily retrieve a reference back here
         # if needed
         provideUtility(self, ICollector)
-        provideUtility(self, IEventService)
         provideUtility(self, IDataService)
 
         # Register the collector's own preferences object so it may be easily
@@ -394,7 +392,6 @@ def _startMaintenance(self):
                 self.options.monitor,
                 self.name,
                 self.options.heartbeatTimeout,
-                self._eventqueue,
             )
         else:
             heartbeatSender = None

diff --git a/Products/ZenCollector/interfaces.py b/Products/ZenCollector/interfaces.py
@@ -9,6 +9,8 @@
 
 import zope.interface
 
+# IEventService imported here for ZenPack compability
+from Products.ZenHub.interfaces import IEventService  # noqa: F401
 from Products.ZenUtils.observable import IObservable
 
 
@@ -549,15 +551,6 @@ def writeRRD(
         """
 
 
-class IEventService(zope.interface.Interface):
-    """
-    A service that allows the sending of an event.
-    """
-
-    def sendEvent(event, **kw):
-        pass
-
-
 class IFrameworkFactory(zope.interface.Interface):
     """
     An abstract factory object that allows the collector framework to be

diff --git a/Products/ZenCollector/utils/maintenance.py b/Products/ZenCollector/utils/maintenance.py
@@ -15,6 +15,7 @@
 from zope.component import getUtility
 
 from Products.ZenEvents.ZenEventClasses import Heartbeat
+from Products.ZenHub.interfaces import IEventService
 from Products.ZenMessaging.queuemessaging.interfaces import IQueuePublisher
 
 log = logging.getLogger("zen.maintenance")
@@ -65,17 +66,16 @@ class ZenHubHeartbeatSender(object):
     Default heartbeat sender for CollectorDaemon.
     """
 
-    def __init__(self, monitor, daemon, timeout, queue):
+    def __init__(self, monitor, daemon, timeout):
         self.__event = {
             "eventClass": Heartbeat,
             "device": monitor,
             "component": daemon,
             "timeout": timeout
         }
-        self.__queue = queue
 
     def heartbeat(self):
-        self.__queue.addHeartbeatEvent(self.__event)
+        getUtility(IEventService).sendHeartbeat(self.__event)
 
 
 class MaintenanceCycle(object):

diff --git a/Products/ZenEvents/SyslogMsgFilter.py b/Products/ZenEvents/SyslogMsgFilter.py
@@ -24,8 +24,9 @@
 
 from zope.interface import implements
 
-from Products.ZenCollector.interfaces import ICollector, IEventService
+from Products.ZenCollector.interfaces import ICollector
 from Products.ZenHub.interfaces import ICollectorEventTransformer, \
+    IEventService, \
     TRANSFORM_CONTINUE, \
     TRANSFORM_DROP
 from Products.ZenUtils.Utils import unused, zenPath