zenoss-commit — svn commit list

[Zenoss-commit] r4495 - trunk/Products/ZenRRD

[<sv...@ze...>]

Author: ecn
Date: 2007-04-04 09:12:53 -0400 (Wed, 04 Apr 2007)
New Revision: 4495

Modified:
   trunk/Products/ZenRRD/RRDDaemon.py
Log:
 * clean up imports


Modified: trunk/Products/ZenRRD/RRDDaemon.py
===================================================================
--- trunk/Products/ZenRRD/RRDDaemon.py	2007-04-04 13:09:10 UTC (rev 4494)
+++ trunk/Products/ZenRRD/RRDDaemon.py	2007-04-04 13:12:53 UTC (rev 4495)
@@ -20,16 +20,13 @@
 from Products.ZenEvents import Event
 from Products.ZenEvents.ZenEventClasses import Perf_Snmp, App_Start, App_Stop
 from Products.ZenEvents.ZenEventClasses import Heartbeat
-#from Products.ZenUtils.TwistedAuth import AuthProxy
-from Products.ZenUtils.Utils import basicAuthUrl
-from Products.ZenUtils.Driver import drive, driveLater
+from Products.ZenUtils.Driver import drive
 from Products.ZenHub.zenhub import PB_PORT
 
 from Products.ZenUtils.PBUtil import ReconnectingPBClientFactory
 from twisted.cred import credentials
-from twisted.internet import reactor, error, defer
+from twisted.internet import reactor, defer
 from twisted.python import failure
-from twisted.web.xmlrpc import Proxy
 
 from Products.ZenUtils.ZenDaemon import ZenDaemon as Base
 
@@ -223,10 +220,7 @@
 
     def eventsSent(self, result, events):
         if isinstance(result, failure.Failure):
-            if isinstance(result.value, error.ConnectionRefusedError):
-                self.log.error("Unable to talk to zenxevents daemon")
-            else:
-                self.error(result)
+            self.error(result)
             self.events.extend(events)
         else:
             self.events = self.events[len(events):]

[Zenoss-commit] r4494 - in trunk/Products: ZenRRD ZenUtils

[<sv...@ze...>]

Author: ecn
Date: 2007-04-04 09:09:10 -0400 (Wed, 04 Apr 2007)
New Revision: 4494

Added:
   trunk/Products/ZenUtils/PBUtil.py
Modified:
   trunk/Products/ZenRRD/RRDDaemon.py
Log:
 * automagic reconnecting to ZenHub


Modified: trunk/Products/ZenRRD/RRDDaemon.py
===================================================================
--- trunk/Products/ZenRRD/RRDDaemon.py	2007-04-04 11:06:59 UTC (rev 4493)
+++ trunk/Products/ZenRRD/RRDDaemon.py	2007-04-04 13:09:10 UTC (rev 4494)
@@ -25,9 +25,9 @@
 from Products.ZenUtils.Driver import drive, driveLater
 from Products.ZenHub.zenhub import PB_PORT
 
-from twisted.spread import pb
+from Products.ZenUtils.PBUtil import ReconnectingPBClientFactory
 from twisted.cred import credentials
-from twisted.internet import reactor, error
+from twisted.internet import reactor, error, defer
 from twisted.python import failure
 from twisted.web.xmlrpc import Proxy
 
@@ -148,37 +148,42 @@
         for ev in self.startevt, self.stopevt, self.heartbeatevt:
             ev['component'] = name
             ev['device'] = socket.getfqdn()
-        import logging
-        self.log = logging.getLogger(name)
 
     def connect(self):
-        def go(driver):
-            factory = pb.PBClientFactory()
-            log = self.log
-            log.debug("Connecting to %s", self.options.host)
-            reactor.connectTCP(self.options.host, self.options.port, factory)
+        d = defer.Deferred()
+        def gotPerspective(perspective):
+            "Every time we reconnect this function is called"
+            def go(driver):
+                "Fetch the services we want"
+                self.log.debug("Getting event service")
+                yield perspective.callRemote('getService', 'EventService',
+                                             self.options.monitor)
+                self.zem = driver.next()
+                if not self.zem:
+                    raise failure.Failure("Cannot get EventManager Service")
 
-            username = self.options.username
-            password = self.options.password
-            self.log.debug("Logging in as %s", username)
-            c = credentials.UsernamePassword(username, password)
-            yield factory.login(c)
-            perspective = driver.next()
-
-            monitor = self.options.monitor or socket.getfqdn()
-            self.log.debug("Getting event service for %s", monitor)
-            yield perspective.callRemote('getService',
-                                         'EventService',
-                                         monitor)
-            self.zem = driver.next()
-            assert self.zem
+                self.log.debug("Getting Perf service")
+                yield perspective.callRemote('getService', self.hubService,
+                                             self.options.monitor)
+                self.model = driver.next()
+                if not self.model:
+                    raise failure.Failure("Cannot get %s Service" %
+                                          (self.hubService,))
+            self.log.warning("Reconnected to ZenHub")
+            d2 = drive(go)
+            if not d.called:
+                d2.chainDeferred(d)
             
-            self.log.debug("Getting Perf service for %s", monitor)
-            yield perspective.callRemote('getService', self.hubService, monitor)
-            self.model = driver.next()
-            assert self.model
-    
-        return drive(go)
+        factory = ReconnectingPBClientFactory()
+        self.log.debug("Connecting to %s", self.options.host)
+        reactor.connectTCP(self.options.host, self.options.port, factory)
+        username = self.options.username
+        password = self.options.password
+        self.log.debug("Logging in as %s", username)
+        c = credentials.UsernamePassword(username, password)
+        factory.gotPerspective = gotPerspective
+        factory.startLogin(c)
+        return d
 
     def setPropertyItems(self, items):
         'extract configuration elements used by this server'
@@ -266,7 +271,7 @@
         self.parser.add_option('-d', '--device', dest='device',
                                help="Specify a specific device to monitor",
                                default='')
-        self.parser.add_option('--monitor', dest='monitor',
+        self.parser.add_option('--monitor', dest='monitor', default=socket.getfqdn(),
             help="Specify a specific name of the monitor configuration")
 
     def logError(self, msg, error):

Added: trunk/Products/ZenUtils/PBUtil.py

[Zenoss-commit] r4493 - in trunk/Products: ZenHub ZenHub/services ZenRRD

[<sv...@ze...>]

Author: ecn
Date: 2007-04-04 07:06:59 -0400 (Wed, 04 Apr 2007)
New Revision: 4493

Added:
   trunk/Products/ZenHub/__init__.py
   trunk/Products/ZenHub/services/CommandConfig.py
   trunk/Products/ZenHub/services/ProcessConfig.py
   trunk/Products/ZenHub/services/SnmpPerfConfig.py
   trunk/Products/ZenHub/services/XmlRPCConfig.py
Modified:
   trunk/Products/ZenHub/services/PerformanceConfig.py
   trunk/Products/ZenHub/zenhub.py
   trunk/Products/ZenRRD/RRDDaemon.py
   trunk/Products/ZenRRD/zencommand.py
   trunk/Products/ZenRRD/zenperfsnmp.py
   trunk/Products/ZenRRD/zenperfxmlrpc.py
   trunk/Products/ZenRRD/zenprocess.py
Log:
 * convert RRDDaemon to ZenHub
 - remove syncdb
 - handle extra login at startup
 - specify Hub service
 * separate performance config fetches into separate services
 * make ZenHub into a proper module
 * add a periodic synch call to zenhub so it picks up Zope changes


Added: trunk/Products/ZenHub/__init__.py

Added: trunk/Products/ZenHub/services/CommandConfig.py

Modified: trunk/Products/ZenHub/services/PerformanceConfig.py
===================================================================
--- trunk/Products/ZenHub/services/PerformanceConfig.py	2007-04-03 22:51:33 UTC (rev 4492)
+++ trunk/Products/ZenHub/services/PerformanceConfig.py	2007-04-04 11:06:59 UTC (rev 4493)
@@ -2,27 +2,15 @@
 
 class PerformanceConfig(HubService):
 
-    def _getOb(self):
-        return self.dmd.Monitors.Performance._getOb(self.instance)
+    def __init__(self, dmd, instance):
+        HubService.__init__(self, dmd, instance)
+        self.config = self.dmd.Monitors.Performance._getOb(self.instance)
 
-    def remote_getDevices(self, devices=None):
-        return self._getOb().getDevices(devices)
-
-    def remote_getDeviceUpdates(self, devices):
-        return self._getOb().getDeviceUpdates(devices)
-
     def remote_propertyItems(self):
-        return self._getOb().propertyItems()
+        return self.config.propertyItems()
         
     def remote_getSnmpStatus(self, *args, **kwargs):
-        return self._getOb().getSnmpStatus(*args, **kwargs)
+        return self.config.getSnmpStatus(*args, **kwargs)
 
     def remote_getDefaultRRDCreateCommand(self, *args, **kwargs):
-        return self._getOb().getDefaultRRDCreateCommand(*args, **kwargs)
-
-    def remote_getOSProcessConf(self, devices=None):
-        return self._getOb().getOSProcessConf(devices)
-
-    def remote_getProcessStatus(self, devices=None):
-        return self._getOb().getProcessStatus(devices)
-
+        return self.config.getDefaultRRDCreateCommand(*args, **kwargs)

Added: trunk/Products/ZenHub/services/ProcessConfig.py

Added: trunk/Products/ZenHub/services/SnmpPerfConfig.py

Added: trunk/Products/ZenHub/services/XmlRPCConfig.py

Modified: trunk/Products/ZenHub/zenhub.py
===================================================================
--- trunk/Products/ZenHub/zenhub.py	2007-04-03 22:51:33 UTC (rev 4492)
+++ trunk/Products/ZenHub/zenhub.py	2007-04-04 11:06:59 UTC (rev 4493)
@@ -140,6 +140,7 @@
                 reactor.stop()
 
     def _wakeUpReactorAndHandleSignals(self):
+        self.syncdb()
         reactor.callLater(1.0, self._wakeUpReactorAndHandleSignals)
 
         

Modified: trunk/Products/ZenRRD/RRDDaemon.py
===================================================================
--- trunk/Products/ZenRRD/RRDDaemon.py	2007-04-03 22:51:33 UTC (rev 4492)
+++ trunk/Products/ZenRRD/RRDDaemon.py	2007-04-04 11:06:59 UTC (rev 4493)
@@ -22,12 +22,16 @@
 from Products.ZenEvents.ZenEventClasses import Heartbeat
 #from Products.ZenUtils.TwistedAuth import AuthProxy
 from Products.ZenUtils.Utils import basicAuthUrl
+from Products.ZenUtils.Driver import drive, driveLater
+from Products.ZenHub.zenhub import PB_PORT
 
+from twisted.spread import pb
+from twisted.cred import credentials
 from twisted.internet import reactor, error
 from twisted.python import failure
 from twisted.web.xmlrpc import Proxy
 
-from Products.ZenUtils.ZCmdBase import ZCmdBase as Base
+from Products.ZenUtils.ZenDaemon import ZenDaemon as Base
 
 BAD_SEVERITY=Event.Warning
 
@@ -49,7 +53,6 @@
     severity = Event.Info
     escalateCount = 0
 
-
     def __init__(self, label, minimum, maximum, eventClass, severity, count):
         self.label = label
         self.update(minimum, maximum, eventClass, severity, count)
@@ -119,20 +122,6 @@
     def __iter__(self):
         return iter(self.thresholds.values())
 
-class FakeProxy:
-
-    def __init__(self, obj):
-        self.obj = obj
-
-    def callRemote(self, name, *args, **kwargs):
-        from twisted.internet import defer
-        try:
-            method = getattr(self.obj, name)
-            return defer.succeed(method(*args, **kwargs))
-        except Exception, ex:
-            return defer.fail(ex)
-
-
 class RRDDaemon(Base):
     'Holds the code common to performance gathering daemons.'
 
@@ -150,6 +139,7 @@
     configCycleInterval = 20            # minutes
     rrd = None
     shutdown = False
+    hubService = 'PerformanceConfig'
 
     def __init__(self, name):
         self.events = []
@@ -158,23 +148,38 @@
         for ev in self.startevt, self.stopevt, self.heartbeatevt:
             ev['component'] = name
             ev['device'] = socket.getfqdn()
-        try:
-            monitor = self.options.monitor or socket.getfqdn()
-            self.model = FakeProxy(self.getDmdObj('/Monitors/Performance/'+
-                                                  monitor))
-            self.zem = FakeProxy(self.getDmdObj('/ZenEventManager'))
-        except KeyError, ex:
-            self.log.debug("Not directly connected (%s) using Zope access.", ex)
-            self.model = self.buildProxy(self.options.zopeurl)
-            self.zem = self.buildProxy(self.options.zem)
+        import logging
+        self.log = logging.getLogger(name)
 
-    def buildProxy(self, url):
-        "create Proxy objects with our config and the given url"
-        return Proxy(url,
-                         self.options.zopeusername,
-                         self.options.zopepassword)
+    def connect(self):
+        def go(driver):
+            factory = pb.PBClientFactory()
+            log = self.log
+            log.debug("Connecting to %s", self.options.host)
+            reactor.connectTCP(self.options.host, self.options.port, factory)
 
+            username = self.options.username
+            password = self.options.password
+            self.log.debug("Logging in as %s", username)
+            c = credentials.UsernamePassword(username, password)
+            yield factory.login(c)
+            perspective = driver.next()
 
+            monitor = self.options.monitor or socket.getfqdn()
+            self.log.debug("Getting event service for %s", monitor)
+            yield perspective.callRemote('getService',
+                                         'EventService',
+                                         monitor)
+            self.zem = driver.next()
+            assert self.zem
+            
+            self.log.debug("Getting Perf service for %s", monitor)
+            yield perspective.callRemote('getService', self.hubService, monitor)
+            self.model = driver.next()
+            assert self.model
+    
+        return drive(go)
+
     def setPropertyItems(self, items):
         'extract configuration elements used by this server'
         table = dict(items)
@@ -248,23 +253,19 @@
 
     def buildOptions(self):
         Base.buildOptions(self)
-        self.parser.add_option(
-            "-z", "--zopeurl",
-            dest="zopeurl",
-            help="XMLRPC url path for performance configuration server",
-            default=DEFAULT_URL)
-        self.parser.add_option(
-            "-u", "--zopeusername",
-            dest="zopeusername", help="username for zope server",
-            default='admin')
-        self.parser.add_option("--zopepassword", dest="zopepassword")
-        self.parser.add_option(
-            '--zem', dest='zem',
-            help="XMLRPC path to an ZenEventManager instance")
-        self.parser.add_option('-d',
-            '--device', dest='device',
-            help="Specify a specific device to monitor",
-            default='')
+        self.parser.add_option('--host',
+                    dest="host",default="localhost",
+                    help="hostname of zeo server")
+        self.parser.add_option('--port',
+                    dest="port",type="int", default=PB_PORT,
+                    help="port of zeo server")
+        self.parser.add_option("-u", "--username",
+                               dest="username", help="username for hub server",
+                               default='admin')
+        self.parser.add_option("--password", dest="password", default="zenoss")
+        self.parser.add_option('-d', '--device', dest='device',
+                               help="Specify a specific device to monitor",
+                               default='')
         self.parser.add_option('--monitor', dest='monitor',
             help="Specify a specific name of the monitor configuration")
 
@@ -284,4 +285,3 @@
         self.error(why)
         self._shutdown()
 
-

Modified: trunk/Products/ZenRRD/zencommand.py
===================================================================
--- trunk/Products/ZenRRD/zencommand.py	2007-04-03 22:51:33 UTC (rev 4492)
+++ trunk/Products/ZenRRD/zencommand.py	2007-04-04 11:06:59 UTC (rev 4493)
@@ -359,6 +359,7 @@
 
 class zencommand(RRDDaemon):
 
+    hubService = 'CommandConfig'
 
     def __init__(self):
         RRDDaemon.__init__(self, 'zencommand')
@@ -545,13 +546,13 @@
     def start(self, driver):
         """Fetch the configuration and return a deferred for its completion.
         Also starts the config cycle"""
-        self.syncdb()
         ex = None
         try:
             log.debug('Fetching config')
             yield self.fetchConfig()
             driver.next()
             log.debug('Finished config fetch')
+            print driver.next()
         except Exception, ex:
             log.exception(ex)
         driveLater(self.configCycleInterval * 60, self.start)
@@ -566,16 +567,17 @@
                                default=10, type='int',
                                help="number of devices to collect at one time")
         
-    def main(self):
+    def main(self, ignored):
         self.sendEvent(self.startevt)
         d = drive(self.start)
         d.addCallbacks(self.processSchedule, self.errorStop)
         if self.options.cycle:
             d.addCallback(self.heartbeatCycle)
-        reactor.run()
-        self.sendEvent(self.stopevt, now=True)
 
 
 if __name__ == '__main__':
     z = zencommand()
-    z.main()
+    d = z.connect()
+    d.addCallbacks(z.main, z.errorStop)
+    reactor.run()
+    # self.sendEvent(self.stopevt, now=True)

Modified: trunk/Products/ZenRRD/zenperfsnmp.py
===================================================================
--- trunk/Products/ZenRRD/zenperfsnmp.py	2007-04-03 22:51:33 UTC (rev 4492)
+++ trunk/Products/ZenRRD/zenperfsnmp.py	2007-04-04 11:06:59 UTC (rev 4493)
@@ -221,6 +221,7 @@
     
     # these names need to match the property values in StatusMonitorConf
     maxRrdFileAge = 30 * (24*60*60)     # seconds
+    hubService = 'SnmpPerfConfig'
 
     def __init__(self):
         SnmpDaemon.__init__(self, 'zenperfsnmp')
@@ -265,8 +266,6 @@
     def startUpdateConfig(self, driver):
         'Periodically ask the Zope server for basic configuration data.'
         
-        self.syncdb()
-
         log.info("fetching property items")
         yield self.model.callRemote('propertyItems')
         self.setPropertyItems(driver.next())
@@ -554,16 +553,17 @@
             threshold.check(device, oidData.name, oid, value,
                             self.sendThresholdEvent)
 
-    def main(self):
+    def main(self, ignored):
         "Run forever, fetching and storing"
-
         self.sendEvent(self.startevt)
         drive(zpf.startUpdateConfig).addCallbacks(self.scanCycle,
                                                   self.errorStop)
-        reactor.run(installSignalHandlers=False)
-        self.sendEvent(self.stopevt, now=True)
 
 
 if __name__ == '__main__':
     zpf = zenperfsnmp()
-    zpf.main()
+    d = zpf.connect()
+    d.addCallbacks(zpf.main, zpf.errorStop)
+    reactor.run(installSignalHandlers=False)
+    # fixme
+    # zpf.sendEvent(zpf.stopevt, now=True)

Modified: trunk/Products/ZenRRD/zenperfxmlrpc.py
===================================================================
--- trunk/Products/ZenRRD/zenperfxmlrpc.py	2007-04-03 22:51:33 UTC (rev 4492)
+++ trunk/Products/ZenRRD/zenperfxmlrpc.py	2007-04-04 11:06:59 UTC (rev 4493)
@@ -122,8 +122,8 @@
     xmlRpcStatusEvent = {'eventClass': Status_XmlRpc,
                        'component': 'xmlrpc',
                        'eventGroup': 'XmlRpcTest'}
+    hubService = 'XmlRPCConfig'
 
-    
     def __init__(self, xmlRpcState):
         # if the number of Event.Error severity events on this device is
         # greater than 0, than we consider the XMLRPC server down on this 
@@ -220,7 +220,6 @@
     def startUpdateConfig(self, driver):
         'Periodically ask the Zope server for basic configuration data.'
 
-        self.syncdb()
         driveLater(self.configCycleInterval * 60, self.startUpdateConfig)
         
         yield self.model.callRemote('getXmlRpcDevices', self.options.device)
@@ -501,16 +500,16 @@
                                 v,
                                 self.sendThresholdEvent)
 
-    def main(self):
+    def main(self, ignored):
         "Run forever, fetching and storing"
 
         self.sendEvent(self.startevt)
         drive(zpf.startUpdateConfig).addCallbacks(self.scanCycle,
                                                   self.errorStop)
-        reactor.run(installSignalHandlers=False)
-        self.sendEvent(self.stopevt, now=True)
 
 
 if __name__ == '__main__':
     zpf = zenperfxmlrpc()
-    zpf.main()
+    zpf.connect().addCallbacks(zpf.main, zpf.errorStop)
+    reactor.run(installSignalHandlers=False)
+    #self.sendEvent(self.stopevt, now=True)

Modified: trunk/Products/ZenRRD/zenprocess.py
===================================================================
--- trunk/Products/ZenRRD/zenprocess.py	2007-04-03 22:51:33 UTC (rev 4492)
+++ trunk/Products/ZenRRD/zenprocess.py	2007-04-04 11:06:59 UTC (rev 4493)
@@ -21,6 +21,7 @@
 log = logging.getLogger("zen.zenprocess")
 
 from twisted.internet import reactor, defer
+from twisted.python import failure
 
 try:
     from pynetsnmp.twistedsnmp import AgentProxy
@@ -233,6 +234,7 @@
 class zenprocess(SnmpDaemon):
     statusEvent = { 'eventClass' : Status_OSProcess,
                     'eventGroup' : 'Process' }
+    hubService = 'ProcessConfig'
 
     def __init__(self):
         SnmpDaemon.__init__(self, 'zenprocess')
@@ -265,7 +267,6 @@
     def start(self, driver):
         'Read the basic config needed to do anything'
         log.debug("fetching config")
-        self.syncdb()
         yield self.fetchConfig();
         n = driver.next()
         removed = Set(self._devices.keys())
@@ -517,13 +518,14 @@
         SnmpDaemon.heartbeat(self)
 
 
-    def main(self):
+    def main(self, unused):
         self.sendEvent(self.startevt)
         drive(self.start).addCallbacks(self.periodic, self.errorStop)
-        reactor.run(installSignalHandlers=False)
-        self.sendEvent(self.stopevt, now=True)
 
 
 if __name__ == '__main__':
     z = zenprocess()
-    z.main()
+    d = z.connect()
+    d.addCallbacks(z.main, z.errorStop)
+    reactor.run(installSignalHandlers=False)
+    # self.sendEvent(self.stopevt, now=True)

[Zenoss-commit] r4492 - trunk/Products/ZenModel

[<sv...@ze...>]

Author: ecn
Date: 2007-04-03 18:51:33 -0400 (Tue, 03 Apr 2007)
New Revision: 4492

Modified:
   trunk/Products/ZenModel/DeviceComponent.py
Log:
 * name is a method, not a value


Modified: trunk/Products/ZenModel/DeviceComponent.py
===================================================================
--- trunk/Products/ZenModel/DeviceComponent.py	2007-04-03 22:51:08 UTC (rev 4491)
+++ trunk/Products/ZenModel/DeviceComponent.py	2007-04-03 22:51:33 UTC (rev 4492)
@@ -70,7 +70,7 @@
         if not self.monitored() or not self.device().monitorDevice(): return -1
         if not statClass: statClass = "/Status/%s" % self.meta_type
         return self.getEventManager().getComponentStatus(
-                self.getParentDeviceName(), self.name, statclass=statClass)
+                self.getParentDeviceName(), self.name(), statclass=statClass)
 
   
     def getStatusString(self, statClass=None):

[Zenoss-commit] r4491 - trunk/Products/ZenHub/services

[<sv...@ze...>]

Author: ecn
Date: 2007-04-03 18:51:08 -0400 (Tue, 03 Apr 2007)
New Revision: 4491

Modified:
   trunk/Products/ZenHub/services/PerformanceConfig.py
Log:
 * inch closer to gettin zenprocess to run against zenhub


Modified: trunk/Products/ZenHub/services/PerformanceConfig.py
===================================================================
--- trunk/Products/ZenHub/services/PerformanceConfig.py	2007-04-03 22:50:45 UTC (rev 4490)
+++ trunk/Products/ZenHub/services/PerformanceConfig.py	2007-04-03 22:51:08 UTC (rev 4491)
@@ -20,3 +20,9 @@
     def remote_getDefaultRRDCreateCommand(self, *args, **kwargs):
         return self._getOb().getDefaultRRDCreateCommand(*args, **kwargs)
 
+    def remote_getOSProcessConf(self, devices=None):
+        return self._getOb().getOSProcessConf(devices)
+
+    def remote_getProcessStatus(self, devices=None):
+        return self._getOb().getProcessStatus(devices)
+

[Zenoss-commit] r4490 - trunk/Products/DataCollector

[<sv...@ze...>]

Author: ecn
Date: 2007-04-03 18:50:45 -0400 (Tue, 03 Apr 2007)
New Revision: 4490

Modified:
   trunk/Products/DataCollector/zenmodeler.py
Log:
 * why call _loadPluginDir?


Modified: trunk/Products/DataCollector/zenmodeler.py
===================================================================
--- trunk/Products/DataCollector/zenmodeler.py	2007-04-03 22:50:02 UTC (rev 4489)
+++ trunk/Products/DataCollector/zenmodeler.py	2007-04-03 22:50:45 UTC (rev 4490)
@@ -31,7 +31,7 @@
 defaultPort = 22
 defaultStartSleep = 10 * 60
 
-from Plugins import _loadPluginDir
+from Plugins import loadPlugins
 
 class ZenModeler(ZCmdBase):
 

[Zenoss-commit] r4489 - trunk/Products/DataCollector/plugins/zenoss/snmp

[<sv...@ze...>]

Author: ecn
Date: 2007-04-03 18:50:02 -0400 (Tue, 03 Apr 2007)
New Revision: 4489

Modified:
   trunk/Products/DataCollector/plugins/zenoss/snmp/HPDeviceMap.py
Log:
 * I don't know why this is coming in as None, but it is


Modified: trunk/Products/DataCollector/plugins/zenoss/snmp/HPDeviceMap.py
===================================================================
--- trunk/Products/DataCollector/plugins/zenoss/snmp/HPDeviceMap.py	2007-04-03 20:41:57 UTC (rev 4488)
+++ trunk/Products/DataCollector/plugins/zenoss/snmp/HPDeviceMap.py	2007-04-03 22:50:02 UTC (rev 4489)
@@ -24,6 +24,6 @@
         log.info('processing HP device info on device %s' % device.id)
         getdata, tabledata = results
         om = self.objectMap(getdata)
-        if om.setOSProductKey.find("NetWare") > -1:
+        if om.setOSProductKey and om.setOSProductKey.find("NetWare") > -1:
             delattr(om, 'setOSProductKey')
         return om

[Zenoss-commit] r4488 - in trunk/Products: ZenModel ZenModel/migrate ZenModel/skins/zenmodel ZenWidgets/skins/zenui

[<sv...@ze...>]

Author: marc
Date: 2007-04-03 16:41:57 -0400 (Tue, 03 Apr 2007)
New Revision: 4488

Modified:
   trunk/Products/ZenModel/DeviceClass.py
   trunk/Products/ZenModel/migrate/menus.py
   trunk/Products/ZenModel/migrate/zCollectorPlugins.py
   trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt
   trunk/Products/ZenWidgets/skins/zenui/dialog_lock.pt
   trunk/Products/ZenWidgets/skins/zenui/dialog_lockDevices.pt
Log:
#1036
 * Fixed dialog and method

Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py	2007-04-03 20:19:53 UTC (rev 4487)
+++ trunk/Products/ZenModel/DeviceClass.py	2007-04-03 20:41:57 UTC (rev 4488)
@@ -646,7 +646,7 @@
         if REQUEST:
             return self.callZenScreen(REQUEST)
 
-    def unlockDevices(self, sendEventWhenBlocked=None, REQUEST=None):
+    def unlockDevices(self, deviceNames=None, sendEventWhenBlocked=None, REQUEST=None):
         """Unlock devices"""
         if not deviceNames: return self()
         if type(deviceNames) in types.StringTypes: deviceNames = (deviceNames,)
@@ -656,7 +656,7 @@
         if REQUEST:
             return self.callZenScreen(REQUEST)
     
-    def lockDevicesFromDeletion(self, sendEventWhenBlocked=None, REQUEST=None):
+    def lockDevicesFromDeletion(self, deviceNames=None, sendEventWhenBlocked=None, REQUEST=None):
         """Lock devices from being deleted"""
         if not deviceNames: return self()
         if type(deviceNames) in types.StringTypes: deviceNames = (deviceNames,)
@@ -666,7 +666,7 @@
         if REQUEST:
             return self.callZenScreen(REQUEST)
 
-    def lockDevicesFromUpdates(self, sendEventWhenBlocked=None, REQUEST=None):
+    def lockDevicesFromUpdates(self, deviceNames=None, sendEventWhenBlocked=None, REQUEST=None):
         """Lock devices from being deleted or updated"""
         if not deviceNames: return self()
         if type(deviceNames) in types.StringTypes: deviceNames = (deviceNames,)

Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py	2007-04-03 20:19:53 UTC (rev 4487)
+++ trunk/Products/ZenModel/migrate/menus.py	2007-04-03 20:41:57 UTC (rev 4488)
@@ -448,7 +448,7 @@
                     ),
                 dict(
                     id=         'lockDevices',
-                    description='Change lock...',
+                    description='Lock devices...',
                     action=     'dialog_lockDevices',
                     permissions=('Change Device',),
                     isdialog = True

Modified: trunk/Products/ZenModel/migrate/zCollectorPlugins.py
===================================================================
--- trunk/Products/ZenModel/migrate/zCollectorPlugins.py	2007-04-03 20:19:53 UTC (rev 4487)
+++ trunk/Products/ZenModel/migrate/zCollectorPlugins.py	2007-04-03 20:41:57 UTC (rev 4488)
@@ -6,7 +6,7 @@
     def cutover(self, dmd):
         dmd.Devices._setProperty("zCollectorPlugins", [], type='lines')
 
- zCollectorPlugins()
+zCollectorPlugins()
  
 
 

Modified: trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt	2007-04-03 20:19:53 UTC (rev 4487)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceListMacro.pt	2007-04-03 20:41:57 UTC (rev 4488)
@@ -80,8 +80,7 @@
         <th tal:replace="structure python:here.ZenTableManager.getTableHeader(
                     tableName,'getSnmpStatusNumber','Critical/Error','cmp')">Critical/Error
         </th>
-        <th class=tableheader align=left>Delete lock</th>
-        <th class=tableheader align=left>Update lock</th>
+        <th class=tableheader align=left>Locks</th>
 	</tr>
    <tal:block tal:repeat="device batch">
 	<tr tal:define="odd repeat/device/odd"
@@ -123,11 +122,9 @@
         </table>
         </td>
         <td class=tablevalues>
-             <img tal:condition="device/isLockedFromUpdates" border="0" src="emblem-readonly.png">
+             <img tal:condition="device/isLockedFromUpdates" border="0" src="locked-update-icon.png">
+            <img tal:condition="device/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
         </td>
-        <td class=tablevalues>
-            <img tal:condition="device/isLockedFromDeletion" border="0" src="emblem-readonly.png">
-        </td>
     </tr>
     </tal:block>
     </tbody>

Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_lock.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_lock.pt	2007-04-03 20:19:53 UTC (rev 4487)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_lock.pt	2007-04-03 20:41:57 UTC (rev 4488)
@@ -1,15 +1,12 @@
 <h2>Edit Lock</h2>
 <p>
-Which lock status would you like to set on this object?<br/>
-<br/>
+Which lock status would you like to set on this object?<br/><br/>
 <input tal:attributes="name string:sendEventWhenBlocked;
                     type string:checkbox;
                     checked here/sendEventWhenBlocked"
                     />Send event when actions are blocked by a lock<br/>
 </p>
-<br/>
-<br/>
-<div id="dialog_buttons">
+<p alight="right">
 <input type="submit" name="lockFromUpdates:method"
     value="Lock from deletion and updates"
     tal:attributes="onclick string:return $$('dialog').submit_form(
@@ -24,4 +21,4 @@
                         '${here/absolute_url_path}','lockableForm')" /><br/>
 <input id="dialog_cancel" type="button" value="Cancel"
 onclick="$('dialog').hide()"/>
-</div>
+</p>

Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_lockDevices.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_lockDevices.pt	2007-04-03 20:19:53 UTC (rev 4487)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_lockDevices.pt	2007-04-03 20:41:57 UTC (rev 4488)
@@ -1,25 +1,23 @@
 <h2>Change lock status</h2>
 <p>
-Which lock status would you like to set on these devices?<br/>
-<br/>
+Which lock status would you like to set on these devices?<br/><br/>
 <input tal:attributes="name string:sendEventWhenBlocked;
-                    type string:checkbox"
-                    />Send warnings when actions are blocked<br/>
+        type string:checkbox"
+        />Send warnings when actions are blocked
 </p>
-<br/>
-<div id="dialog_buttons">
+<p align="right">
 <input type="submit" name="lockDevicesFromUpdates:method"
     value="Lock from deletion and updates"
     tal:attributes="onclick string:return $$('dialog').submit_form(
-                        '${here/absolute_url_path}')" />&nbsp;
+                        '${here/absolute_url_path}')" /><br/><br/>
 <input type="submit" name="lockDevicesFromDeletion:method"
     value="Lock from deletion"
     tal:attributes="onclick string:return $$('dialog').submit_form(
-                        '${here/absolute_url_path}')" />&nbsp;
+                        '${here/absolute_url_path}')" /><br/><br/>
 <input type="submit" name="unlockDevices:method"
     value="Unlock"
     tal:attributes="onclick string:return $$('dialog').submit_form(
-                        '${here/absolute_url_path}')" />&nbsp;
+                        '${here/absolute_url_path}')" /><br/><br/>
 <input id="dialog_cancel" type="button" value="Cancel"
 onclick="$('dialog').hide()"/>
-</div>
+</p>

[Zenoss-commit] r4487 - in trunk/Products: ZenModel ZenRRD

[<sv...@ze...>]

Author: marc
Date: 2007-04-03 16:19:53 -0400 (Tue, 03 Apr 2007)
New Revision: 4487

Modified:
   trunk/Products/ZenModel/Device.py
   trunk/Products/ZenRRD/RenderServer.py
Log:
#827
 * Fixed RenderServer, supports renaming of PerformanceMonitor

Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py	2007-04-03 18:32:25 UTC (rev 4486)
+++ trunk/Products/ZenModel/Device.py	2007-04-03 20:19:53 UTC (rev 4487)
@@ -1036,15 +1036,15 @@
                             newPerformanceMonitor=None, REQUEST=None):
         """set the performance monitor for this device if newPerformanceMonitor
         is passed in create it"""
-        if newPerformanceMonitor: performanceMonitor = newPerformanceMonitor
-        obj = self.getDmdRoot("Monitors").getPerformanceMonitor(
-                                                    performanceMonitor)
-        self.addRelation("perfServer", obj)
-        
         if newPerformanceMonitor:
             self.dmd.RenderServer.moveRRDFiles(self.id,
                 newPerformanceMonitor, performanceMonitor, REQUEST)
+            performanceMonitor = newPerformanceMonitor
         
+        obj = self.getDmdRoot("Monitors").getPerformanceMonitor(
+                                                    performanceMonitor)
+        self.addRelation("perfServer", obj)
+                
         if REQUEST:
             REQUEST['message'] = "Set Performance %s at time:" % performanceMonitor
             return self.callZenScreen(REQUEST)

Modified: trunk/Products/ZenRRD/RenderServer.py
===================================================================
--- trunk/Products/ZenRRD/RenderServer.py	2007-04-03 18:32:25 UTC (rev 4486)
+++ trunk/Products/ZenRRD/RenderServer.py	2007-04-03 20:19:53 UTC (rev 4487)
@@ -146,12 +146,11 @@
 
     def receiveRRDFiles(self, REQUEST=None):
         """receive a device's RRD Files from another server"""
-        if REQUEST:
-            tarfile = REQUEST.get('tarfile')
-            tarfilename = REQUEST.get('tarfilename')
-            f=open('%s/%s' % (self.tmpdir, tarfilename), 'wb')
-            f.write(urllib.unquote(tarfile))
-            f.close()
+        tarfile = REQUEST.get('tarfile')
+        tarfilename = REQUEST.get('tarfilename')
+        f=open('%s/%s' % (self.tmpdir, tarfilename), 'wb')
+        f.write(urllib.unquote(tarfile))
+        f.close()
                 
     def sendRRDFiles(self, device, server, REQUEST=None):
         """Move a package of RRDFiles"""
@@ -163,24 +162,29 @@
         params = urllib.urlencode({'tarfilename': tarfilename,
             'tarfile':tarfilebody})
         # send the file to zope
-        perfMon = self.getDmdRoot("Monitors").getPerformanceMonitor(server)
-        remoteUrl = '%s/receiveRRDFiles' % (perfMon.renderurl)
-        urllib.urlopen(remoteUrl, params)
+        perfMon = self.dmd.getDmdRoot("Monitors").getPerformanceMonitor(server)
+        if perfMon.renderurl.startswith('http'):
+            remoteUrl = '%s/receiveRRDFiles' % (perfMon.renderurl)
+            urllib.urlopen(remoteUrl, params)
+            
     
     def moveRRDFiles(self, device, destServer, srcServer=None, REQUEST=None):
         """send a device's RRD Files to another server"""
-        import pdb; pdb.set_trace()
-        destPerfMon = self.getDmdRoot("Monitors").getPerformanceMonitor(destServer)
-        srcPerfMon = self.getDmdRoot("Monitors").getPerformanceMonitor(srcServer)
+        monitors = self.dmd.getDmdRoot("Monitors")
+        destPerfMon = monitors.getPerformanceMonitor(destServer)
         if srcServer:
+            srcPerfMon = monitors.getPerformanceMonitor(srcServer)
             remoteUrl = '%s/moveRRDFiles?device=%s&destServer=%s' % (srcPerfMon.renderurl, device, destServer)
             urllib.urlopen(remoteUrl)
         else:
             self.packageRRDFiles(device, REQUEST)
             self.sendRRDFiles(device, destServer, REQUEST)
-            remoteUrl = '%s/unpackageRRDFiles?device=%s' % (destPerfMon.renderurl, device)
-            urllib.urlopen(remoteUrl)
-    
+            if destPerfMon.renderurl.startswith('http'):
+                remoteUrl = '%s/unpackageRRDFiles?device=%s' % (destPerfMon.renderurl, device)
+                urllib.urlopen(remoteUrl)
+            else:
+                self.unpackageRRDFiles(device, REQUEST)
+            
     security.declareProtected('View', 'plugin')
     def plugin(self, name, REQUEST=None):
         "render a custom graph and return it"

[Zenoss-commit] r4486 - trunk/scripts

[<sv...@ze...>]

Author: chris
Date: 2007-04-03 14:32:25 -0400 (Tue, 03 Apr 2007)
New Revision: 4486

Modified:
   trunk/scripts/zenpkg
Log:
change MODULES_TO_EXPORT to a dict so that we can control what nested directories appear at a top level in ZENHOME

Modified: trunk/scripts/zenpkg
===================================================================
--- trunk/scripts/zenpkg	2007-04-03 17:01:58 UTC (rev 4485)
+++ trunk/scripts/zenpkg	2007-04-03 18:32:25 UTC (rev 4486)
@@ -48,7 +48,9 @@
 opts = Opts(SVN_URL="http://dev.zenoss.org/svn",
             LIBZENOSS_ROOT="libzenoss",
             VERSION_MODULE='Products/ZenModel/ZVersion.py',
-            MODULES_TO_EXPORT=['Products', 'bin'],
+            MODULES_TO_EXPORT={'Products' : 'Products',
+                               'bin' : 'bin',
+                               'inst/fs' : 'extras'},
             DOWNLOADS_ROOT="/home/zenoss/downloads",
             SRC_BRANCH="trunk",
             CREATE_TAG=TRUE,
@@ -337,20 +339,22 @@
     run("svn co %s/%s/inst %s" % (opts.SVN_URL, copath, tagname))
     os.chdir(tagname)
 
-    # build tarballs of Products, bin, and cricket
+    # build tarballs of Products, bin, and extras
     run("rm -rf %s" % opts.LIBZENOSS_ROOT)
     run("mkdir -p %s" % opts.LIBZENOSS_ROOT)
     os.chdir(opts.LIBZENOSS_ROOT)
-    for mod in opts.MODULES_TO_EXPORT: 
-      run("svn export %s/%s/%s" % (opts.SVN_URL, copath,  mod))
-      run("tar zcf %s.tar.gz %s" % (mod, mod))
+    for mod in opts.MODULES_TO_EXPORT.keys():
+      path = opts.MODULES_TO_EXPORT[mod]
+      run("svn export %s/%s/%s %s" % (opts.SVN_URL, copath,  mod, path))
+      run("tar zcf %s.tar.gz %s" % (path, path))
 
     # read the version from ZVersion.py
     check_zversion(tagname)
 
     # remove the exports
-    for mod in opts.MODULES_TO_EXPORT: 
-      shutil.rmtree(mod)
+    for mod in opts.MODULES_TO_EXPORT.keys(): 
+      path = opts.MODULES_TO_EXPORT[mod]
+      shutil.rmtree(path)
 
     # update the zenoss.spec in the tag to reflect the new version
     os.chdir("%s/%s" % (root,tagname))

[Zenoss-commit] r4485 - in trunk/Products/ZenModel: . skins/zenmodel

[<sv...@ze...>]

Author: marc
Date: 2007-04-03 13:01:58 -0400 (Tue, 03 Apr 2007)
New Revision: 4485

Modified:
   trunk/Products/ZenModel/DeviceClass.py
   trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt
Log:
#1152
 * Added Templates tab to DeviceClasses

Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py	2007-04-03 15:31:18 UTC (rev 4484)
+++ trunk/Products/ZenModel/DeviceClass.py	2007-04-03 17:01:58 UTC (rev 4485)
@@ -117,6 +117,11 @@
                 , 'action'        : 'viewHistoryEvents'
                 , 'permissions'   : (  permissions.view, )
                 },
+                { 'id'            : 'performanceTemplates'
+                , 'name'          : 'Templates'
+                , 'action'        : 'performanceTemplates'
+                , 'permissions'   : (  permissions.view, )
+                },
             )
          },
         )

Modified: trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt	2007-04-03 15:31:18 UTC (rev 4484)
+++ trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt	2007-04-03 17:01:58 UTC (rev 4485)
@@ -7,7 +7,6 @@
     tal:define="
         tableName string:rrdtemplatelist;
         objects here/getAllRRDTemplates;
-        showfilterbox python:True;
         batch python:here.ZenTableManager.getBatch(tableName,objects);
         tabletitle string:Performance Templates; ">
 <tal:block metal:use-macro="here/zenuimacros/macros/zentable">

[Zenoss-commit] r4484 - in trunk/Products/ZenModel: . skins/zenmodel

[<sv...@ze...>]

Author: marc
Date: 2007-04-03 11:31:18 -0400 (Tue, 03 Apr 2007)
New Revision: 4484

Added:
   trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt
Modified:
   trunk/Products/ZenModel/DeviceClass.py
Log:
#1152
 * Added performanceTemplates.pt

Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py	2007-04-03 14:54:22 UTC (rev 4483)
+++ trunk/Products/ZenModel/DeviceClass.py	2007-04-03 15:31:18 UTC (rev 4484)
@@ -418,7 +418,13 @@
                 pass
         return templates.values()
             
-
+    def getAllRRDTemplates(self):
+        rrdts = self.rrdTemplates()
+        for child in self.children():
+            rrdts.extend(child.getAllRRDTemplates())
+        return rrdts
+    
+    
     security.declareProtected('Add DMD Objects', 'manage_addRRDTemplate')
     def manage_addRRDTemplate(self, id, REQUEST=None):
         """Add an RRDTemplate to this DeviceClass.

Added: trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt

[Zenoss-commit] r4483 - trunk/Products/ZenHub

[<sv...@ze...>]

Author: jstevens
Date: 2007-04-03 10:54:22 -0400 (Tue, 03 Apr 2007)
New Revision: 4483

Added:
   trunk/Products/ZenHub/pbclient2.py
Removed:
   trunk/Products/ZenHub/pbclient.py
Log:
Mac file system doesn't cope well with files in same directory that differ only in capitalization.  


Deleted: trunk/Products/ZenHub/pbclient.py

Copied: trunk/Products/ZenHub/pbclient2.py (from rev 4482, trunk/Products/ZenHub/pbclient.py)

[Zenoss-commit] r4482 - trunk/Products/ZenModel

[<sv...@ze...>]

Author: jstevens
Date: 2007-04-03 10:26:17 -0400 (Tue, 03 Apr 2007)
New Revision: 4482

Modified:
   trunk/Products/ZenModel/Device.py
   trunk/Products/ZenModel/PerformanceConf.py
   trunk/Products/ZenModel/RRDDataSource.py
Log:
Changes in support of zenweb.  These will be migrated out to a zenhub plugin for the most part soon.


Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py	2007-04-03 10:45:58 UTC (rev 4481)
+++ trunk/Products/ZenModel/Device.py	2007-04-03 14:26:17 UTC (rev 4482)
@@ -478,6 +478,7 @@
         for pc in pageChecks:
             pc['device'] = self.id
             pc['manageIp'] = self.manageIp
+            pc['timeout'] = self.zCommandCommandTimeout
         return pageChecks
 
 

Modified: trunk/Products/ZenModel/PerformanceConf.py
===================================================================
--- trunk/Products/ZenModel/PerformanceConf.py	2007-04-03 10:45:58 UTC (rev 4481)
+++ trunk/Products/ZenModel/PerformanceConf.py	2007-04-03 14:26:17 UTC (rev 4482)
@@ -263,7 +263,10 @@
         for dev in self.devices():
             if devname and dev.id != devname: continue
             dev = dev.primaryAq()
-            result += dev.getPageChecks()
+            if dev.monitorDevice():
+                result += dev.getPageChecks()
+        for testConfig in result:
+            testConfig['createRRDCommand'] = self.getDefaultRRDCreateCommand()
         return result
         
 

Modified: trunk/Products/ZenModel/RRDDataSource.py
===================================================================
--- trunk/Products/ZenModel/RRDDataSource.py	2007-04-03 10:45:58 UTC (rev 4481)
+++ trunk/Products/ZenModel/RRDDataSource.py	2007-04-03 14:26:17 UTC (rev 4482)
@@ -73,7 +73,7 @@
 
     meta_type = 'RRDDataSource'
 
-    sourcetypes = ('SNMP', 'XMLRPC', 'COMMAND') # , 'PAGECHECK')
+    sourcetypes = ('SNMP', 'XMLRPC', 'COMMAND', 'PAGECHECK')
     paramtypes = ('integer', 'string', 'float')
 
     sourcetype = 'SNMP'
@@ -257,8 +257,6 @@
             if self.userAgent:
                 go += 'agent "%s"\n' % self.userAgent
             res = go + res
-            pgm = os.path.join(os.environ['ZENHOME'], 'bin', 'testgen-twill')
-            res = "%s -q - << EOF\n%s\nEOF\n" % (pgm, res)
         elif not res.startswith('/'):
             if not res.startswith(context.zCommandPath):
                 res = os.path.join(context.zCommandPath, res)

[Zenoss-commit] r4481 - trunk/Products/ZenHub

[<sv...@ze...>]

Author: ecn
Date: 2007-04-03 06:45:58 -0400 (Tue, 03 Apr 2007)
New Revision: 4481

Modified:
   trunk/Products/ZenHub/zenhub.py
Log:
 * import things from services directory


Modified: trunk/Products/ZenHub/zenhub.py
===================================================================
--- trunk/Products/ZenHub/zenhub.py	2007-04-03 02:47:27 UTC (rev 4480)
+++ trunk/Products/ZenHub/zenhub.py	2007-04-03 10:45:58 UTC (rev 4481)
@@ -34,14 +34,9 @@
 
 from XmlRpcService import XmlRpcService
 
-from services.EventService import EventService
-from services.PerformanceConfig import PerformanceConfig
-
 import logging
 log = logging.getLogger('zenhub')
 
-SERVICE_CLASSES = (EventService, PerformanceConfig)
-
 XML_RPC_PORT = 8081
 PB_PORT = 8789
 
@@ -112,11 +107,11 @@
         try:
             return self.services[name, instance]
         except KeyError:
-            for ctor in SERVICE_CLASSES:
-                if ctor.__name__ == name:
-                    svc = ctor(self.dmd, instance)
-                    self.services[name, instance] = svc
-                    return svc
+            from Products.ZenUtils.Utils import importClass
+            ctor = importClass('services.%s' % name, name)
+            svc = ctor(self.dmd, instance)
+            self.services[name, instance] = svc
+            return svc
 
         
     def heartbeat(self):

[Zenoss-commit] r4480 - trunk/inst/docs

[<sv...@ze...>]

Author: edahl
Date: 2007-04-02 22:47:27 -0400 (Mon, 02 Apr 2007)
New Revision: 4480

Added:
   trunk/inst/docs/INSTALL_RHEL5.txt
Log:
 * RHEL 5 install instructions


Added: trunk/inst/docs/INSTALL_RHEL5.txt

[Zenoss-commit] r4479 - branches/zenoss-1.1.x/inst/rpm

[<sv...@ze...>]

Author: chris
Date: 2007-04-02 22:08:11 -0400 (Mon, 02 Apr 2007)
New Revision: 4479

Modified:
   branches/zenoss-1.1.x/inst/rpm/zenoss.spec
Log:
removed logrotate filesystem extras for now

Modified: branches/zenoss-1.1.x/inst/rpm/zenoss.spec
===================================================================
--- branches/zenoss-1.1.x/inst/rpm/zenoss.spec	2007-04-03 02:06:50 UTC (rev 4478)
+++ branches/zenoss-1.1.x/inst/rpm/zenoss.spec	2007-04-03 02:08:11 UTC (rev 4479)
@@ -178,12 +178,12 @@
 #done
 
 # update ZENHOME in the /etc/logrotate.d scripts
-LOGROTATE_DIR=${RPM_BUILD_ROOT}/etc/logrotate.d
-for file in \
-    `ls ${LOGROTATE_DIR}`
-do
-    replace "**ZENHOME**" "%{zenhome}" -- ${LOGROTATE_DIR}/${file}
-done
+#LOGROTATE_DIR=${RPM_BUILD_ROOT}/etc/logrotate.d
+#for file in \
+#    `ls ${LOGROTATE_DIR}`
+#do
+#    replace "**ZENHOME**" "%{zenhome}" -- ${LOGROTATE_DIR}/${file}
+#done
 
 
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

[Zenoss-commit] r4478 - branches/zenoss-1.1.x/inst/rpm

[<sv...@ze...>]

Author: chris
Date: 2007-04-02 22:06:50 -0400 (Mon, 02 Apr 2007)
New Revision: 4478

Modified:
   branches/zenoss-1.1.x/inst/rpm/zenoss.spec
Log:
removed filesystem extras for now

Modified: branches/zenoss-1.1.x/inst/rpm/zenoss.spec
===================================================================
--- branches/zenoss-1.1.x/inst/rpm/zenoss.spec	2007-04-03 01:36:43 UTC (rev 4477)
+++ branches/zenoss-1.1.x/inst/rpm/zenoss.spec	2007-04-03 02:06:50 UTC (rev 4478)
@@ -164,19 +164,19 @@
 cp ${ZEN_BUILD_DIR}/install-functions.sh ${ZEN_INST_DIR}/bin
 
 # copy filesystem scripts to the real filesystem
-cd ${ZEN_BUILD_DIR}/extras
-for file in \
-    `find . -type f | grep -v .svn`
-do
-    DEST=${RPM_BUILD_ROOT}/etc/${file}
-    DIR=`dirname $DEST`
-    if [ ! -d ${DIR} ]; then
-        mkdir -p ${DIR}
-    fi
+#cd ${ZEN_BUILD_DIR}/extras
+#for file in \
+#    `find . -type f | grep -v .svn`
+#do
+#    DEST=${RPM_BUILD_ROOT}/etc/${file}
+#    DIR=`dirname $DEST`
+#    if [ ! -d ${DIR} ]; then
+#        mkdir -p ${DIR}
+#    fi
+#
+#    cp ${file} ${DEST}
+#done
 
-    cp ${file} ${DEST}
-done
-
 # update ZENHOME in the /etc/logrotate.d scripts
 LOGROTATE_DIR=${RPM_BUILD_ROOT}/etc/logrotate.d
 for file in \

[Zenoss-commit] r4477 - tags/zenoss-1.1.2/inst/rpm

[<sv...@ze...>]

Author: chris
Date: 2007-04-02 21:36:43 -0400 (Mon, 02 Apr 2007)
New Revision: 4477

Modified:
   tags/zenoss-1.1.2/inst/rpm/zenoss.spec
Log:
 * synchronized with tagname by zenpkg

Modified: tags/zenoss-1.1.2/inst/rpm/zenoss.spec
===================================================================
--- tags/zenoss-1.1.2/inst/rpm/zenoss.spec	2007-04-03 01:34:45 UTC (rev 4476)
+++ tags/zenoss-1.1.2/inst/rpm/zenoss.spec	2007-04-03 01:36:43 UTC (rev 4477)
@@ -27,7 +27,7 @@
 # set to 1 if the version of the software to be built is the trunk
 # if trunk is set to 0 the version will be extrapolated from the
 # rpm information contained in the %{version} and %{release} vars
-%define trunk 1
+%define trunk 0
 
 # the name of the ctl file for zenoss (in /etc/rc.d/rc#.d)
 %define S_zenoss S99zenoss
@@ -41,8 +41,8 @@
 # the RPM meta information
 Name:     zenoss
 Summary:  The Open Source Network Management System
-Version:  1.1.0
-Release:  0
+Version: 1.1.2
+Release: 0
 License:  GPL
 Vendor:   Zenoss, Inc.
 Packager: Christopher Blunck <ch...@ze...>

[Zenoss-commit] r4476 - tags

[<sv...@ze...>]

Author: chris
Date: 2007-04-02 21:34:45 -0400 (Mon, 02 Apr 2007)
New Revision: 4476

Added:
   tags/zenoss-1.1.2/
Log:
 * auto-build of zenoss-1.1.2 by zenpkg

Copied: tags/zenoss-1.1.2 (from rev 4475, branches/zenoss-1.1.x)

[Zenoss-commit] r4475 - branches/zenoss-1.1.x/Products/ZenModel

[<sv...@ze...>]

Author: chris
Date: 2007-04-02 21:34:08 -0400 (Mon, 02 Apr 2007)
New Revision: 4475

Modified:
   branches/zenoss-1.1.x/Products/ZenModel/ZVersion.py
Log:
bumped

Modified: branches/zenoss-1.1.x/Products/ZenModel/ZVersion.py
===================================================================
--- branches/zenoss-1.1.x/Products/ZenModel/ZVersion.py	2007-04-03 01:31:18 UTC (rev 4474)
+++ branches/zenoss-1.1.x/Products/ZenModel/ZVersion.py	2007-04-03 01:34:08 UTC (rev 4475)
@@ -1 +1 @@
-VERSION="1.1.1"
+VERSION="1.1.2"

[Zenoss-commit] r4474 - in branches/zenoss-1.1.x/inst: . rpm

[<sv...@ze...>]

Author: chris
Date: 2007-04-02 21:31:18 -0400 (Mon, 02 Apr 2007)
New Revision: 4474

Added:
   branches/zenoss-1.1.x/inst/rpm/
   branches/zenoss-1.1.x/inst/rpm/centos43.deps
   branches/zenoss-1.1.x/inst/rpm/centos492.deps
   branches/zenoss-1.1.x/inst/rpm/fc6.deps
   branches/zenoss-1.1.x/inst/rpm/rhel5.deps
   branches/zenoss-1.1.x/inst/rpm/zenoss-plugins.spec
   branches/zenoss-1.1.x/inst/rpm/zenoss.spec
Removed:
   branches/zenoss-1.1.x/inst/zenoss-plugins.spec
   branches/zenoss-1.1.x/inst/zenoss.spec
Log:
incorporated latest trunk changes to support native dependencies

Added: branches/zenoss-1.1.x/inst/rpm/centos43.deps

Added: branches/zenoss-1.1.x/inst/rpm/centos492.deps

Added: branches/zenoss-1.1.x/inst/rpm/fc6.deps

Added: branches/zenoss-1.1.x/inst/rpm/rhel5.deps

Added: branches/zenoss-1.1.x/inst/rpm/zenoss-plugins.spec

Added: branches/zenoss-1.1.x/inst/rpm/zenoss.spec

Deleted: branches/zenoss-1.1.x/inst/zenoss-plugins.spec

Deleted: branches/zenoss-1.1.x/inst/zenoss.spec

[Zenoss-commit] r4473 - trunk/inst/docs

[<sv...@ze...>]

Author: chris
Date: 2007-04-02 20:58:17 -0400 (Mon, 02 Apr 2007)
New Revision: 4473

Modified:
   trunk/inst/docs/INSTALL_CentOS5.txt
Log:
forgot the header

Modified: trunk/inst/docs/INSTALL_CentOS5.txt
===================================================================
--- trunk/inst/docs/INSTALL_CentOS5.txt	2007-04-03 00:57:51 UTC (rev 4472)
+++ trunk/inst/docs/INSTALL_CentOS5.txt	2007-04-03 00:58:17 UTC (rev 4473)
@@ -1,4 +1,4 @@
-CentOS 4.3 and RHEL 4.3 RPM Installation Instructions
+CentOS 5 and RHEL 5 RPM Installation Instructions
 
 Both CentOS 5 and RHEL 5 use the same underlying operating system.
 Accordingly, system administrators on both platforms can use these

[Zenoss-commit] r4472 - trunk/inst/docs

[<sv...@ze...>]

Author: chris
Date: 2007-04-02 20:57:51 -0400 (Mon, 02 Apr 2007)
New Revision: 4472

Added:
   trunk/inst/docs/INSTALL_CentOS5.txt
Log:
added

Added: trunk/inst/docs/INSTALL_CentOS5.txt

[Zenoss-commit] r4471 - trunk/Products/DataCollector

[<sv...@ze...>]

Author: chris
Date: 2007-04-02 20:40:45 -0400 (Mon, 02 Apr 2007)
New Revision: 4471

Modified:
   trunk/Products/DataCollector/zenmodeler.py
Log:
fixed import error.  can probably remove this import since the function is not used

Modified: trunk/Products/DataCollector/zenmodeler.py
===================================================================
--- trunk/Products/DataCollector/zenmodeler.py	2007-04-03 00:39:31 UTC (rev 4470)
+++ trunk/Products/DataCollector/zenmodeler.py	2007-04-03 00:40:45 UTC (rev 4471)
@@ -31,7 +31,7 @@
 defaultPort = 22
 defaultStartSleep = 10 * 60
 
-from Plugins import loadPluginDir
+from Plugins import _loadPluginDir
 
 class ZenModeler(ZCmdBase):