Menu
▾
▴
zenoss-commit — svn commit list
You can subscribe to this list here.
| 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
|
|
From: <sv...@ze...> - 2008-05-12 19:35:53
|
Author: buildslave Date: 2008-05-12 15:36:01 -0400 (Mon, 12 May 2008) New Revision: 9212 Added: tags/zenoss-2.2.0/ Log: Tagging zenoss-2.2.0 from branches/zenoss-2.2.x Copied: tags/zenoss-2.2.0 (from rev 9211, branches/zenoss-2.2.x) |
|
From: <sv...@ze...> - 2008-05-12 19:35:47
|
Author: buildslave Date: 2008-05-12 15:35:55 -0400 (Mon, 12 May 2008) New Revision: 9211 Removed: tags/zenoss-2.2.0/ Log: cleanup |
|
From: <sv...@ze...> - 2008-05-12 19:35:28
|
Author: ecn
Date: 2008-05-12 15:35:36 -0400 (Mon, 12 May 2008)
New Revision: 9210
Modified:
branches/zenoss-2.2.x/Products/ZenModel/data/exportXml.sh
branches/zenoss-2.2.x/Products/ZenModel/data/monitorTemplate.xml
Log:
refs #3118 : remove zenwinmodelers from the performance templates
Modified: branches/zenoss-2.2.x/Products/ZenModel/data/exportXml.sh
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/data/exportXml.sh 2008-05-12 18:44:06 UTC (rev 9209)
+++ branches/zenoss-2.2.x/Products/ZenModel/data/exportXml.sh 2008-05-12 19:35:36 UTC (rev 9210)
@@ -16,6 +16,9 @@
fp.close()
EOF
+echo 'monitor templates'
+zendump -R /zport/dmd/Monitors --ignore instances -o monitorTemplate.xml
+replace "id='/zport/dmd'" "id='/zport/dmd/Monitors'" -- monitorTemplate.xml
echo 'devices...\c'
zendump -R /zport/dmd/Devices --ignore devices -o devices.xml
echo 'services...\c'
Modified: branches/zenoss-2.2.x/Products/ZenModel/data/monitorTemplate.xml
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/data/monitorTemplate.xml 2008-05-12 18:44:06 UTC (rev 9209)
+++ branches/zenoss-2.2.x/Products/ZenModel/data/monitorTemplate.xml 2008-05-12 19:35:36 UTC (rev 9210)
@@ -498,39 +498,7 @@
</object>
</tomanycont>
</object>
-<object id='zenwinmodeler' module='Products.ZenModel.BuiltInDS' class='BuiltInDS'>
-<property select_variable="sourcetypes" type="selection" id="sourcetype" mode="w" >
-Built-In
-</property>
-<property type="boolean" id="enabled" mode="w" >
-True
-</property>
-<property type="int" id="severity" mode="w" >
-3
-</property>
-<property type="int" id="cycletime" mode="w" >
-300
-</property>
-<tomanycont id='datapoints'>
-<object id='cycleTime' module='Products.ZenModel.RRDDataPoint' class='RRDDataPoint'>
-<property select_variable="rrdtypes" type="selection" id="rrdtype" mode="w" >
-GAUGE
-</property>
-<property type="boolean" id="isrow" mode="w" >
-True
-</property>
-</object>
-<object id='devices' module='Products.ZenModel.RRDDataPoint' class='RRDDataPoint'>
-<property select_variable="rrdtypes" type="selection" id="rrdtype" mode="w" >
-GAUGE
-</property>
-<property type="boolean" id="isrow" mode="w" >
-True
-</property>
-</object>
</tomanycont>
-</object>
-</tomanycont>
<tomanycont id='thresholds'>
<object id='zeneventlog cycle time' module='Products.ZenModel.MinMaxThreshold' class='MinMaxThreshold'>
<property type="lines" id="dsnames" mode="w" >
@@ -652,26 +620,6 @@
5
</property>
</object>
-<object id='zenwinmodeler cycle time' module='Products.ZenModel.MinMaxThreshold' class='MinMaxThreshold'>
-<property type="lines" id="dsnames" mode="w" >
-['zenwinmodeler_cycleTime']
-</property>
-<property type="boolean" id="enabled" mode="w" >
-True
-</property>
-<property type="string" id="maxval" mode="w" >
-here.winmodelerCycleInterval *0.8
-</property>
-<property type="string" id="eventClass" mode="w" >
-/Perf
-</property>
-<property type="int" id="severity" mode="w" >
-4
-</property>
-<property type="int" id="escalateCount" mode="w" >
-5
-</property>
-</object>
</tomanycont>
<tomanycont id='graphDefs'>
<object id='Collected Events' module='Products.ZenModel.GraphDefinition' class='GraphDefinition'>
@@ -1139,38 +1087,6 @@
AVERAGE
</property>
</object>
-<object id='zenwinmodeler' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
-<property type="long" id="sequence" mode="w" >
-5
-</property>
-<property select_variable="lineTypes" type="selection" id="lineType" mode="w" >
-LINE
-</property>
-<property type="long" id="lineWidth" mode="w" >
-1
-</property>
-<property type="boolean" id="stacked" mode="w" >
-False
-</property>
-<property type="string" id="format" mode="w" >
-%5.2lf%s
-</property>
-<property type="string" id="legend" mode="w" >
-${graphPoint/id}
-</property>
-<property type="long" id="limit" mode="w" >
--1
-</property>
-<property type="string" id="rpn" mode="w" >
-100,*,${here/winmodelerCycleInterval},/
-</property>
-<property type="string" id="dpName" mode="w" >
-zenwinmodeler_cycleTime
-</property>
-<property type="string" id="cFunc" mode="w" >
-AVERAGE
-</property>
-</object>
</tomanycont>
</object>
<object id='Data Point Rate' module='Products.ZenModel.GraphDefinition' class='GraphDefinition'>
@@ -1894,39 +1810,7 @@
</object>
</tomanycont>
</object>
-<object id='zenwinmodeler' module='Products.ZenModel.BuiltInDS' class='BuiltInDS'>
-<property select_variable="sourcetypes" type="selection" id="sourcetype" mode="w" >
-Built-In
-</property>
-<property type="boolean" id="enabled" mode="w" >
-True
-</property>
-<property type="int" id="severity" mode="w" >
-3
-</property>
-<property type="int" id="cycletime" mode="w" >
-300
-</property>
-<tomanycont id='datapoints'>
-<object id='cycleTime' module='Products.ZenModel.RRDDataPoint' class='RRDDataPoint'>
-<property select_variable="rrdtypes" type="selection" id="rrdtype" mode="w" >
-GAUGE
-</property>
-<property type="boolean" id="isrow" mode="w" >
-True
-</property>
-</object>
-<object id='devices' module='Products.ZenModel.RRDDataPoint' class='RRDDataPoint'>
-<property select_variable="rrdtypes" type="selection" id="rrdtype" mode="w" >
-GAUGE
-</property>
-<property type="boolean" id="isrow" mode="w" >
-True
-</property>
-</object>
</tomanycont>
-</object>
-</tomanycont>
<tomanycont id='thresholds'>
<object id='zeneventlog cycle time' module='Products.ZenModel.MinMaxThreshold' class='MinMaxThreshold'>
<property type="lines" id="dsnames" mode="w" >
@@ -2048,26 +1932,6 @@
5
</property>
</object>
-<object id='zenwinmodeler cycle time' module='Products.ZenModel.MinMaxThreshold' class='MinMaxThreshold'>
-<property type="lines" id="dsnames" mode="w" >
-['zenwinmodeler_cycleTime']
-</property>
-<property type="boolean" id="enabled" mode="w" >
-True
-</property>
-<property type="string" id="maxval" mode="w" >
-here.winmodelerCycleInterval *0.8
-</property>
-<property type="string" id="eventClass" mode="w" >
-/Perf
-</property>
-<property type="int" id="severity" mode="w" >
-4
-</property>
-<property type="int" id="escalateCount" mode="w" >
-5
-</property>
-</object>
</tomanycont>
<tomanycont id='graphDefs'>
<object id='Collected Events' module='Products.ZenModel.GraphDefinition' class='GraphDefinition'>
@@ -2535,38 +2399,6 @@
AVERAGE
</property>
</object>
-<object id='zenwinmodeler' module='Products.ZenModel.DataPointGraphPoint' class='DataPointGraphPoint'>
-<property type="long" id="sequence" mode="w" >
-5
-</property>
-<property select_variable="lineTypes" type="selection" id="lineType" mode="w" >
-LINE
-</property>
-<property type="long" id="lineWidth" mode="w" >
-1
-</property>
-<property type="boolean" id="stacked" mode="w" >
-False
-</property>
-<property type="string" id="format" mode="w" >
-%5.2lf%s
-</property>
-<property type="string" id="legend" mode="w" >
-${graphPoint/id}
-</property>
-<property type="long" id="limit" mode="w" >
--1
-</property>
-<property type="string" id="rpn" mode="w" >
-100,*,${here/winmodelerCycleInterval},/
-</property>
-<property type="string" id="dpName" mode="w" >
-zenwinmodeler_cycleTime
-</property>
-<property type="string" id="cFunc" mode="w" >
-AVERAGE
-</property>
-</object>
</tomanycont>
</object>
<object id='Data Point Rate' module='Products.ZenModel.GraphDefinition' class='GraphDefinition'>
|
|
From: <sv...@ze...> - 2008-05-12 18:44:26
|
Author: buildslave Date: 2008-05-12 14:03:56 -0400 (Mon, 12 May 2008) New Revision: 9208 Added: tags/zenoss-2.2.0/ Log: Tagging zenoss-2.2.0 from branches/zenoss-2.2.x Copied: tags/zenoss-2.2.0 (from rev 9207, branches/zenoss-2.2.x) |
|
From: <sv...@ze...> - 2008-05-12 18:43:58
|
Author: cluther
Date: 2008-05-12 14:44:06 -0400 (Mon, 12 May 2008)
New Revision: 9209
Modified:
trunk/Products/ZenEvents/Availability.py
Log:
* Fixes #3141: Exclude non-production events from availability calculations.
Modified: trunk/Products/ZenEvents/Availability.py
===================================================================
--- trunk/Products/ZenEvents/Availability.py 2008-05-12 18:03:56 UTC (rev 9208)
+++ trunk/Products/ZenEvents/Availability.py 2008-05-12 18:44:06 UTC (rev 9209)
@@ -122,6 +122,7 @@
w += ' AND firstTime <= %(endDate)s '
w += ' AND firstTime != lastTime '
w += " AND eventClass = '%(eventClass)s' "
+ w += " AND prodState >= 1000 "
if self.device:
w += " AND device = '%(device)s' "
if self.component:
|
|
From: <sv...@ze...> - 2008-05-12 16:23:56
|
Author: ecn
Date: 2008-05-12 12:24:03 -0400 (Mon, 12 May 2008)
New Revision: 9207
Modified:
branches/zenoss-2.2.x/Products/ZenModel/data/menus.xml
Log:
exporting XML for zenoss-2.2.0 release
Modified: branches/zenoss-2.2.x/Products/ZenModel/data/menus.xml
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/data/menus.xml 2008-05-12 15:52:48 UTC (rev 9206)
+++ branches/zenoss-2.2.x/Products/ZenModel/data/menus.xml 2008-05-12 16:24:03 UTC (rev 9207)
@@ -680,7 +680,7 @@
</object>
<object id='setPerformanceMonitor_grid' module='Products.ZenModel.ZenMenuItem' class='ZenMenuItem'>
<property type="text" id="description" mode="w" >
-Set Perf Monitor...
+Set Collector...
</property>
<property type="text" id="action" mode="w" >
dialog_setPerformanceMonitor_grid
@@ -876,7 +876,7 @@
</object>
<object id='setPerformanceMonitor' module='Products.ZenModel.ZenMenuItem' class='ZenMenuItem'>
<property type="text" id="description" mode="w" >
-Set Perf Monitor...
+Set Collector...
</property>
<property type="text" id="action" mode="w" >
dialog_setPerformanceMonitor
@@ -1260,6 +1260,29 @@
80.0
</property>
</object>
+<object id='addEventList' module='Products.ZenModel.ZenMenuItem' class='ZenMenuItem'>
+<property type="text" id="description" mode="w" >
+Add Event...
+</property>
+<property type="text" id="action" mode="w" >
+dialog_addEvent
+</property>
+<property type="boolean" id="isglobal" mode="w" >
+True
+</property>
+<property type="lines" id="permissions" mode="w" >
+('Manage DMD',)
+</property>
+<property type="lines" id="allowed_classes" mode="w" >
+['EventClass']
+</property>
+<property type="boolean" id="isdialog" mode="w" >
+True
+</property>
+<property type="float" id="ordering" mode="w" >
+80.0
+</property>
+</object>
<object id='createEventMap' module='Products.ZenModel.ZenMenuItem' class='ZenMenuItem'>
<property type="text" id="description" mode="w" >
Map Events to Class...
@@ -3396,7 +3419,7 @@
<tomanycont id='zenMenuItems'>
<object id='addPMonitor' module='Products.ZenModel.ZenMenuItem' class='ZenMenuItem'>
<property type="text" id="description" mode="w" >
-Add Monitor...
+Add Collector...
</property>
<property type="text" id="action" mode="w" >
dialog_addMonitor
@@ -3436,7 +3459,7 @@
</object>
<object id='removePMonitors' module='Products.ZenModel.ZenMenuItem' class='ZenMenuItem'>
<property type="text" id="description" mode="w" >
-Delete Monitors...
+Delete Collectors...
</property>
<property type="text" id="action" mode="w" >
dialog_removeMonitors
@@ -3873,30 +3896,6 @@
</object>
</tomanycont>
</object>
-<object id='StatusMonitor_list' module='Products.ZenModel.ZenMenu' class='ZenMenu'>
-<tomanycont id='zenMenuItems'>
-<object id='performanceTemplates' module='Products.ZenModel.ZenMenuItem' class='ZenMenuItem'>
-<property type="text" id="description" mode="w" >
-Templates
-</property>
-<property type="text" id="action" mode="w" >
-performanceTemplates
-</property>
-<property type="boolean" id="isglobal" mode="w" >
-True
-</property>
-<property type="lines" id="permissions" mode="w" >
-('View Device',)
-</property>
-<property type="boolean" id="isdialog" mode="w" >
-False
-</property>
-<property type="float" id="ordering" mode="w" >
-16.0
-</property>
-</object>
-</tomanycont>
-</object>
<object id='Subnetworks' module='Products.ZenModel.ZenMenu' class='ZenMenu'>
<tomanycont id='zenMenuItems'>
<object id='addNetwork' module='Products.ZenModel.ZenMenuItem' class='ZenMenuItem'>
|
|
From: <sv...@ze...> - 2008-05-12 15:52:40
|
Author: ecn
Date: 2008-05-12 11:52:48 -0400 (Mon, 12 May 2008)
New Revision: 9206
Added:
branches/zenoss-2.2.x/Products/ZenModel/migrate/removeWinModelerGraphPoints.py
Modified:
branches/zenoss-2.2.x/Products/DataCollector/WmiClient.py
branches/zenoss-2.2.x/Products/ZenModel/Device.py
branches/zenoss-2.2.x/Products/ZenModel/LinkManager.py
branches/zenoss-2.2.x/Products/ZenModel/migrate/__init__.py
branches/zenoss-2.2.x/Products/ZenModel/tests/testLinking.py
branches/zenoss-2.2.x/Products/ZenWin/WinCollector.py
Log:
patch in approved changes for these tickets: #3125 #3123 #3122 #3118
Modified: branches/zenoss-2.2.x/Products/DataCollector/WmiClient.py
===================================================================
--- branches/zenoss-2.2.x/Products/DataCollector/WmiClient.py 2008-05-12 14:29:54 UTC (rev 9205)
+++ branches/zenoss-2.2.x/Products/DataCollector/WmiClient.py 2008-05-12 15:52:48 UTC (rev 9206)
@@ -35,6 +35,7 @@
self.process = None
def stop(self):
+ import signal
if not self.process:
return
try:
@@ -53,5 +54,5 @@
args = ('run', '-d', self.device.id)
if '--weblog' in sys.argv:
args += ('--weblog',)
- reactor.spawnProcess(self, modeler, (modeler,) + args, env=None)
+ self.process = reactor.spawnProcess(self, modeler, (modeler,) + args, env=None)
Modified: branches/zenoss-2.2.x/Products/ZenModel/Device.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/Device.py 2008-05-12 14:29:54 UTC (rev 9205)
+++ branches/zenoss-2.2.x/Products/ZenModel/Device.py 2008-05-12 15:52:48 UTC (rev 9206)
@@ -171,7 +171,8 @@
communities.extend(getattr(devroot, "zSnmpCommunities", []))
if not port: port = getattr(devroot, "zSnmpPort", 161)
versions = ('v2c', 'v1')
- if version: versions = (version)
+ if not version: version = getattr(devroot, 'zSnmpVer', None)
+ if version: versions = (version,)
timeout = getattr(devroot, "zSnmpTimeout", 2)
retries = getattr(devroot, "zSnmpTries", 2)
session = SnmpSession(ip, timeout=timeout, port=port, retries=retries)
Modified: branches/zenoss-2.2.x/Products/ZenModel/LinkManager.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/LinkManager.py 2008-05-12 14:29:54 UTC (rev 9205)
+++ branches/zenoss-2.2.x/Products/ZenModel/LinkManager.py 2008-05-12 15:52:48 UTC (rev 9206)
@@ -168,7 +168,8 @@
bynet = {}
for k, g in groupby(links, _whichnet):
- bynet.setdefault(k, []).extend(g)
+ if getattr(self.dmd.Networks.getNet(k), 'zDrawMapLinks', True):
+ bynet.setdefault(k, []).extend(g)
final = {}
linkobs = []
Modified: branches/zenoss-2.2.x/Products/ZenModel/migrate/__init__.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/migrate/__init__.py 2008-05-12 14:29:54 UTC (rev 9205)
+++ branches/zenoss-2.2.x/Products/ZenModel/migrate/__init__.py 2008-05-12 15:52:48 UTC (rev 9206)
@@ -144,3 +144,4 @@
import addeventmenuitem
import runcommandspermission
import winmodelerUnderModeler
+import removeWinModelerGraphPoints
Added: branches/zenoss-2.2.x/Products/ZenModel/migrate/removeWinModelerGraphPoints.py
Modified: branches/zenoss-2.2.x/Products/ZenModel/tests/testLinking.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/tests/testLinking.py 2008-05-12 14:29:54 UTC (rev 9205)
+++ branches/zenoss-2.2.x/Products/ZenModel/tests/testLinking.py 2008-05-12 15:52:48 UTC (rev 9206)
@@ -58,6 +58,46 @@
iface = dev.os.interfaces._getOb('eth%d'%iid)
iface.addIpAddress(subnet.next())
+ def testzDrawMapLinksProperty(self):
+ devs = self._makeDevices(6)
+
+ devs[0].setLocation('/A')
+ devs[1].setLocation('/A')
+ devs[2].setLocation('/B')
+ devs[3].setLocation('/C')
+ devs[4].setLocation('/D')
+ devs[5].setLocation('/A')
+
+ manage_addIpInterface(devs[0].os.interfaces, 'eth0', True)
+ iface0 = devs[0].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[1].os.interfaces, 'eth0', True)
+ iface1 = devs[1].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[2].os.interfaces, 'eth0', True)
+ iface2 = devs[2].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[3].os.interfaces, 'eth0', True)
+ iface3 = devs[3].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[4].os.interfaces, 'eth0', True)
+ iface4 = devs[4].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[5].os.interfaces, 'eth0', True)
+ iface5 = devs[5].os.interfaces._getOb('eth0')
+
+ iface0.addIpAddress('192.168.254.9/30')
+ iface2.addIpAddress('192.168.254.10/30')
+
+ iface1.addIpAddress('192.168.254.5/30')
+ iface3.addIpAddress('192.168.254.6/30')
+
+ iface4.addIpAddress('192.168.254.1/30')
+ iface5.addIpAddress('192.168.254.2/30')
+
+ nononet = self.dmd.Networks.getNet('192.168.254.8')
+ nononet.zDrawMapLinks = False
+
+ links = self.dmd.ZenLinkManager.getChildLinks(self.dmd.Locations)
+ links = simplejson.loads(links)
+ self.assertEqual(len(links), 2)
+
+
def testSlash30Nets(self):
devs = self._makeDevices(6)
Modified: branches/zenoss-2.2.x/Products/ZenWin/WinCollector.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWin/WinCollector.py 2008-05-12 14:29:54 UTC (rev 9205)
+++ branches/zenoss-2.2.x/Products/ZenWin/WinCollector.py 2008-05-12 15:52:48 UTC (rev 9206)
@@ -35,6 +35,7 @@
from NullProxy import NullProxy
from twisted.internet.defer import DeferredList
+from twisted.python.failure import Failure
MAX_THREADS_WAITING = 10
MAX_WAIT_FOR_WMI_REQUEST = 10
@@ -118,7 +119,7 @@
deferreds = self.processLoop()
if self.options.cycle:
self.heartbeat()
- except Exception, ex:
+ except (Failure, Exception), ex:
self.log.exception("Error processing main loop")
delay = time.time() - now
if self.options.cycle:
|
|
From: <sv...@ze...> - 2008-05-12 14:29:47
|
Author: ecn
Date: 2008-05-12 10:29:54 -0400 (Mon, 12 May 2008)
New Revision: 9205
Modified:
trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py
Log:
* refs #3118: use a more descriptive method name
Modified: trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py
===================================================================
--- trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py 2008-05-10 01:38:10 UTC (rev 9204)
+++ trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py 2008-05-12 14:29:54 UTC (rev 9205)
@@ -15,7 +15,7 @@
class RemoveWinModelerGraphPoints(Migrate.Step):
version = Migrate.Version(2, 2, 0)
- def balete(self, dmd, path):
+ def deleteLastObjectOnPath(self, dmd, path):
parts = path.split('/')
obj = dmd
for part in parts[:-1]:
@@ -31,7 +31,7 @@
]
for path in paths:
try:
- self.balete(dmd, path)
+ self.deleteLastObjectOnPath(dmd, path)
except AttributeError:
pass
|
|
From: <sv...@ze...> - 2008-05-10 01:38:02
|
Author: ian
Date: 2008-05-09 21:38:10 -0400 (Fri, 09 May 2008)
New Revision: 9204
Modified:
trunk/Products/ZenModel/LinkManager.py
trunk/Products/ZenModel/tests/testLinking.py
Log:
* Fixes #3123: Caused zDrawMapLinks to work again, although at a decrease in efficiency. Now we have to load all the network objects.
Modified: trunk/Products/ZenModel/LinkManager.py
===================================================================
--- trunk/Products/ZenModel/LinkManager.py 2008-05-10 01:23:49 UTC (rev 9203)
+++ trunk/Products/ZenModel/LinkManager.py 2008-05-10 01:38:10 UTC (rev 9204)
@@ -168,7 +168,8 @@
bynet = {}
for k, g in groupby(links, _whichnet):
- bynet.setdefault(k, []).extend(g)
+ if getattr(self.dmd.Networks.getNet(k), 'zDrawMapLinks', True):
+ bynet.setdefault(k, []).extend(g)
final = {}
linkobs = []
Modified: trunk/Products/ZenModel/tests/testLinking.py
===================================================================
--- trunk/Products/ZenModel/tests/testLinking.py 2008-05-10 01:23:49 UTC (rev 9203)
+++ trunk/Products/ZenModel/tests/testLinking.py 2008-05-10 01:38:10 UTC (rev 9204)
@@ -58,6 +58,46 @@
iface = dev.os.interfaces._getOb('eth%d'%iid)
iface.addIpAddress(subnet.next())
+ def testzDrawMapLinksProperty(self):
+ devs = self._makeDevices(6)
+
+ devs[0].setLocation('/A')
+ devs[1].setLocation('/A')
+ devs[2].setLocation('/B')
+ devs[3].setLocation('/C')
+ devs[4].setLocation('/D')
+ devs[5].setLocation('/A')
+
+ manage_addIpInterface(devs[0].os.interfaces, 'eth0', True)
+ iface0 = devs[0].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[1].os.interfaces, 'eth0', True)
+ iface1 = devs[1].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[2].os.interfaces, 'eth0', True)
+ iface2 = devs[2].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[3].os.interfaces, 'eth0', True)
+ iface3 = devs[3].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[4].os.interfaces, 'eth0', True)
+ iface4 = devs[4].os.interfaces._getOb('eth0')
+ manage_addIpInterface(devs[5].os.interfaces, 'eth0', True)
+ iface5 = devs[5].os.interfaces._getOb('eth0')
+
+ iface0.addIpAddress('192.168.254.9/30')
+ iface2.addIpAddress('192.168.254.10/30')
+
+ iface1.addIpAddress('192.168.254.5/30')
+ iface3.addIpAddress('192.168.254.6/30')
+
+ iface4.addIpAddress('192.168.254.1/30')
+ iface5.addIpAddress('192.168.254.2/30')
+
+ nononet = self.dmd.Networks.getNet('192.168.254.8')
+ nononet.zDrawMapLinks = False
+
+ links = self.dmd.ZenLinkManager.getChildLinks(self.dmd.Locations)
+ links = simplejson.loads(links)
+ self.assertEqual(len(links), 2)
+
+
def testSlash30Nets(self):
devs = self._makeDevices(6)
|
|
From: <sv...@ze...> - 2008-05-10 01:23:42
|
Author: ian
Date: 2008-05-09 21:23:49 -0400 (Fri, 09 May 2008)
New Revision: 9203
Modified:
trunk/Products/ZenModel/Device.py
Log:
* Fixes #939: manage_createDevice will now respect zSnmpVer on the device class
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2008-05-10 01:16:11 UTC (rev 9202)
+++ trunk/Products/ZenModel/Device.py 2008-05-10 01:23:49 UTC (rev 9203)
@@ -171,7 +171,8 @@
communities.extend(getattr(devroot, "zSnmpCommunities", []))
if not port: port = getattr(devroot, "zSnmpPort", 161)
versions = ('v2c', 'v1')
- if version: versions = (version)
+ if not version: version = getattr(devroot, 'zSnmpVer', None)
+ if version: versions = (version,)
timeout = getattr(devroot, "zSnmpTimeout", 2)
retries = getattr(devroot, "zSnmpTries", 2)
session = SnmpSession(ip, timeout=timeout, port=port, retries=retries)
|
|
From: <sv...@ze...> - 2008-05-10 01:16:04
|
Author: ian
Date: 2008-05-09 21:16:11 -0400 (Fri, 09 May 2008)
New Revision: 9202
Modified:
trunk/Products/DataCollector/zendisc.py
trunk/Products/ZenHub/services/DiscoverService.py
Log:
* Make zendisc accept a hostname to discover
Modified: trunk/Products/DataCollector/zendisc.py
===================================================================
--- trunk/Products/DataCollector/zendisc.py 2008-05-09 20:50:54 UTC (rev 9201)
+++ trunk/Products/DataCollector/zendisc.py 2008-05-10 01:16:11 UTC (rev 9202)
@@ -19,7 +19,9 @@
from Products.ZenUtils.Utils import unused
from Products.ZenUtils.Driver import drive
from Products.ZenUtils.IpUtil import asyncNameLookup
+from Products.ZenUtils.IpUtil import isip
from Products.ZenUtils.NJobs import NJobs
+from Products.ZenModel.Exceptions import NoIPAddress
from Products.ZenEvents.ZenEventClasses import Status_Snmp
from Products.ZenEvents.Event import Info
from Products.ZenStatus.AsyncPing import Ping
@@ -194,6 +196,7 @@
return drive(inner)
+
def discoverDevice(self, ip, devicepath="/Discovered", prodState=1000):
"""Discover a device based on its ip address.
"""
@@ -322,6 +325,33 @@
self.log.info("Result: %s", results)
self.main()
+ def createDevice(self, driver):
+ """
+ Add a device to the system by name or ip.
+ """
+ deviceName = self.options.device
+ self.log.info("Looking for %s" % deviceName)
+ ip = None
+ if isip(deviceName):
+ ip = deviceName
+ else:
+ try:
+ ip = socket.gethostbyname(deviceName)
+ except socket.error:
+ ip = ""
+ if not ip:
+ raise NoIPAddress("No IP found for name %s" % deviceName)
+ else:
+ self.log.info("Found IP %s for device %s" % (ip, deviceName))
+ yield self.config().callRemote('getDeviceConfig', [deviceName])
+ me, = driver.next() or [None]
+ if not me or self.options.remodel:
+ yield self.discoverDevice(ip,
+ devicepath=self.options.deviceclass,
+ prodState=self.options.productionState)
+ yield succeed("Discovered device.")
+ driver.next()
+
def walkDiscovery(self, driver):
myname = socket.getfqdn()
self.log.info("my hostname = %s", myname)
@@ -364,37 +394,39 @@
self.log.info('connected to ZenHub')
if self.options.walk:
d = drive(self.walkDiscovery)
+ elif self.options.device:
+ d = drive(self.createDevice)
else:
d = drive(self.collectNet)
d.addBoth(self.printResults)
def autoAllocate(self, device=None):
- """Execute a script that will auto allocate devices into their
- Device Classes"""
- self.log.debug("trying to auto-allocate device %s" % device.id )
- if not device:
- return
+ """Execute a script that will auto allocate devices into their
+ Device Classes"""
+ self.log.debug("trying to auto-allocate device %s" % device.id )
+ if not device:
+ return
+ script = getattr(device, "zAutoAllocateScript", None)
+ self.log.debug("no auto-allocation script found")
+ if script:
+ import string
+ script = string.join(script, "\n")
+ self.log.debug("using script\n%s" % script)
+ try:
+ compile(script, "zAutoAllocateScript", "exec")
+ except:
+ self.log.error("zAutoAllocateScript contains error")
+ return
+ vars = {'dev': device, 'log': self.log}
+ try:
+ exec(script, vars)
+ except:
+ self.log.error(
+ "error executing zAutoAllocateScript:\n%s" % script)
+ return vars.get('devicePath', None)
+ return
- script = getattr(device, "zAutoAllocateScript", None)
- self.log.debug("no auto-allocation script found")
- if script:
- import string
- script = string.join(script, "\n")
- self.log.debug("using script\n%s" % script)
- try:
- compile(script, "zAutoAllocateScript", "exec")
- except:
- self.log.error("zAutoAllocateScript contains error")
- return
- vars = {'dev': device, 'log': self.log}
- try:
- exec(script, vars)
- except:
- self.log.error("error executing zAutoAllocateScript:\n%s" % script)
- return vars.get('devicePath', None)
- return
-
def buildOptions(self):
ZenModeler.buildOptions(self)
self.parser.add_option('--net', dest='net', action="append",
Modified: trunk/Products/ZenHub/services/DiscoverService.py
===================================================================
--- trunk/Products/ZenHub/services/DiscoverService.py 2008-05-09 20:50:54 UTC (rev 9201)
+++ trunk/Products/ZenHub/services/DiscoverService.py 2008-05-10 01:16:11 UTC (rev 9202)
@@ -125,7 +125,6 @@
self.dmd.ZenEventManager.sendEvent(evt)
-
@translateError
def remote_createDevice(self, ip, **kw):
"""Create a device.
@@ -135,7 +134,7 @@
"""
if not isip(ip):
ip = socket.gethostbyname(ip)
- ipobj = self.dmd.Networks.findIp(ip)
+ ipobj = self.dmd.Networks.createIp(ip)
if not ipobj and not getattr(ipobj, "zAutoDiscover", True):
# self.log.info("ip '%s' on no auto-discover, skipping",ip)
return
|
|
From: <sv...@ze...> - 2008-05-09 20:50:47
|
Author: abray Date: 2008-05-09 16:50:54 -0400 (Fri, 09 May 2008) New Revision: 9201 Added: trunk/zendocs/AdminGuide/docbook/DigMonitorZenPack.xml trunk/zendocs/AdminGuide/docbook/FTPMonitorZenPack.xml trunk/zendocs/AdminGuide/docbook/IRCMonZenPack.xml trunk/zendocs/AdminGuide/docbook/JabberMonitorZenPack.xml trunk/zendocs/AdminGuide/docbook/LDAPMonZenPack.xml trunk/zendocs/AdminGuide/docbook/NNTPMonitorZenPack.xml trunk/zendocs/AdminGuide/docbook/NtpMonitorZenPack.xml trunk/zendocs/AdminGuide/docbook/RPCMonitorZenPack.xml Log: adding zenpack docs Added: trunk/zendocs/AdminGuide/docbook/DigMonitorZenPack.xml Added: trunk/zendocs/AdminGuide/docbook/FTPMonitorZenPack.xml Added: trunk/zendocs/AdminGuide/docbook/IRCMonZenPack.xml Added: trunk/zendocs/AdminGuide/docbook/JabberMonitorZenPack.xml Added: trunk/zendocs/AdminGuide/docbook/LDAPMonZenPack.xml Added: trunk/zendocs/AdminGuide/docbook/NNTPMonitorZenPack.xml Added: trunk/zendocs/AdminGuide/docbook/NtpMonitorZenPack.xml Added: trunk/zendocs/AdminGuide/docbook/RPCMonitorZenPack.xml |
|
From: <sv...@ze...> - 2008-05-09 20:31:57
|
Author: abray Date: 2008-05-09 16:32:02 -0400 (Fri, 09 May 2008) New Revision: 9200 Modified: trunk/zendocs/AdminGuide/docbook/AckEvents.xml trunk/zendocs/AdminGuide/docbook/Backup-CH.xml trunk/zendocs/AdminGuide/docbook/CollectionControlxml.xml trunk/zendocs/AdminGuide/docbook/CoreZenpacks.xml trunk/zendocs/AdminGuide/docbook/CreateZenpack.xml trunk/zendocs/AdminGuide/docbook/CustomLinks.xml trunk/zendocs/AdminGuide/docbook/DPGraphPoints.xml trunk/zendocs/AdminGuide/docbook/DaemonCommands.xml trunk/zendocs/AdminGuide/docbook/DataPoints.xml trunk/zendocs/AdminGuide/docbook/DeviceClass.xml trunk/zendocs/AdminGuide/docbook/DeviceList.xml trunk/zendocs/AdminGuide/docbook/DevicePrep-APP.xml trunk/zendocs/AdminGuide/docbook/DeviceStatusTab.xml trunk/zendocs/AdminGuide/docbook/DevicezProp.xml trunk/zendocs/AdminGuide/docbook/EditUserAcct.xml trunk/zendocs/AdminGuide/docbook/EventManSettings.xml trunk/zendocs/AdminGuide/docbook/EventzPropContext.xml trunk/zendocs/AdminGuide/docbook/Groupings-CH.xml trunk/zendocs/AdminGuide/docbook/IndDevTabs.xml trunk/zendocs/AdminGuide/docbook/Introduction-CH.xml trunk/zendocs/AdminGuide/docbook/MaintenanceWindows.xml trunk/zendocs/AdminGuide/docbook/ManagingDevices.xml trunk/zendocs/AdminGuide/docbook/MinZeoZope.xml trunk/zendocs/AdminGuide/docbook/MonitorRemoteSSH.xml trunk/zendocs/AdminGuide/docbook/MoveToHistory.xml trunk/zendocs/AdminGuide/docbook/MultiGraphReports.xml trunk/zendocs/AdminGuide/docbook/SMTPSettings.xml trunk/zendocs/AdminGuide/docbook/SendEvents.xml trunk/zendocs/AdminGuide/docbook/TestSendEvent.xml trunk/zendocs/AdminGuide/docbook/TestZenCommand.xml trunk/zendocs/AdminGuide/docbook/UserInfoDashboard.xml trunk/zendocs/AdminGuide/docbook/WatchList.xml trunk/zendocs/AdminGuide/docbook/WindowsMon-CH.xml trunk/zendocs/AdminGuide/docbook/WindowsServiceModeling.xml trunk/zendocs/AdminGuide/docbook/googlemaps.xml trunk/zendocs/AdminGuide/docbook/standardmodel.xml trunk/zendocs/AdminGuide/docbook/zenjmx.xml trunk/zendocs/AdminGuide/docbook/zenmail.xml Log: Changes to docs for ticket 3069 Modified: trunk/zendocs/AdminGuide/docbook/AckEvents.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/AckEvents.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/AckEvents.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -1,5 +1,14 @@ -<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="AckEvents"><info><title>Acknowledging Events</title></info> - +<?xml version="1.0" encoding="UTF-8"?> +<section version="5.0" xml:id="AckEvents" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns52="http://www.w3.org/1999/xhtml" + xmlns:ns5="http://www.w3.org/1999/xlink" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1998/Math/MathML" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Acknowledging Events</title> + </info> <para>Acknowledging Events is a way to let the system know that someone has seen the event and is either in progress fixing it or has fixed it or is @@ -8,18 +17,18 @@ <para>To acknowledge an event:</para> - <orderedlist inheritnum="ignore" continuation="restarts"> + <orderedlist continuation="restarts" inheritnum="ignore"> <listitem> <para>Navigate to the event console.</para> - <para/> + <para></para> </listitem> <listitem> <para>Select the event you want to acknowledge from the Event Console by clicking the checkbox at the left of the event.</para> - <para/> + <para></para> </listitem> <listitem> @@ -27,13 +36,12 @@ option.</para> <para>Note the change in color (from deep red red to a pale red/pink) - for the event you Acknowledged.</para> + for the event you acknowledged.</para> </listitem> <listitem> - <para>Return to the dashboard and note the name that appears in the - “Acked By” column for the event (near the top right of the - screen).</para> + <para>Return to the dashboard, sort by Acknowledged and note the event + appears in this list now.</para> </listitem> </orderedlist> </section> \ No newline at end of file Modified: trunk/zendocs/AdminGuide/docbook/Backup-CH.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/Backup-CH.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/Backup-CH.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -1,8 +1,20 @@ -<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Backup-CH"><info><title>Backup, Recovery and Maintenance</title></info> - +<?xml version="1.0" encoding="UTF-8"?> +<chapter version="5.0" xml:id="Backup-CH" + xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:ns5="http://www.w3.org/1999/xhtml" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1998/Math/MathML" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Backup, Recovery and Maintenance</title> + </info> - <section><info><title>Backup and Restore</title></info> - + <section> + <info> + <title>Backup and Restore</title> + </info> <para>Zenoss provides tools to backup the configuration and data from a Zenoss install and restore that information later. This can be useful in @@ -40,7 +52,7 @@ <programlisting>> zenrestore --file=BACKUPFILEPATH</programlisting> - <para/> + <para></para> <para>Suggestions for a satisfying backup/restore experience:</para> @@ -50,14 +62,14 @@ before starting any backup or restore operation. This gives you a chance to recover in case something goes awry.</para> - <para/> + <para></para> </listitem> <listitem> <para>Make sure Zenoss, including all daemons, is stopped before performing a restore.</para> - <para/> + <para></para> </listitem> <listitem> @@ -65,7 +77,7 @@ older version could be bad news and should really be avoided.</para> - <para/> + <para></para> </listitem> <listitem> @@ -73,7 +85,7 @@ to a newer version you should run zenmigrate after the restore.</para> - <para/> + <para></para> </listitem> <listitem> @@ -86,8 +98,10 @@ </listitem> </itemizedlist> - <section><info><title>Backup Details</title></info> - + <section> + <info> + <title>Backup Details</title> + </info> <para>The script for backup is $ZENHOME/bin/zenbackup. If zenoss is running then you can run zenbackup without any arguments and a backup @@ -104,7 +118,7 @@ zenbackup will attempt to retrieve this information from zeo unless you specify --dont-fetch-args.</para> - <para/> + <para></para> <para>--dbuser, --dbpassword</para> @@ -113,14 +127,14 @@ will attempt to retrieve this information from zeo unless you specify --dont-fetch-args.</para> - <para/> + <para></para> <para>--dont-fetch-args</para> <para>This instructs zenbackup not to attempt to get values for dbname, dbuser and dbpassword from zeo.</para> - <para/> + <para></para> <para>--file=FILE</para> @@ -128,14 +142,14 @@ it will be named zenoss_<DATE>.tgz and placed in $ZENHOME/backups.</para> - <para/> + <para></para> <para>--stdout</para> - <para>This flag tells zenbackup to send send the backup information to - stdout instead of to a file. Incompatible with --verbose.</para> + <para>This flag tells zenbackup to send the backup information to stdout + instead of to a file. Incompatible with --verbose.</para> - <para/> + <para></para> <para>--save-mysql-access</para> @@ -144,22 +158,24 @@ during a restore operation. Use this with caution as it means your backup files will contain a mysql username and password.</para> - <para/> + <para></para> <para>--no-eventsdb</para> <para>Do not include the mysql events database as part of the backup.</para> - <para/> + <para></para> <para>-v, --verbose</para> <para>Print progress messages. Incompatible with --stdout.</para> </section> - <section><info> - <title>Backups Tab</title></info> + <section> + <info> + <title>Backups Tab</title> + </info> <para>Zenoss provides a simple web GUI for creating and managing backups. Navigate to Settings->Backups to view the Backups page. The @@ -174,7 +190,9 @@ </section> <section> - <info><title>Remote Backups</title></info> + <info> + <title>Remote Backups</title> + </info> <para>Keeping backups on your zenoss server should help you recover if one of your databases becomes corrupt, your configuration becomes @@ -185,7 +203,10 @@ location.</para> </section> - <section><info><title>Restore Details</title></info> + <section> + <info> + <title>Restore Details</title> + </info> <para>The script for restoring zenoss from a backup is $ZENHOME/zenrestore. Make sure that zenoss is stopped before performing @@ -194,33 +215,33 @@ zenrestore. Otherwise you need to specify dbname, dbuser and dbpassword also.</para> - <para/> + <para></para> <para>--file</para> <para>This is a backup file created with zenbackup You must specify either --file or --dir.</para> - <para/> + <para></para> <para>--dir</para> <para>The path to an unzipped backup file. You must specify either --file or --dir.</para> - <para/> + <para></para> <para>--dbname</para> <para>This is the name of the mysql database zenoss uses to hold event data. This database must exist before zenrestore is run. If there are any zenoss tables in the database they will be dropped by zenrestore - before it restores the backedup tables and data. If you use a different + before it restores the backed up tables and data. If you use a different dbname than was in use when the backup was created then after the restore you'll need to set the database name on the Event Manager page.</para> - <para/> + <para></para> <para>--dbuser, --dbpassword</para> @@ -229,7 +250,7 @@ will attempt to use values stored in the backup file if --save-mysql-access was used in creating it.</para> - <para/> + <para></para> <para>--no-eventsdb</para> @@ -237,13 +258,13 @@ not contain mysql events data then zenrestore will not modify your events database even if you do not specify --no-eventsdb.</para> - <para/> + <para></para> <para>-v, --verbose</para> <para>Print progress messages.</para> </section> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="PeriodicBackups.xml" xpointer="PeriodicBackup"/> + <xi:include href="PeriodicBackups.xml" xpointer="PeriodicBackup" /> </section> </chapter> \ No newline at end of file Modified: trunk/zendocs/AdminGuide/docbook/CollectionControlxml.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CollectionControlxml.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/CollectionControlxml.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -102,7 +102,7 @@ <entry>Zenprocess</entry> <entry>Zenprocess enables process monitoring using SNMP host - resources mib.</entry> + resources MIB.</entry> </row> </tbody> </tgroup> Modified: trunk/zendocs/AdminGuide/docbook/CoreZenpacks.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CoreZenpacks.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/CoreZenpacks.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -1,13 +1,39 @@ -<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="corezenpacks"><info><title>Zenoss Core ZenPacks</title></info> - +<?xml version="1.0" encoding="UTF-8"?> +<section version="5.0" xml:id="corezenpacks" + xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:ns5="http://www.w3.org/1999/xhtml" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1998/Math/MathML" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Zenoss Core ZenPacks</title> + </info> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="zenjmx.xml" xpointer="zenjmx"/> + <xi:include href="zenjmx.xml" xpointer="zenjmx" /> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="ApacheMonitorZenpack.xml" xpointer="ApacheMonitorZenPack"/> + <xi:include href="ApacheMonitorZenpack.xml" xpointer="ApacheMonitorZenPack" /> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="DellMonitorZenPack.xml" xpointer="DellMonitorZenPack"/> + <xi:include href="DellMonitorZenPack.xml" xpointer="DellMonitorZenPack" /> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="HPMonitorZenpack.xml" xpointer="HpMonitorZenPack"/> + <xi:include href="HPMonitorZenpack.xml" xpointer="HpMonitorZenPack" /> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="MySqlMonitorZenPack.xml" xpointer="MySqlMonitor"/> + <xi:include href="MySqlMonitorZenPack.xml" xpointer="MySqlMonitor" /> + + <xi:include href="NtpMonitorZenPack.xml" xpointer="NtpMonitorZenPack" /> + + <xi:include href="LDAPMonZenPack.xml" xpointer="LDAPMonitorZenPack" /> + + <xi:include href="RPCMonitorZenPack.xml" xpointer="RPCMonitorZenPack" /> + + <xi:include href="IRCMonZenPack.xml" /> + + <xi:include href="JabberMonitorZenPack.xml" xpointer="JabberMonitorZenPack" /> + + <xi:include href="DigMonitorZenPack.xml" xpointer="DigMonitorZenPack" /> + + <xi:include href="FTPMonitorZenPack.xml" xpointer="FTPMonitorZenPack" /> + + <xi:include href="NNTPMonitorZenPack.xml" xpointer="NNTPMonitorZenPack" /> </section> \ No newline at end of file Modified: trunk/zendocs/AdminGuide/docbook/CreateZenpack.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CreateZenpack.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/CreateZenpack.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -81,7 +81,7 @@ Developers Guide.</para> <para>Discussion regarding development of ZenPacks takes place on the - zenoss-dev mailing list and forumns: + zenoss-dev mailing list and forums: http://community.zenoss.com/forums/viewforum.php?f=3</para> <section> @@ -96,8 +96,7 @@ <ZenPackId>.egg in the $ZENHOME/exports directory on the Zenoss server. The second option does the same but then downloads the exported file to your browser. Other Zenoss administrators can install this - exported .egg file as described in Section 22.1 Installing - ZenPacks.</para> + exported .egg file as described in the Installing ZenPacks section.</para> <para>For information on how to make your ZenPack available on the zenoss.com site see Modified: trunk/zendocs/AdminGuide/docbook/CustomLinks.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CustomLinks.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/CustomLinks.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -1,15 +1,24 @@ -<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="CustomzLinks"><info><title>Using zLinks to Add Custom Links to a Device Status Page</title></info> - +<?xml version="1.0" encoding="UTF-8"?> +<section version="5.0" xml:id="CustomzLinks" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns52="http://www.w3.org/1999/xhtml" + xmlns:ns5="http://www.w3.org/1999/xlink" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1998/Math/MathML" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Using zLinks to Add Custom Links to a Device Status Page</title> + </info> <para>You can add custom links within Zenoss to associate with a device, device class, or hierarchy of devices. You can use the zLinks zProperty to - add links that will appear in the Status tab. Thes links are typically used + add links that will appear in the Status tab. These links are typically used to simplify access to other control screens and drill-down interfaces available on the device.</para> <para>To add links:</para> - <orderedlist inheritnum="ignore" continuation="restarts"> + <orderedlist continuation="restarts" inheritnum="ignore"> <listitem> <para>Select a device from the Device list where you want to add a custom link.</para> @@ -23,13 +32,13 @@ <para>From the device page menu, select More and then zProperties.</para> - <para/> + <para></para> </listitem> <listitem> - <para>Scroll down to the zLinks zProperty. </para> + <para>Scroll down to the zLinks zProperty.</para> - <para/> + <para></para> </listitem> <listitem> @@ -40,13 +49,13 @@ mailto, etc. You can put other types of http markup, including image references, such as the performance graphs from other pages.</para> - <para/> + <para></para> </listitem> <listitem> <para>Click Save.</para> - <para>The zLink is saved and will now appear on the Satus tab for the + <para>The zLink is saved and will now appear on the Status tab for the selected device.</para> </listitem> </orderedlist> Modified: trunk/zendocs/AdminGuide/docbook/DPGraphPoints.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/DPGraphPoints.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/DPGraphPoints.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -1,10 +1,19 @@ -<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="DataPointGraphPoint"><info><title>Data Point Graph Points</title></info> - +<?xml version="1.0" encoding="UTF-8"?> +<section version="5.0" xml:id="DataPointGraphPoint" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns52="http://www.w3.org/1999/xhtml" + xmlns:ns5="http://www.w3.org/1999/xlink" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1998/Math/MathML" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Data Point Graph Points</title> + </info> <para>DataPoint Graph Points draw the value of Data Points from the Template - on a graph. Add a new DataPoint Graph Point to the Graph Definiton using the - "Add DataPoint..." menu item. The Add GraphPoint dialog will appear allowing - you to select one or more Data Points defined in this Template. One + on a graph. Add a new DataPoint Graph Point to the Graph Definition using + the "Add DataPoint..." menu item. The Add GraphPoint dialog will appear + allowing you to select one or more Data Points defined in this Template. One DataPoint Graph Point will be created for each DataPoint you select in this list. Additionally, there is a Include related thresholds checkbox. If this is selected then any Graph Points will be created for any Thresholds that @@ -19,7 +28,7 @@ and by default is also the name that will be used in the graph legend.</para> - <para/> + <para></para> </listitem> <listitem> @@ -27,7 +36,7 @@ Point's data to the size of the graph. For most purposes the default value of AVERAGE is appropriate.</para> - <para/> + <para></para> </listitem> <listitem> @@ -37,14 +46,14 @@ RPN of "8,/" to divide by 8. You can read more details of RRDTool RPN notation at http://oss.oetiker.ch/rrdtool/tut/rpntutorial.en.html</para> - <para/> + <para></para> </listitem> <listitem> <para>Limit - You can specify a maximum value for the data being graphed.</para> - <para/> + <para></para> </listitem> <listitem> @@ -54,13 +63,13 @@ if you want to use this Data Point for Custom RRD commands but don't want it to be explicitly drawn.</para> - <para/> + <para></para> </listitem> <listitem> <para>Line Width - Enter the pixel width of the line.</para> - <para/> + <para></para> </listitem> <listitem> @@ -71,7 +80,7 @@ measuring packets in and packets out you could stack them to get an idea of the total number of packets.</para> - <para/> + <para></para> </listitem> <listitem> @@ -79,7 +88,7 @@ names are recognized but more reliably you can use a three or six digit hex value.</para> - <para/> + <para></para> </listitem> <listitem> @@ -87,17 +96,17 @@ the graph summary. Information on RRDTool formatting strings can be found at http://oss.oetiker.ch/rrdtool/doc/rrdgraph_graph.en.html</para> - <para/> + <para></para> </listitem> <listitem> <para>Legend - This is the name that will be used for this data in the graph legend. By default this is a TALES expression that specifies the Graph Point name. The variables available in this TALES expression are - here (the devicen or component being graphed) and graphPoint (the Graph + here (the device or component being graphed) and graphPoint (the Graph Point itself.)</para> - <para/> + <para></para> </listitem> <listitem> Modified: trunk/zendocs/AdminGuide/docbook/DaemonCommands.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/DaemonCommands.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/DaemonCommands.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -1,5 +1,14 @@ -<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="DaemonCommands"><info><title>Zenoss Daemon Commands and Options</title></info> - +<?xml version="1.0" encoding="UTF-8"?> +<section version="5.0" xml:id="DaemonCommands" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns52="http://www.w3.org/1999/xhtml" + xmlns:ns5="http://www.w3.org/1999/xlink" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1998/Math/MathML" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Zenoss Daemon Commands and Options</title> + </info> <para>All Zenoss daemons share some similar commands. These commands can be run from the command line for the device where Zenoss is installed. Each @@ -34,12 +43,14 @@ <listitem> <para>help – display a list of all options for the daemon.</para> - <para/> + <para></para> </listitem> </itemizedlist> - <section><info><title>Configuring Zenoss Daemons</title></info> - + <section> + <info> + <title>Configuring Zenoss Daemons</title> + </info> <para>Any daemon can be configured by adding key/value pairs to a file named $ZENHOME/etc/DAEMONNAME.conf. Valid keys are the long option of any @@ -47,8 +58,10 @@ command.</para> </section> - <section><info><title>General Options for All Daemons</title></info> - + <section> + <info> + <title>General Options for All Daemons</title> + </info> <informaltable> <tgroup cols="2"> @@ -64,93 +77,95 @@ <row> <entry>--version</entry> - <entry>show program's version number and exit </entry> + <entry>show program's version number and exit</entry> </row> <row> <entry>-h, --help</entry> - <entry>show this help message and exit </entry> + <entry>show this help message and exit</entry> </row> <row> - <entry>-vLOGSEVERITY,--logseverity=LOGSEVERITY </entry> + <entry>-vLOGSEVERITY,--logseverity=LOGSEVERITY</entry> - <entry>Logging severity threshold </entry> + <entry>Logging severity threshold</entry> </row> <row> - <entry>--logpath=LOGPATH </entry> + <entry>--logpath=LOGPATH</entry> - <entry>override default logging path </entry> + <entry>override default logging path</entry> </row> <row> - <entry>-CCONFIGFILE,-- configfile=CONFIGFILE </entry> + <entry>-CCONFIGFILE,-- configfile=CONFIGFILE</entry> - <entry>config file </entry> + <entry>config file</entry> </row> <row> - <entry>--uid=UID </entry> + <entry>--uid=UID</entry> - <entry>user to become when running default:zenoss </entry> + <entry>user to become when running default:zenoss</entry> </row> <row> - <entry>-c, --cycle </entry> + <entry>-c, --cycle</entry> - <entry>Cycle continuously on cycleInterval from zope </entry> + <entry>Cycle continuously on cycleInterval from zope</entry> </row> <row> - <entry>-D, --daemon </entry> + <entry>-D, --daemon</entry> - <entry>Become a Unix daemon </entry> + <entry>Become a Unix daemon</entry> </row> <row> - <entry>--host=HOST </entry> + <entry>--host=HOST</entry> - <entry>hostname of zeo server </entry> + <entry>hostname of zeo server</entry> </row> <row> - <entry>--port=PORT </entry> + <entry>--port=PORT</entry> - <entry>port of zeo server </entry> + <entry>port of zeo server</entry> </row> <row> - <entry>-RDATAROOT, --dataroot=DATAROOT </entry> + <entry>-RDATAROOT, --dataroot=DATAROOT</entry> - <entry>root object for data load (i.e. /zport/dmd) </entry> + <entry>root object for data load (i.e. /zport/dmd)</entry> </row> <row> - <entry>--cachesize=CACHESIZE </entry> + <entry>--cachesize=CACHESIZE</entry> - <entry>in memory cachesize default: 1000 </entry> + <entry>in memory cachesize default: 1000</entry> </row> <row> - <entry>--pcachename=PCACHENAME </entry> + <entry>--pcachename=PCACHENAME</entry> <entry>persistent cache file name default:None</entry> </row> <row> - <entry>--pcachedir=PCACHEDIR </entry> + <entry>--pcachedir=PCACHEDIR</entry> - <entry>persistent cache file directory </entry> + <entry>persistent cache file directory</entry> </row> </tbody> </tgroup> </informaltable> </section> - <section><info><title>zenhub Options</title></info> - + <section> + <info> + <title>zenhub Options</title> + </info> <informaltable> <tgroup cols="2"> @@ -164,29 +179,31 @@ <tbody> <row> - <entry>-x XMLRPCPORT, --xport=XMLRPCPORT </entry> + <entry>-x XMLRPCPORT, --xport=XMLRPCPORT</entry> <entry>Port to listen to for XML RPC calls</entry> </row> <row> - <entry>--pbport=PBPORT </entry> + <entry>--pbport=PBPORT</entry> - <entry>pb port </entry> + <entry>pb port</entry> </row> <row> - <entry>--passwd=PASSWORDFILE </entry> + <entry>--passwd=PASSWORDFILE</entry> - <entry>where the password file is stored </entry> + <entry>where the password file is stored</entry> </row> </tbody> </tgroup> </informaltable> </section> - <section><info><title>zenmodeler Options</title></info> - + <section> + <info> + <title>zenmodeler Options</title> + </info> <informaltable> <tgroup cols="2"> @@ -200,9 +217,9 @@ <tbody> <row> - <entry>--debug </entry> + <entry>--debug</entry> - <entry>don't fork threads for processing </entry> + <entry>don't fork threads for processing</entry> </row> <row> @@ -218,145 +235,145 @@ </row> <row> - <entry>--ignore=IGNOREPLUGINS </entry> + <entry>--ignore=IGNOREPLUGINS</entry> <entry>Comma separated list of collection maps to ignore</entry> </row> <row> - <entry>--collect=COLLECTPLUGINS </entry> + <entry>--collect=COLLECTPLUGINS</entry> - <entry>Comma separated list of collection maps to use </entry> + <entry>Comma separated list of collection maps to use</entry> </row> <row> - <entry>-pPATH, --path=PATH </entry> + <entry>-pPATH, --path=PATH</entry> - <entry>start path for collection ie /NetworkDevices </entry> + <entry>start path for collection ie /NetworkDevices</entry> </row> <row> - <entry>-dDEVICE, --device=DEVICE </entry> + <entry>-dDEVICE, --device=DEVICE</entry> - <entry>fully qualified device name ie: www.zenoss.com </entry> + <entry>fully qualified device name ie: www.zenoss.com</entry> </row> <row> - <entry>-aCOLLAGE, --collage=COLLAGE </entry> + <entry>-aCOLLAGE, --collage=COLLAGE</entry> <entry>do not collect from devices whose collect date is within this many minutes</entry> </row> <row> - <entry>--writetries=WRITETRIES </entry> + <entry>--writetries=WRITETRIES</entry> - <entry>number of times to try to write if a read conflict is found - </entry> + <entry>number of times to try to write if a read conflict is + found</entry> </row> <row> - <entry>-F, --force </entry> + <entry>-F, --force</entry> <entry>force collection of config data (even without change to the - device) </entry> + device)</entry> </row> <row> - <entry>--portscantimeout=PORTSCANTIMEOUT </entry> + <entry>--portscantimeout=PORTSCANTIMEOUT</entry> - <entry>time to wait for connection failures when port scanning - </entry> + <entry>time to wait for connection failures when port + scanning</entry> </row> <row> - <entry>-uUSERNAME, --user=USERNAME </entry> + <entry>-uUSERNAME, --user=USERNAME</entry> - <entry>Login username </entry> + <entry>Login username</entry> </row> <row> - <entry>-PPASSWORD, --password=PASSWORD </entry> + <entry>-PPASSWORD, --password=PASSWORD</entry> - <entry>Login password </entry> + <entry>Login password</entry> </row> <row> - <entry>-tLOGINTRIES, --loginTries=LOGINTRIES </entry> + <entry>-tLOGINTRIES, --loginTries=LOGINTRIES</entry> - <entry>number of times to try login </entry> + <entry>number of times to try login</entry> </row> <row> - <entry>-LLOGINTIMEOUT, --loginTimeout=LOGINTIMEOUT </entry> + <entry>-LLOGINTIMEOUT, --loginTimeout=LOGINTIMEOUT</entry> <entry>timeout login expect statements</entry> </row> <row> - <entry>-TCOMMANDTIMEOUT, --commandTimeout=COMMANDTIMEOUT </entry> + <entry>-TCOMMANDTIMEOUT, --commandTimeout=COMMANDTIMEOUT</entry> <entry>timeout when issuing a command</entry> </row> <row> - <entry>-KKEYPATH, --keyPath=KEYPATH </entry> + <entry>-KKEYPATH, --keyPath=KEYPATH</entry> - <entry>Path to use when looking for keys </entry> + <entry>Path to use when looking for keys</entry> </row> <row> - <entry>-sSEARCHPATH, --searchPath=SEARCHPATH </entry> + <entry>-sSEARCHPATH, --searchPath=SEARCHPATH</entry> - <entry>Path to use when looking for commands </entry> + <entry>Path to use when looking for commands</entry> </row> <row> - <entry>-eEXISTENCETEST, --existenceTest=EXISTENCETEST </entry> + <entry>-eEXISTENCETEST, --existenceTest=EXISTENCETEST</entry> - <entry>how to check for command </entry> + <entry>how to check for command</entry> </row> <row> - <entry>-rPROMPTTIMEOUT, --promptTimeout=PROMPTTIMEOUT </entry> + <entry>-rPROMPTTIMEOUT, --promptTimeout=PROMPTTIMEOUT</entry> - <entry>timeout when discovering prompt </entry> + <entry>timeout when discovering prompt</entry> </row> <row> - <entry>-xLOGINREGEX, --loginRegex=LOGINREGEX </entry> + <entry>-xLOGINREGEX, --loginRegex=LOGINREGEX</entry> - <entry>regex that will find the login prompt </entry> + <entry>regex that will find the login prompt</entry> </row> <row> - <entry>-wPASSWORDREGEX, --passwordRegex=PASSWORDREGEX </entry> + <entry>-wPASSWORDREGEX, --passwordRegex=PASSWORDREGEX</entry> <entry>regex that will find the password prompt</entry> </row> <row> - <entry>--enable </entry> + <entry>--enable</entry> - <entry>enter enable mode on a cisco device </entry> + <entry>enter enable mode on a cisco device</entry> </row> <row> - <entry>--termlen </entry> + <entry>--termlen</entry> - <entry>enter send terminal length 0 on a cisco device </entry> + <entry>enter send terminal length 0 on a cisco device</entry> </row> <row> <entry>--enablePause=ENABLEPAUSE</entry> - <entry> time to wait before sending enable command </entry> + <entry>time to wait before sending enable command</entry> </row> <row> - <entry>--enableRegex=ENABLEREGEX </entry> + <entry>--enableRegex=ENABLEREGEX</entry> - <entry>regex that will find the enable password prompt </entry> + <entry>regex that will find the enable password prompt</entry> </row> </tbody> </tgroup> @@ -364,11 +381,13 @@ <para>NOTE: --ignore and --collect are mutually exclusive</para> - <para/> + <para></para> </section> - <section><info><title>zenperfsnmp Options</title></info> - + <section> + <info> + <title>zenperfsnmp Options</title> + </info> <informaltable> <tgroup cols="2"> @@ -382,51 +401,53 @@ <tbody> <row> - <entry>-zZOPEURL, --zopeurl=ZOPEURL </entry> + <entry>-zZOPEURL, --zopeurl=ZOPEURL</entry> - <entry>XMLRPC url path for performance configuration server - </entry> + <entry>XMLRPC url path for performance configuration + server</entry> </row> <row> - <entry>-uZOPEUSERNAME, --zopeusername=ZOPEUSERNAME </entry> + <entry>-uZOPEUSERNAME, --zopeusername=ZOPEUSERNAME</entry> - <entry>username for zope server </entry> + <entry>username for zope server</entry> </row> <row> - <entry>--zopepassword=ZOPEPASSWORD </entry> + <entry>--zopepassword=ZOPEPASSWORD</entry> - <entry>password used to login to the zope server </entry> + <entry>password used to login to the zope server</entry> </row> <row> - <entry>--zem=ZEM </entry> + <entry>--zem=ZEM</entry> - <entry>XMLRPC path to an ZenEventManager instance </entry> + <entry>XMLRPC path to an ZenEventManager instance</entry> </row> <row> - <entry>-dDEVICE, --device=DEVICE </entry> + <entry>-dDEVICE, --device=DEVICE</entry> - <entry>Specify a specific device to monitor </entry> + <entry>Specify a specific device to monitor</entry> </row> <row> - <entry>--monitor=MONITOR </entry> + <entry>--monitor=MONITOR</entry> - <entry>Specify a specific name of the monitor configuration - </entry> + <entry>Specify a specific name of the monitor + configuration</entry> </row> </tbody> </tgroup> </informaltable> - <para/> + <para></para> </section> - <section><info><title>zenperfxmlrpc Options</title></info> - + <section> + <info> + <title>zenperfxmlrpc Options</title> + </info> <para><informaltable> <tgroup cols="2"> @@ -440,38 +461,38 @@ <tbody> <row> - <entry>-zZOPEURL, --zopeurl=ZOPEURL </entry> + <entry>-zZOPEURL, --zopeurl=ZOPEURL</entry> - <entry>XMLRPC url path for performance configuration server - </entry> + <entry>XMLRPC url path for performance configuration + server</entry> </row> <row> - <entry>-uZOPEUSERNAME, --zopeusername=ZOPEUSERNAME </entry> + <entry>-uZOPEUSERNAME, --zopeusername=ZOPEUSERNAME</entry> - <entry>username for zope server </entry> + <entry>username for zope server</entry> </row> <row> - <entry>--zopepassword=ZOPEPASSWORD </entry> + <entry>--zopepassword=ZOPEPASSWORD</entry> <entry>password used to login to the zope server</entry> </row> <row> - <entry>--zem=ZEM </entry> + <entry>--zem=ZEM</entry> - <entry>XMLRPC path to an ZenEventManager instance </entry> + <entry>XMLRPC path to an ZenEventManager instance</entry> </row> <row> - <entry>-dDEVICE, --device=DEVICE </entry> + <entry>-dDEVICE, --device=DEVICE</entry> - <entry>Specify a specific device to monitor </entry> + <entry>Specify a specific device to monitor</entry> </row> <row> - <entry>--monitor=MONITOR </entry> + <entry>--monitor=MONITOR</entry> <entry>Specify a specific name of the monitor configuration</entry> @@ -481,8 +502,10 @@ </informaltable></para> </section> - <section><info><title>zenProcess Options</title></info> - + <section> + <info> + <title>zenprocess Options</title> + </info> <para><informaltable> <tgroup cols="2"> @@ -496,49 +519,51 @@ <tbody> <row> - <entry>-zZOPEURL, --zopeurl=ZOPEURL </entry> + <entry>-zZOPEURL, --zopeurl=ZOPEURL</entry> <entry>XMLRPC url path for performance configuration server</entry> </row> <row> - <entry>-uZOPEUSERNAME, --zopeusername=ZOPEUSERNAME </entry> + <entry>-uZOPEUSERNAME, --zopeusername=ZOPEUSERNAME</entry> <entry>username for zope server</entry> </row> <row> - <entry>--zopepassword=ZOPEPASSWORD </entry> + <entry>--zopepassword=ZOPEPASSWORD</entry> <entry>password used to login to the zope server</entry> </row> <row> - <entry>--zem=ZEM </entry> + <entry>--zem=ZEM</entry> - <entry>XMLRPC path to an ZenEventManager instance </entry> + <entry>XMLRPC path to an ZenEventManager instance</entry> </row> <row> - <entry>-dDEVICE, --device=DEVICE </entry> + <entry>-dDEVICE, --device=DEVICE</entry> - <entry>Specify a specific device to monitor </entry> + <entry>Specify a specific device to monitor</entry> </row> <row> - <entry>--monitor=MONITOR </entry> + <entry>--monitor=MONITOR</entry> - <entry>Specify a specific name of the monitor configuration - </entry> + <entry>Specify a specific name of the monitor + configuration</entry> </row> </tbody> </tgroup> </informaltable></para> </section> - <section><info><title>zenping Options</title></info> - + <section> + <info> + <title>zenping Options</title> + </info> <informaltable> <tgroup cols="2"> @@ -552,34 +577,36 @@ <tbody> <row> - <entry>--configpath=CONFIGPATH </entry> + <entry>--configpath=CONFIGPATH</entry> <entry>path to our monitor config ie: - /Monitors/StatusMonitors/localhost </entry> + /Monitors/StatusMonitors/localhost</entry> </row> <row> - <entry>--name=NAME </entry> + <entry>--name=NAME</entry> <entry>name to use when looking up our record in the dmd defaults - to our fqdn as returned by getfqdn </entry> + to our fully qualified domain name as returned by getfqdn</entry> </row> <row> - <entry>--test </entry> + <entry>--test</entry> <entry>Run in test mode: doesn't really ping, but reads the list - of IP Addresses that are up from /tmp/testping </entry> + of IP Addresses that are up from /tmp/testping</entry> </row> </tbody> </tgroup> </informaltable> - <para/> + <para></para> </section> - <section><info><title>zensyslog Options</title></info> - + <section> + <info> + <title>zensyslog Options</title> + </info> <informaltable> <tgroup cols="2"> @@ -593,51 +620,51 @@ <tbody> <row> - <entry>--statcycle=STATCYCLE </entry> + <entry>--statcycle=STATCYCLE</entry> - <entry>Number of seconds between the writing of stats </entry> + <entry>Number of seconds between the writing of stats</entry> </row> <row> - <entry>--dmdpath=DMDPATH </entry> + <entry>--dmdpath=DMDPATH</entry> - <entry>zope path to our dmd /zport/dmd </entry> + <entry>zope path to our dmd /zport/dmd</entry> </row> <row> - <entry>--parsehost </entry> + <entry>--parsehost</entry> <entry>try to parse the hostname part of a syslog HEADER</entry> </row> <row> - <entry>--stats </entry> + <entry>--stats</entry> - <entry>print stats to log every 2 secs </entry> + <entry>print stats to log every 2 seconds</entry> </row> <row> - <entry>--logorig </entry> + <entry>--logorig</entry> - <entry>log the original message </entry> + <entry>log the original message</entry> </row> <row> - <entry>--debug </entry> + <entry>--debug</entry> <entry>debug mode no threads</entry> </row> <row> - <entry>--minpriority=MINPRIORITY </entry> + <entry>--minpriority=MINPRIORITY</entry> - <entry>Minimum priority that syslog will accept </entry> + <entry>Minimum priority that syslog will accept</entry> </row> <row> - <entry>--heartbeat=HEARTBEAT </entry> + <entry>--heartbeat=HEARTBEAT</entry> - <entry>Number of seconds between heartbeats </entry> + <entry>Number of seconds between heartbeats</entry> </row> <row> @@ -649,11 +676,13 @@ </tgroup> </informaltable> - <para/> + <para></para> </section> - <section><info><title>zenstatus Options</title></info> - + <section> + <info> + <title>zenstatus Options</title> + </info> <informaltable> <tgroup cols="2"> @@ -667,31 +696,33 @@ <tbody> <row> - <entry>--configpath=CONFIGPATH </entry> + <entry>--configpath=CONFIGPATH</entry> - <entry>path to our monitor config ie: /Devices/Server </entry> + <entry>path to our monitor config ie: /Devices/Server</entry> </row> <row> - <entry>--parallel=PARALLEL </entry> + <entry>--parallel=PARALLEL</entry> - <entry>number of devices to collect at one time </entry> + <entry>number of devices to collect at one time</entry> </row> <row> - <entry>--cycletime=CYCLETIME </entry> + <entry>--cycletime=CYCLETIME</entry> - <entry>check events every cycletime seconds </entry> + <entry>check events every cycletime seconds</entry> </row> </tbody> </tgroup> </informaltable> - <para/> + <para></para> </section> - <section><info><title>zenactions Options</title></info> - + <section> + <info> + <title>zenactions Options</title> + </info> <informaltable> <tgroup cols="2"> @@ -705,31 +736,33 @@ <tbody> <row> - <entry>--cycletime=CYCLETIME </entry> + <entry>--cycletime=CYCLETIME</entry> - <entry>check events every cycletime seconds </entry> + <entry>check events every cycletime seconds</entry> </row> <row> - <entry>--fromaddr=FROMADDR </entry> + <entry>--fromaddr=FROMADDR</entry> - <entry>address from which email is sent </entry> + <entry>address from which email is sent</entry> </row> <row> <entry>--zopeurl=ZOPEURL</entry> - <entry>http path to the root of the zope server </entry> + <entry>http path to the root of the zope server</entry> </row> </tbody> </tgroup> </informaltable> - <para/> + <para></para> </section> - <section><info><title>zentrap Options</title></info> - + <section> + <info> + <title>zentrap Options</title> + </info> <informaltable> <tgroup cols="2"> @@ -743,13 +776,13 @@ <tbody> <row> - <entry>--statcycle=STATCYCLE </entry> + <entry>--statcycle=STATCYCLE</entry> <entry>Number of seconds between the writing of stats</entry> </row> <row> - <entry>-tTRAPPORT, --trapport=TRAPPORT </entry> + <entry>-tTRAPPORT, --trapport=TRAPPORT</entry> <entry>Port number for listening for traps</entry> </row> @@ -757,11 +790,13 @@ </tgroup> </informaltable> - <para/> + <para></para> </section> - <section><info><title>zencommand Options</title></info> - + <section> + <info> + <title>zencommand Options</title> + </info> <informaltable> <tgroup cols="2"> @@ -775,47 +810,47 @@ <tbody> <row> - <entry>-zZOPEURL, --zopeurl=ZOPEURL </entry> + <entry>-zZOPEURL, --zopeurl=ZOPEURL</entry> - <entry>XMLRPC url path for performance configuration server - </entry> + <entry>XMLRPC url path for performance configuration + server</entry> </row> <row> - <entry>-uZOPEUSERNAME, --zopeusername=ZOPEUSERNAME </entry> + <entry>-uZOPEUSERNAME, --zopeusername=ZOPEUSERNAME</entry> - <entry>username for zope server </entry> + <entry>username for zope server</entry> </row> <row> - <entry>--zopepassword=ZOPEPASSWORD </entry> + <entry>--zopepassword=ZOPEPASSWORD</entry> - <entry>password used to login to the zope server </entry> + <entry>password used to login to the zope server</entry> </row> <row> - <entry>--zem=ZEM </entry> + <entry>--zem=ZEM</entry> - <entry>XMLRPC path to an ZenEventManager instance </entry> + <entry>XMLRPC path to an ZenEventManager instance</entry> </row> <row> - <entry>-dDEVICE, --device=DEVICE </entry> + <entry>-dDEVICE, --device=DEVICE</entry> <entry>Specify a specific device to monitor</entry> </row> <row> - <entry>--monitor=MONITOR </entry> + <entry>--monitor=MONITOR</entry> - <entry>Specify a specific name of the monitor configuration - </entry> + <entry>Specify a specific name of the monitor + configuration</entry> </row> <row> - <entry>--parallel=PARALLEL </entry> + <entry>--parallel=PARALLEL</entry> - <entry>number of devices to collect at one time </entry> + <entry>number of devices to collect at one time</entry> </row> </tbody> </tgroup> Modified: trunk/zendocs/AdminGuide/docbook/DataPoints.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/DataPoints.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/DataPoints.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -1,5 +1,14 @@ -<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="DataPoints"><info><title>Data Points</title></info> - +<?xml version="1.0" encoding="UTF-8"?> +<section version="5.0" xml:id="DataPoints" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns52="http://www.w3.org/1999/xhtml" + xmlns:ns5="http://www.w3.org/1999/xlink" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1998/Math/MathML" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Data Points</title> + </info> <para>A single Data Source might return data on one or more performance metrics. Data Sources can contain one or more Data Points to represent each @@ -14,7 +23,7 @@ same name used by the shell command in returning the data. See the plug-in output specification mentioned above for details.</para> - <para/> + <para></para> </listitem> <listitem> @@ -26,7 +35,7 @@ (the difference between the current and the previous value is greater than 0). Traffic counters on a router are an ideal candidate for using COUNTER. DERIVE is the same as COUNTER, but it allows negative values as - well. If you want to see the rate of change in free diskspace on your + well. If you want to see the rate of change in free disk space on your server, then you might want to use the DERIVE. ABSOLUTE also saves the rate of change, but it assumes that the previous value is set to 0. The difference between the current and the previous value is always equal to @@ -44,21 +53,21 @@ artificial spike in the system and will create statistical anomalies.</para> - <para/> + <para></para> </listitem> <listitem> <para>RRDMin - Any value received less than this number will be ignored.</para> - <para/> + <para></para> </listitem> <listitem> <para>RRDMax - Any value received greater than this number will be ignored.</para> - <para/> + <para></para> </listitem> <listitem> @@ -68,12 +77,14 @@ command can be found at http://oss.oetiker.ch/rrdtool/doc/rrdcreate.en.html</para> - <figure><info><title>Data Points</title></info> - + <figure> + <info> + <title>Data Points</title> + </info> <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/datapoints.png" scale="65"/> + <imagedata fileref="Graphics/screens/datapoints.png" scale="65"></imagedata> </imageobject> </mediaobject> </figure> Modified: trunk/zendocs/AdminGuide/docbook/DeviceClass.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/DeviceClass.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/DeviceClass.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -1,5 +1,13 @@ -<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Classes"><info><title>Classes</title></info> - +<?xml version="1.0" encoding="UTF-8"?> +<section version="5.0" xml:id="Classes" xmlns="http://docbook.org/ns/docbook" + xmlns:ns52="http://www.w3.org/1999/xhtml" + xmlns:ns5="http://www.w3.org/1999/xlink" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1998/Math/MathML" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Classes</title> + </info> <para>The most important organizer within Zenoss is Class. There are Device Classes, Event Classes, Service Classes, and Product Classes. Templates and @@ -16,20 +24,23 @@ <para>To see all of the device in Device Class:</para> - <orderedlist inheritnum="ignore" continuation="restarts"> + <orderedlist continuation="restarts" inheritnum="ignore"> <listitem> <para>From the left navigation menu, select Devices.</para> - <para>The Device Classes tab appears. Notice that the navigation path - above the tab has changed to '/Devices'. Thats how you know where you - are in the class hierarchy.</para> + <para>The Device Classes tab appears. Notice the navigation path above + the tab has changed to '/Devices'. This is how you know your position + within the class hierarchy.</para> - <figure><info><title>Device Class Tab</title></info> - + <figure> + <info> + <title>Device Class Tab</title> + </info> <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/DeviceClasstab.png" scale="65"/> + <imagedata fileref="Graphics/screens/DeviceClasstab.png" + scale="65"></imagedata> </imageobject> </mediaobject> </figure> @@ -39,26 +50,31 @@ <para>The Device Class tab shows an event rainbow for that class level and a Summary for the next level of class hierarchy with an indicator of whether or not there any devices in any of the classes that have events associated - with them. </para> + with them.</para> - <section><info><title>Setting zProperties at the Class Level</title></info> - + <section> + <info> + <title>Setting zProperties at the Class Level</title> + </info> <para>To set zProperties at the Device Class Level:</para> - <para><orderedlist inheritnum="ignore" continuation="restarts"> + <para><orderedlist continuation="restarts" inheritnum="ignore"> <listitem> <para>Navigate to the Device Class tab for the class you where you want to set zProperties, and click the zProperties Tab.</para> <para>The zProperties tab for this Device Class appears.</para> - <figure><info><title>Device Class zProperties tab</title></info> - + <figure> + <info> + <title>Device Class zProperties tab</title> + </info> <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/DeviceClasszProp.png" scale="65"/> + <imagedata fileref="Graphics/screens/DeviceClasszProp.png" + scale="65"></imagedata> </imageobject> </mediaobject> </figure> @@ -72,24 +88,29 @@ </orderedlist></para> </section> - <section><info><title>Defining and Applying Templates at the Class Level</title></info> - + <section> + <info> + <title>Defining and Applying Templates at the Class Level</title> + </info> <para>To define Templates at the Device Class Level:</para> - <para><orderedlist inheritnum="ignore" continuation="restarts"> + <para><orderedlist continuation="restarts" inheritnum="ignore"> <listitem> <para>Navigate to the Device Class tab for the class you where you want to set Templates, and click the Templates Tab.</para> <para>The Templates tab for this Device Class appears.</para> - <figure><info><title>Device Class Template tab</title></info> - + <figure> + <info> + <title>Device Class Template tab</title> + </info> <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/DeviceClassTemp.png" scale="65"/> + <imagedata fileref="Graphics/screens/DeviceClassTemp.png" + scale="65"></imagedata> </imageobject> </mediaobject> </figure> @@ -103,8 +124,10 @@ </orderedlist></para> </section> - <section><info><title>Creating New Classes</title></info> - + <section> + <info> + <title>Creating New Classes</title> + </info> <para>To create a new Device Class:</para> Modified: trunk/zendocs/AdminGuide/docbook/DeviceList.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/DeviceList.xml 2008-05-09 20:20:42 UTC (rev 9199) +++ trunk/zendocs/AdminGuide/docbook/DeviceList.xml 2008-05-09 20:32:02 UTC (rev 9200) @@ -1,5 +1,14 @@ -<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="DeviceList"><info><title>Device List</title></info> - +<?xml version="1.0" encoding="UTF-8"?> +<section version="5.0" xml:id="DeviceList" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns52="http://www.w3.org/1999/xhtml" + xmlns:ns5="http://www.w3.org/1999/xlink" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1998/Math/MathML" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Device List</title> + </info> <para>The Device List shows a list of all the Devices in the system. You can search for all devices, see an event summary/ You can also perform some @@ -11,27 +20,31 @@ <para>The Device List appears.</para> ... [truncated message content] |
|
From: <sv...@ze...> - 2008-05-09 20:20:35
|
Author: ecn
Date: 2008-05-09 16:20:42 -0400 (Fri, 09 May 2008)
New Revision: 9199
Modified:
trunk/Products/ZenHub/services/PingConfig.py
trunk/Products/ZenStatus/zenping.py
Log:
* fixes #3120:
- zenping notes when files with issues are no longer pinged
- turned on notifications when the config changes
- refactored the code to copy properties into a utility
- needs to process the updated config when it is sent
Modified: trunk/Products/ZenHub/services/PingConfig.py
===================================================================
--- trunk/Products/ZenHub/services/PingConfig.py 2008-05-09 17:09:12 UTC (rev 9198)
+++ trunk/Products/ZenHub/services/PingConfig.py 2008-05-09 20:20:42 UTC (rev 9199)
@@ -54,6 +54,10 @@
return tree.root
+ def getDeviceConfig(self, device):
+ return device
+
+
def lookupByIp(self, dmd, fallbackIp):
"""Try to find the root device by our IP
"""
@@ -69,4 +73,4 @@
pingtree.addDevice(device)
def sendDeviceConfig(self, listener, config):
- listener.callRemote('updateConfig')
+ return listener.callRemote('updateConfig')
Modified: trunk/Products/ZenStatus/zenping.py
===================================================================
--- trunk/Products/ZenStatus/zenping.py 2008-05-09 17:09:12 UTC (rev 9198)
+++ trunk/Products/ZenStatus/zenping.py 2008-05-09 20:20:42 UTC (rev 9199)
@@ -30,7 +30,7 @@
from Products.ZenUtils.Utils import unused
unused(pingtree) # needed for pb
-from Products.ZenEvents.ZenEventClasses import Status_Ping
+from Products.ZenEvents.ZenEventClasses import Status_Ping, Clear
from Products.ZenHub.PBDaemon import FakeRemote, PBDaemon
from Products.ZenUtils.DaemonStats import DaemonStats
from Products.ZenUtils.Driver import drive, driveLater
@@ -57,7 +57,9 @@
reconfigured = True
loadingConfig = None
+
def __init__(self):
+ self.pingtree = None
PBDaemon.__init__(self, keeproot=True)
if not self.options.useFileDescriptor:
self.openPrivilegedPort('--ping')
@@ -75,17 +77,20 @@
def config(self):
return self.services.get('PingConfig', FakeRemote())
+
def stopOnError(self, error):
self.log.exception(error)
self.stop()
return error
+
def connected(self):
self.log.debug("Connected, getting config")
d = drive(self.loadConfig)
d.addCallback(self.pingCycle)
d.addErrback(self.stopOnError)
+
def sendPingEvent(self, pj):
"Send an event based on a ping job to the event backend."
evt = dict(device=pj.hostname,
@@ -103,7 +108,7 @@
self.sendEvent(evt)
def loadConfig(self, driver):
- "Get the configuration for zenpin"
+ "Get the configuration for zenping"
if self.loadingConfig:
self.log.warning("Configuration still loading. Started at %s" %
@@ -114,19 +119,7 @@
self.log.info('fetching monitor properties')
yield self.config().callRemote('propertyItems')
- items = dict(driver.next())
- for att in ("pingTimeOut",
- "pingTries",
- "pingChunk",
- "pingCycleInterval",
- "configCycleInterval",
- "maxPingFailures",
- ):
- before = getattr(self, att)
- after = items.get(att, before)
- setattr(self, att, after)
- self.configCycleInterval *= 60
- self.reconfigured = True
+ self.copyItems(driver.next())
driveLater(self.configCycleInterval, self.loadConfig)
@@ -149,7 +142,8 @@
yield self.config().callRemote('getPingTree',
self.options.name,
findIp())
- self.pingtree = driver.next()
+ oldtree, self.pingtree = self.pingtree, driver.next()
+ self.clearDeletedDevices(oldtree)
self.rrdStats.gauge('configTime',
self.configCycleInterval,
@@ -313,6 +307,12 @@
self.sendPingEvent(pj)
+ def remote_setPropertyItems(self, items):
+ "The config has changed, maybe the device list is different"
+ self.copyItems(items)
+ self.remote_updateConfig()
+
+
def remote_updateConfig(self):
self.log.debug("Asynch update config")
if self.loadingConfig:
@@ -322,11 +322,46 @@
self.log.error("Error loading config: %s" % result)
d.addErrback(reportError)
+
+ def copyItems(self, items):
+ items = dict(items)
+ for att in ("pingTimeOut",
+ "pingTries",
+ "pingChunk",
+ "pingCycleInterval",
+ "configCycleInterval",
+ "maxPingFailures",
+ ):
+ before = getattr(self, att)
+ after = items.get(att, before)
+ setattr(self, att, after)
+ self.configCycleInterval *= 60
+ self.reconfigured = True
+
+
+ def clearDevice(self, device):
+ self.sendEvent(dict(device=device,
+ eventClass=Status_Ping,
+ summary="No longer testing device",
+ severity=Clear))
+
+
+ def clearDeletedDevices(self, oldtree):
+ "Send clears for any device we stop pinging"
+ down = set()
+ if oldtree:
+ down = set([pj.hostname for pj in oldtree.pjgen() if pj.status])
+ all = set([pj.hostname for pj in self.pingtree.pjgen()])
+ for device in down - all:
+ self.clearDevice(device)
+
+
def remote_deleteDevice(self, device):
self.log.debug("Asynch delete device %s" % device)
+ self.clearDevice(device)
self.remote_updateConfig()
-
+
def findIp():
try:
return gethostbyname(getfqdn())
|
|
From: <sv...@ze...> - 2008-05-09 17:09:07
|
Author: ecn
Date: 2008-05-09 13:09:12 -0400 (Fri, 09 May 2008)
New Revision: 9198
Modified:
trunk/Products/ZenRRD/zenrender.py
Log:
* proxy requests failed becaue ms is not an allowed value: it's just there to make IE refetch the graph
Modified: trunk/Products/ZenRRD/zenrender.py
===================================================================
--- trunk/Products/ZenRRD/zenrender.py 2008-05-08 20:12:19 UTC (rev 9197)
+++ trunk/Products/ZenRRD/zenrender.py 2008-05-09 17:09:12 UTC (rev 9198)
@@ -65,6 +65,10 @@
self.rs = RenderServer(self.name)
def remote_render(self, *args, **kw):
+ try:
+ del kw['ms']
+ except KeyError:
+ pass
return self.rs.render(*args, **kw)
def remote_packageRRDFiles(self, *args, **kw):
|
|
From: <sv...@ze...> - 2008-05-08 20:12:46
|
Author: ecn Date: 2008-05-08 16:12:19 -0400 (Thu, 08 May 2008) New Revision: 9197 Modified: trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py Log: * add copyright Modified: trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py =================================================================== --- trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py 2008-05-08 19:02:33 UTC (rev 9196) +++ trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py 2008-05-08 20:12:19 UTC (rev 9197) @@ -1,3 +1,15 @@ +########################################################################### +# +# This program is part of Zenoss Core, an open source monitoring platform. +# Copyright (C) 2008, Zenoss Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. +# +# For complete information please visit: http://www.zenoss.com/oss/ +# +########################################################################### import Migrate class RemoveWinModelerGraphPoints(Migrate.Step): |
|
From: <sv...@ze...> - 2008-05-08 19:02:39
|
Author: ecn Date: 2008-05-08 15:02:33 -0400 (Thu, 08 May 2008) New Revision: 9196 Added: trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py Modified: trunk/Products/ZenModel/migrate/__init__.py Log: * fixes #3118: remove zenwinmodeler datapoints from Performance Template Modified: trunk/Products/ZenModel/migrate/__init__.py =================================================================== --- trunk/Products/ZenModel/migrate/__init__.py 2008-05-08 18:35:05 UTC (rev 9195) +++ trunk/Products/ZenModel/migrate/__init__.py 2008-05-08 19:02:33 UTC (rev 9196) @@ -144,3 +144,4 @@ import addeventmenuitem import runcommandspermission import winmodelerUnderModeler +import removeWinModelerGraphPoints Added: trunk/Products/ZenModel/migrate/removeWinModelerGraphPoints.py |
|
From: <sv...@ze...> - 2008-05-08 18:35:27
|
Author: ecn
Date: 2008-05-08 14:35:05 -0400 (Thu, 08 May 2008)
New Revision: 9195
Modified:
trunk/Products/ZenWin/WinCollector.py
Log:
* fixes #3122: catch the raise of failure.Failure instances
Modified: trunk/Products/ZenWin/WinCollector.py
===================================================================
--- trunk/Products/ZenWin/WinCollector.py 2008-05-08 17:26:57 UTC (rev 9194)
+++ trunk/Products/ZenWin/WinCollector.py 2008-05-08 18:35:05 UTC (rev 9195)
@@ -35,6 +35,7 @@
from NullProxy import NullProxy
from twisted.internet.defer import DeferredList
+from twisted.python.failure import Failure
MAX_THREADS_WAITING = 10
MAX_WAIT_FOR_WMI_REQUEST = 10
@@ -118,7 +119,7 @@
deferreds = self.processLoop()
if self.options.cycle:
self.heartbeat()
- except Exception, ex:
+ except (Failure, Exception), ex:
self.log.exception("Error processing main loop")
delay = time.time() - now
if self.options.cycle:
|
|
From: <sv...@ze...> - 2008-05-08 17:27:08
|
Author: ian
Date: 2008-05-08 13:26:57 -0400 (Thu, 08 May 2008)
New Revision: 9194
Modified:
trunk/Products/DataCollector/WmiClient.py
Log:
fixes #3125: kill long running zenwinmodelers
Modified: trunk/Products/DataCollector/WmiClient.py
===================================================================
--- trunk/Products/DataCollector/WmiClient.py 2008-05-08 15:28:40 UTC (rev 9193)
+++ trunk/Products/DataCollector/WmiClient.py 2008-05-08 17:26:57 UTC (rev 9194)
@@ -35,6 +35,7 @@
self.process = None
def stop(self):
+ import signal
if not self.process:
return
try:
@@ -53,5 +54,5 @@
args = ('run', '-d', self.device.id)
if '--weblog' in sys.argv:
args += ('--weblog',)
- reactor.spawnProcess(self, modeler, (modeler,) + args, env=None)
+ self.process = reactor.spawnProcess(self, modeler, (modeler,) + args, env=None)
|
|
From: <sv...@ze...> - 2008-05-08 15:28:52
|
Author: cluther
Date: 2008-05-08 11:28:40 -0400 (Thu, 08 May 2008)
New Revision: 9193
Modified:
trunk/Products/ZenEvents/SyslogProcessing.py
Log:
* Update the newly added MSSS syslog parsing regex.
Modified: trunk/Products/ZenEvents/SyslogProcessing.py
===================================================================
--- trunk/Products/ZenEvents/SyslogProcessing.py 2008-05-08 01:09:05 UTC (rev 9192)
+++ trunk/Products/ZenEvents/SyslogProcessing.py 2008-05-08 15:28:40 UTC (rev 9193)
@@ -54,7 +54,7 @@
r"^(?P<deviceModel>[^\[]+)\[(?P<deviceManufacturer>ADTRAN)\]:(?P<component>[^\|]+\|\d+\|\d+)\|(?P<summary>.*)",
# proprietary message passing system
-r"^(?P<component>\S+) (LOG|RSE) \d \S+ \d\d:\d\d:\d\d-\d\d:\d\d:\d\d \d{5} \d{2} \d{5} \S+ \d{4} \d{5} - (?P<summary>.*) \d{4} \d{4}",
+r"^(?P<component>\S+)(\.|\s)[A-Z]{3} \d \S+ \d\d:\d\d:\d\d-\d\d:\d\d:\d\d \d{5} \d{2} \d{5} \S+ \d{4} \d{3,5} (- )*(?P<summary>.*) \d{4} \d{4}",
)
# compile regex parsers on load
|
|
From: <sv...@ze...> - 2008-05-08 01:08:57
|
Author: cluther
Date: 2008-05-07 21:09:05 -0400 (Wed, 07 May 2008)
New Revision: 9192
Modified:
trunk/Products/ZenEvents/SyslogProcessing.py
Log:
* Adds support for another syslog format.
Modified: trunk/Products/ZenEvents/SyslogProcessing.py
===================================================================
--- trunk/Products/ZenEvents/SyslogProcessing.py 2008-05-07 15:00:29 UTC (rev 9191)
+++ trunk/Products/ZenEvents/SyslogProcessing.py 2008-05-08 01:09:05 UTC (rev 9192)
@@ -51,7 +51,10 @@
r"(?P<component>\S+): (?P<summary>.*)",
# adtran devices
-r"^(?P<deviceModel>[^\[]+)\[(?P<deviceManufacturer>ADTRAN)\]:(?P<component>[^\|]+\|\d+\|\d+)\|(?P<summary>.*)"
+r"^(?P<deviceModel>[^\[]+)\[(?P<deviceManufacturer>ADTRAN)\]:(?P<component>[^\|]+\|\d+\|\d+)\|(?P<summary>.*)",
+
+# proprietary message passing system
+r"^(?P<component>\S+) (LOG|RSE) \d \S+ \d\d:\d\d:\d\d-\d\d:\d\d:\d\d \d{5} \d{2} \d{5} \S+ \d{4} \d{5} - (?P<summary>.*) \d{4} \d{4}",
)
# compile regex parsers on load
|
|
From: <sv...@ze...> - 2008-05-07 15:00:29
|
Author: ian Date: 2008-05-07 11:00:29 -0400 (Wed, 07 May 2008) New Revision: 9191 Modified: branches/zenoss-2.2.x/Products/ZenModel/ZVersion.py Log: * Incrementing ZVersion to 2.2.0 Modified: branches/zenoss-2.2.x/Products/ZenModel/ZVersion.py =================================================================== --- branches/zenoss-2.2.x/Products/ZenModel/ZVersion.py 2008-05-07 14:56:12 UTC (rev 9190) +++ branches/zenoss-2.2.x/Products/ZenModel/ZVersion.py 2008-05-07 15:00:29 UTC (rev 9191) @@ -10,4 +10,4 @@ # For complete information please visit: http://www.zenoss.com/oss/ # ########################################################################### -VERSION="2.1.92" +VERSION="2.2.0" |
|
From: <sv...@ze...> - 2008-05-07 14:56:21
|
Author: ian Date: 2008-05-07 10:56:12 -0400 (Wed, 07 May 2008) New Revision: 9190 Modified: trunk/Products/ZenModel/ZVersion.py Log: * Updated ZVersion.py to 2.2.0 Modified: trunk/Products/ZenModel/ZVersion.py =================================================================== --- trunk/Products/ZenModel/ZVersion.py 2008-05-07 14:42:06 UTC (rev 9189) +++ trunk/Products/ZenModel/ZVersion.py 2008-05-07 14:56:12 UTC (rev 9190) @@ -10,4 +10,4 @@ # For complete information please visit: http://www.zenoss.com/oss/ # ########################################################################### -VERSION="2.1.92" +VERSION="2.2.0" |
|
From: <sv...@ze...> - 2008-05-07 14:42:26
|
Author: abray Date: 2008-05-07 10:42:06 -0400 (Wed, 07 May 2008) New Revision: 9189 Modified: trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt trunk/inst/docs/INSTALL_ONECLICK_GNOME.txt trunk/inst/docs/INSTALL_ONECLICK_KDE.txt Log: changing line wraps on these files for web readiness Modified: trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt =================================================================== --- trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt 2008-05-07 14:21:31 UTC (rev 9188) +++ trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt 2008-05-07 14:42:06 UTC (rev 9189) @@ -5,40 +5,40 @@ 2. Bring up a command-line prompt and cd into the download directory: - $ cd Desktop/Downloads # <- use your download directory +$ cd Desktop/Downloads # <- use your download directory 3. Make the installer exectuable: - $ chmod +x ./zenoss*.bin +$ chmod +x ./zenoss*.bin -4. Execute the installer as root. If you know your root password, - use the su command: +4. Execute the installer as root. If you know your root password, use +the su command: - $ su root -c ./zenoss*.bin +$ su root -c ./zenoss*.bin - If you don't know your root password, use the sudo command: +If you don't know your root password, use the sudo command: - $ sudo ./zenoss*.bin +$ sudo ./zenoss*.bin 5. Answer the installation prompts. The package will be installed in - /usr/local/zenoss. +/usr/local/zenoss. -6. The package will create a zenoss user with a home directory in /home/zenoss. - In order to run commands that are specified in the Zenoss admin guide, - you must become the zenoss user. If you know your root password, - use the su command to become root, then to become zenoss: +6. The package will create a zenoss user with a home directory in +/home/zenoss. In order to run commands that are specified in the +Zenoss admin guide, you must become the zenoss user. If you know your +root password, use the su command to become root, then to become +zenoss: - $ su - root - # su - zenoss +$ su - root # su - zenoss - If you don't know your root password, use the sudo command: +If you don't know your root password, use the sudo command: - $ sudo su - zenoss +$ sudo su - zenoss - If you would prefer not to become the zenoss user, you can also run: +If you would prefer not to become the zenoss user, you can also run: - $ /usr/local/zenoss/zenconsole +$ /usr/local/zenoss/zenconsole - To enter a shell with the Zenoss environment. You can then start/stop - daemons, enter zendmd, and perform other command line tasks. +To enter a shell with the Zenoss environment. You can then start/stop +daemons, enter zendmd, and perform other command line tasks. Modified: trunk/inst/docs/INSTALL_ONECLICK_GNOME.txt =================================================================== --- trunk/inst/docs/INSTALL_ONECLICK_GNOME.txt 2008-05-07 14:21:31 UTC (rev 9188) +++ trunk/inst/docs/INSTALL_ONECLICK_GNOME.txt 2008-05-07 14:42:06 UTC (rev 9189) @@ -2,16 +2,16 @@ ================================================== 1. Download the latest version of the package from - http://www.zenoss.com/download. +http://www.zenoss.com/download. -2. Make the file executable. Locate the downloaded file, - and right-click on it, and select the "Properties" menu item. +2. Make the file executable. Locate the downloaded file, and +right-click on it, and select the "Properties" menu item. -3. Select the "Permissions" tab and check the "Allow executing file - as program" check box. Close the dialog. +3. Select the "Permissions" tab and check the "Allow executing file as +program" check box. Close the dialog. -4. Run the program as root. Right click on the file and select - the "Open with Other Application..." menu item. +4. Run the program as root. Right click on the file and select the +"Open with Other Application..." menu item. 5. Select the "Use a custom command" item. Enter "gksu". Modified: trunk/inst/docs/INSTALL_ONECLICK_KDE.txt =================================================================== --- trunk/inst/docs/INSTALL_ONECLICK_KDE.txt 2008-05-07 14:21:31 UTC (rev 9188) +++ trunk/inst/docs/INSTALL_ONECLICK_KDE.txt 2008-05-07 14:42:06 UTC (rev 9189) @@ -2,16 +2,16 @@ ================================================== 1. Download the latest version of the package from - http://www.zenoss.com/download. +http://www.zenoss.com/download. -2. Make the file executable. Locate the downloaded file, - and right-click on it, and select the "Properties" menu item. +2. Make the file executable. Locate the downloaded file, and +right-click on it, and select the "Properties" menu item. -3. Select the "Permissions" tab and check the "Is executable" - check box. Select "Ok" to close the dialog. +3. Select the "Permissions" tab and check the "Is executable" check +box. Select "Ok" to close the dialog. -4. Run the program as root. Right click on the file and select - the "Open With ..." menu item. +4. Run the program as root. Right click on the file and select the +"Open With ..." menu item. 5. Enter "kdesu" as the command to open the Zenoss installer. |
|
From: <sv...@ze...> - 2008-05-07 14:22:09
|
Author: abray Date: 2008-05-07 10:21:31 -0400 (Wed, 07 May 2008) New Revision: 9188 Added: trunk/inst/docs/Zenoss-One-Click_Install.pdf Log: adding ppdf of install doc Added: trunk/inst/docs/Zenoss-One-Click_Install.pdf Property changes on: trunk/inst/docs/Zenoss-One-Click_Install.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
