zenoss-commit Mailing List for Zenoss Community Edition (Page 188)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: ecn
Date: 2007-04-17 15:39:16 -0400 (Tue, 17 Apr 2007)
New Revision: 4720

Added:
   trunk/Products/ZenWin/WinCollector.py
Modified:
   trunk/Products/ZenHub/services/EventService.py
   trunk/Products/ZenWin/wmiclient.py
   trunk/Products/ZenWin/zeneventlog.py
   trunk/Products/ZenWin/zenwin.py
Log:
 * hoist common code WinCollector
 * get zeneventlog limping along


Modified: trunk/Products/ZenHub/services/EventService.py
===================================================================

--- trunk/Products/ZenHub/services/EventService.py	2007-04-17 18:06:16 UTC (rev 4719)
+++ trunk/Products/ZenHub/services/EventService.py	2007-04-17 19:39:16 UTC (rev 4720)
@@ -26,3 +26,5 @@
     def remote_getDevicePingIssues(self, *args, **kwargs):
         return self.zem.getDevicePingIssues(*args, **kwargs)
 
+    def remote_getWmiConnIssues(self):
+        return self.zem.getWmiConnIssues()

Added: trunk/Products/ZenWin/WinCollector.py

Modified: trunk/Products/ZenWin/wmiclient.py
===================================================================
--- trunk/Products/ZenWin/wmiclient.py	2007-04-17 18:06:16 UTC (rev 4719)
+++ trunk/Products/ZenWin/wmiclient.py	2007-04-17 19:39:16 UTC (rev 4720)
@@ -105,7 +105,7 @@
         self.event = event
 
 
-    def __call__(self, timeout=0):
+    def nextEvent(self, timeout=0):
         """Poll for next event wait timeout for response return value.
         """
         return self.event.NextEvent(timeout).Properties_("TargetInstance").Value

Modified: trunk/Products/ZenWin/zeneventlog.py
===================================================================
--- trunk/Products/ZenWin/zeneventlog.py	2007-04-17 18:06:16 UTC (rev 4719)
+++ trunk/Products/ZenWin/zeneventlog.py	2007-04-17 19:39:16 UTC (rev 4720)
@@ -1,6 +1,6 @@
 #################################################################
 #
-#   Copyright (c) 2006 Zenoss, Inc. All rights reserved.
+#   Copyright (c) 2007 Zenoss, Inc. All rights reserved.
 #
 #################################################################
 
@@ -9,65 +9,40 @@
 import gc
 import time
 import logging
-import xmlrpclib
-import socket
+from socket import getfqdn
 import pywintypes
 import pythoncom
 import wmiclient
 
-from zenutils.Utils import basicAuthUrl
-from zenutils.StatusMonitor import StatusMonitor
-from StatusTest import StatusTest
-from WinServiceTest import WinServiceTest
-from WinEventlog import WinEventlog
+import Globals
+from WinCollector import WinCollector as Base
+from Products.ZenEvents.ZenEventClasses import Heartbeat
 
-class zeneventlog(StatusMonitor):
+TIMEOUT_CODE = 2147209215
+RPC_ERROR_CODE = 2147023170
 
-    manager = socket.getfqdn()
-    
-    startevt = {'eventClass':'/App/Start', 'device':socket.getfqdn(),
-                'summary': 'zeneventlog started', 
-                'component':'zeneventlog',
-                'severity':0}
-    stopevt = {'eventClass':'/App/Stop', 'device':socket.getfqdn(),
-                'summary': 'zeneventlog stopped', 
-                'component':'zeneventlog', 
-                'severity': 4}
-    heartbeat = {'eventClass':'/Heartbeat', 'device':socket.getfqdn(),
-                'component': 'zeneventlog'}
+class zeneventlog(Base):
 
+    agent = "zeneventlog"
 
-    def __init__(self, config=""):
-        StatusMonitor.__init__(self, config=config)
-        self.configCycleInterval = 20
+    def __init__(self):
+        Base.__init__(self)
         self.devices = {}
 
-
-    def validConfig(self):
-        """let getConfig know if we have a working config or not"""
-        return len(self.devices)
-
-
-    def loadConfig(self):
+    def updateDevices(self, devices):
         """get the config data from server"""
-        if time.time()-self.configTime > self.configCycleInterval*60:
-            self.log.info("reloading configuration")
-            url = basicAuthUrl(self.username, self.password,self.winurl)
-            server = xmlrpclib.Server(url)
-            polltime, devices = server.getDeviceWinInfo(0, True)
-            for name,user,passwd,sev,url in devices:
-                try:
-                    if self.checkwmi(name): 
-                        self.log.info('wmi prob on %s skipping', name)
-                        continue
-                    if self.devices.has_key(name): continue
-                    self.devices[name] = self.getWatcher(name,user,passwd,sev)
-                except pywintypes.com_error:
-                    self.log.exception("wmi connect failed on %s", name)
-            self.configTime = time.time()
+        for name,user,passwd,sev,url in devices:
+            try:
+                if name not in self.wmiprobs: 
+                    self.log.info('wmi prob on %s skipping', name)
+                    continue
+                if name in self.devices:
+                    continue
+                self.devices[name] = self.getWatcher(name,user,passwd,sev)
+            except pywintypes.com_error:
+                self.log.exception("wmi connect failed on %s", name)
 
 
-
     def getWatcher(self, name, user, passwd, minSeverity):
         """Setup WMI connection to monitored server. 
         """
@@ -87,14 +62,15 @@
         pythoncom.PumpWaitingMessages()
         baddevices = []
         for name, w in self.devices.items():
-            if self.checkwmi(name): continue
+            if name in self.wmiprobs:
+                continue
             self.log.debug("polling %s", name)
             try:
                 while 1:
-                    lrec = w()
-                    if not lrec.Message: continue
-                    evt = self.mkevt(name, lrec)
-                    self.zem.sendEvent(evt)
+                    lrec = w.nextEvent()
+                    if not lrec.Message:
+                        continue
+                    self.sendEvent(self.mkevt(name, lrec))
             except pywintypes.com_error, e:
                 msg = "wmi connection failed: "
                 code,txt,info,param = e
@@ -102,18 +78,20 @@
                 if info:
                     wcode, source, descr, hfile, hcont, scode = info
                     scode = abs(scode)
-                    if descr: wmsg = descr.strip()
+                    if descr:
+                        wmsg = descr.strip()
                 msg += wmsg
-                if scode == 2147209215: # timeout
+                if scode == TIMEOUT_CODE:
                     self.log.debug("timeout %s", name)
-                elif scode == 2147023170: # rpc error
+                elif scode == RPC_ERROR_CODE:
                     self.log.warn("%s %s", name, msg)
                 else:
                     self.log.warn("%s %s", name, msg)
                     self.log.warn("removing %s", name)
                     baddevices.append(name)
-        for name in baddevices: del self.devices[name]
-        self.zem.sendEvent(self.heartbeat)
+        for name in baddevices:
+            del self.devices[name]
+        self.sendEvent(self.heartbeat)
         gc.collect()
         self.log.info("Com InterfaceCount: %d", pythoncom._GetInterfaceCount())
         self.log.info("Com GatewayCount: %d", pythoncom._GetGatewayCount())
@@ -127,20 +105,19 @@
         evtkey = "%s_%s" % (lrec.SourceName, lrec.EventCode)
         sev = 4 - lrec.EventType     #lower severity by one level
         if sev < 1: sev = 1
-        evt = {}
-        evt['device'] = name
-        evt['eventClassKey'] = evtkey
-        evt['eventGroup'] = lrec.LogFile
-        evt['component'] = lrec.SourceName
-        evt['ntevid'] = lrec.EventCode
-        evt['summary'] = lrec.Message.strip()
-        evt['agent'] = "zeneventlog"
-        evt['severity'] = sev
-        evt['manager'] = self.manager
+        evt = dict(device=name,
+                   eventClassKey=evtkey,
+                   eventGroup=lrec.LogFile,
+                   component=lrec.SourceName,
+                   ntevid=lrec.EventCode,
+                   summary=lrec.Message.strip(),
+                   agent="zeneventlog",
+                   severity=sev,
+                   manager=self.manager)
         self.log.debug("device:%s msg:'%s'", name, lrec.Message)
         return evt
 
 
 if __name__ == "__main__":
     zw = zeneventlog()
-    zw.mainLoop()
+    zw.run()

Modified: trunk/Products/ZenWin/zenwin.py
===================================================================
--- trunk/Products/ZenWin/zenwin.py	2007-04-17 18:06:16 UTC (rev 4719)
+++ trunk/Products/ZenWin/zenwin.py	2007-04-17 19:39:16 UTC (rev 4720)
@@ -13,9 +13,9 @@
 from twisted.internet import reactor, defer
 
 import Globals
-from Products.ZenHub.PBDaemon import FakeRemote, PBDaemon as Base
+from WinCollector import WinCollector as Base
 from Products.ZenHub.services import WmiConfig
-from Products.ZenEvents.ZenEventClasses import Heartbeat
+from Products.ZenEvents.ZenEventClasses import Heartbeat, Status_Wmi_Conn
 
 from StatusTest import StatusTest
 from WinServiceTest import WinServiceTest
@@ -24,26 +24,13 @@
 class zenwin(Base):
 
     agent = "zenwin"
-    cycleInterval = 60.
-    configCycleInterval = 20.
 
-    initialServices = ['EventService', 'WmiConfig']
-
-    heartbeat = dict(eventClass=Heartbeat,
-                     device=getfqdn(),
-                     component='zenwin')
-
     def __init__(self):
+        Base.__init__(self)
         self.wmiprobs = []
         self.devices = []
-        Base.__init__(self)
 
 
-    def validConfig(self):
-        """let getConfig know if we have a working config or not"""
-        return self.devices
-
-
     def getPlugins(self):
         """Build a list of plugin instances for a device.
         """
@@ -55,7 +42,7 @@
             self.stop()
             raise SystemExit("No plugins found for list: '%s'" % (
                              ",".join(self.options.load)))
-        pnames = [ p.name for p in plugins ] 
+        pnames = [p.name for p in plugins] 
         return plugins
 
 
@@ -102,8 +89,8 @@
                                      problems,
                                      self.cycleInterval*2)
                     for r in running[:]:
-                        evt = { 'eventClass': '/Status/Wmi/Conn',
-                                'agent': 'zenwin',
+                        evt = { 'eventClass': Status_Wmi_Conn,
+                                'agent': self.agent,
                                 'severity':'4',
                                 'summary': 'Timeout failure during WMI check',
                                 'device': r.name,
@@ -122,26 +109,18 @@
             self.log.info("ref: %d", sys.gettotalrefcount())
 
 
-    def scanCycle(self, ignored=None):
-        now = time.time()
-        try:
-            self.processLoop()
-        except Exception, ex:
-            self.log.exception("Error processing main loop")
-        delay = time.time() - now
-        reactor.callLater(min(0, self.cycleInterval - delay), self.scanCycle)
-
-        
+    def updateDevices(self, devices):
+        devices = []
+        for n,u,p,s in devices:
+            if self.options.device and self.options.device != n: continue
+            st = StatusTest(self, n, u, p, s, self.options.debug)
+            st.setPlugins(self.getPlugins())
+            devices.append(st) 
+        if devices:
+            self.devices = devices
+    
     def buildOptions(self):
         Base.buildOptions(self)
-        self.parser.add_option('-d', '--device', 
-                               dest='device', 
-                               default=None,
-                               help="single device to collect")
-        self.parser.add_option('--debug', 
-                               dest='debug', 
-                               default=False,
-                               help="turn on additional debugging")
         self.parser.add_option('--threads',
                                dest='threads', 
                                default=4,
@@ -155,49 +134,7 @@
                                help="plugin name to load can "
                                     "have more than one")
 
-    def configService(self):
-        return self.services.get('WmiConfig', FakeRemote())
 
-
-    def updateConfig(self, cfg):
-        for a, v in cfg.monitor:
-            current = getattr(self, a, None)
-            if current is not None and current != v:
-                self.log.info("Setting %s to %r", a, v);
-                setattr(self, a, v)
-        self.heartbeat['timeout'] = self.cycleInterval*3
-        self.log.debug('Device data: %r', (cfg.devices,))
-        devices = []
-        for n,u,p,s in cfg.devices:
-            if self.options.device and self.options.device != n: continue
-            st = StatusTest(self, n, u, p, s, self.options.debug)
-            st.setPlugins(self.getPlugins())
-            devices.append(st) 
-        if devices:
-            self.devices = devices
-
-
-    def error(self, why):
-        why.printTraceback()
-        self.log.error(why.getErrorMessage())
-
-
-    def reconfigure(self):
-        try:
-            d = self.configService().callRemote('getConfig')
-            d.addCallbacks(self.updateConfig, self.error)
-        except Exception, ex:
-            self.log.exception("Error fetching config")
-            return defer.fail(ex)
-        reactor.callLater(self.configCycleInterval, self.reconfigure)
-        return d
-
-
-    def connected(self):
-        d = self.reconfigure()
-        d.addCallback(self.scanCycle)
-
-
 if __name__ == "__main__":
     zw = zenwin()
     zw.run()





2007	Jan	Feb (65)	Mar (276)	Apr (544)	May (638)	Jun (225)	Jul (204)	Aug (294)	Sep (532)	Oct (506)	Nov (324)	Dec (359)
2008	Jan (208)	Feb (225)	Mar (248)	Apr (388)	May (222)	Jun (47)	Jul	Aug	Sep	Oct	Nov	Dec

zenoss-commit Mailing List for Zenoss Community Edition (Page 188)

Zenoss - Intelligent IT Operations Management

zenoss-commit — svn commit list