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
|
Author: cholden Date: 2008-04-23 10:10:34 -0400 (Wed, 23 Apr 2008) New Revision: 9087 Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/PKG-INFO trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/SOURCES.txt trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/dependency_links.txt trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/entry_points.txt trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/namespace_packages.txt trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/not-zip-safe trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/top_level.txt trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/zenpack_info trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/__init__.py trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/__init__.py trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/daemons/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/datasources/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/datasources/JabberMonitorDataSource.py trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/datasources/__init__.py trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/migrate/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/modeler/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/modeler/plugins/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/objects/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/objects/objects.xml trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/reports/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/skins/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/skins/JabberMonitor/ trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/skins/JabberMonitor/editJabberMonitorDataSource.pt trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/__init__.py trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/setup.py Log: refs #3025 Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/datasources/JabberMonitorDataSource.py Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/datasources/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/objects/objects.xml Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/JabberMonitor/skins/JabberMonitor/editJabberMonitorDataSource.pt Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks/zenoss/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/PKG-INFO Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/SOURCES.txt Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/dependency_links.txt Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/entry_points.txt Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/namespace_packages.txt Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/not-zip-safe Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/top_level.txt Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/ZenPacks.zenoss.JabberMonitor.egg-info/zenpack_info Added: trunk/zenpacks/ZenPacks.zenoss.JabberMonitor/setup.py |
|
From: <sv...@ze...> - 2008-04-23 13:30:15
|
Author: ian
Date: 2008-04-23 09:30:17 -0400 (Wed, 23 Apr 2008)
New Revision: 9086
Modified:
trunk/Products/ZenWidgets/skins/zenui/javascript/devicezengrid.js
Log:
* Fixes #3018: Inexplicably, IE threw an exception. Caught and ignored it.
Modified: trunk/Products/ZenWidgets/skins/zenui/javascript/devicezengrid.js
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/javascript/devicezengrid.js 2008-04-22 20:15:47 UTC (rev 9085)
+++ trunk/Products/ZenWidgets/skins/zenui/javascript/devicezengrid.js 2008-04-23 13:30:17 UTC (rev 9086)
@@ -438,7 +438,11 @@
var cell = e.src();
var f = fieldmap[cell.getElementsByTagName('div')[0].innerHTML];
var headcells = this.headers.getElementsByTagName('td');
- var clearcell = function(cell){setStyle(cell,{'background':null,'color':null})}
+ var clearcell = function(cell){
+ try {
+ setStyle(cell,{'background':null,'color':null});
+ } catch(e) { noop(); }
+ }
map(clearcell, headcells);
if (f) {
if (this.lastparams['orderby']==f) {
|
|
From: <sv...@ze...> - 2008-04-22 20:15:45
|
Author: cluther
Date: 2008-04-22 16:15:47 -0400 (Tue, 22 Apr 2008)
New Revision: 9085
Modified:
trunk/Products/ZenHub/services/PerformanceConfig.py
Log:
* Fixes #3017: Fix for SNMPv3 with no priv or auth type.
Modified: trunk/Products/ZenHub/services/PerformanceConfig.py
===================================================================
--- trunk/Products/ZenHub/services/PerformanceConfig.py 2008-04-22 18:47:35 UTC (rev 9084)
+++ trunk/Products/ZenHub/services/PerformanceConfig.py 2008-04-22 20:15:47 UTC (rev 9085)
@@ -85,7 +85,7 @@
elif self.zSnmpAuthType:
cmdLineArgs += ['-l', 'authNoPriv']
else:
- cmdLineArgs += ['-l', 'authNoAuthNoPriv']
+ cmdLineArgs += ['-l', 'noAuthNoPriv']
if self.zSnmpAuthType:
cmdLineArgs += ['-a', self.zSnmpAuthType]
cmdLineArgs += ['-A', self.zSnmpAuthPassword]
|
|
From: <sv...@ze...> - 2008-04-22 18:47:40
|
Author: ian
Date: 2008-04-22 14:47:35 -0400 (Tue, 22 Apr 2008)
New Revision: 9084
Modified:
trunk/Products/ZenEvents/EventManagerBase.py
Log:
* Refs #2946: Syntax error. I'm an idiot.
Modified: trunk/Products/ZenEvents/EventManagerBase.py
===================================================================
--- trunk/Products/ZenEvents/EventManagerBase.py 2008-04-22 18:43:27 UTC (rev 9083)
+++ trunk/Products/ZenEvents/EventManagerBase.py 2008-04-22 18:47:35 UTC (rev 9084)
@@ -1681,7 +1681,8 @@
'''
if status < 0:
src = 'grey'
- colors = "green yellow orange red".split()
+ else:
+ colors = "green yellow orange red".split()
try:
src = colors[status]
except IndexError:
|
|
From: <sv...@ze...> - 2008-04-22 18:43:30
|
Author: ian
Date: 2008-04-22 14:43:27 -0400 (Tue, 22 Apr 2008)
New Revision: 9083
Modified:
trunk/Products/ZenEvents/EventManagerBase.py
Log:
* Fixes #2946: Dots should be the right color now.
Modified: trunk/Products/ZenEvents/EventManagerBase.py
===================================================================
--- trunk/Products/ZenEvents/EventManagerBase.py 2008-04-22 18:32:50 UTC (rev 9082)
+++ trunk/Products/ZenEvents/EventManagerBase.py 2008-04-22 18:43:27 UTC (rev 9083)
@@ -1681,14 +1681,11 @@
'''
if status < 0:
src = 'grey'
- elif status == 0:
- src = 'green'
- elif status == 1:
- src = 'yellow'
- elif status == 2:
- src = 'yellow'
- else:
- src = 'red'
+ colors = "green yellow orange red".split()
+ try:
+ src = colors[status]
+ except IndexError:
+ src = 'red'
return '/zport/dmd/img/%s_dot.png' % src
|
Author: cgibbons Date: 2008-04-22 14:32:50 -0400 (Tue, 22 Apr 2008) New Revision: 9082 Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/INSTALL.txt trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/README.txt trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/__init__.py trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/__init__.py trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/daemons/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/datasources/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/datasources/RPCMonitorDataSource.py trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/datasources/__init__.py trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/lib/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/lib/__init__.py trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/migrate/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/migrate/__init__.py trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/modeler/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/modeler/plugins/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/objects/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/objects/objects.xml trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/reports/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/skins/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/skins/ZenPacks.zenoss.RPCMonitor/ trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/skins/ZenPacks.zenoss.RPCMonitor/editRPCMonitorDataSource.pt trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/__init__.py trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/setup.py Log: * Fixes #3010 : ZenPack created for monitoring RPC services using nagios check_rpc plug-in Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/INSTALL.txt Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/README.txt Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/datasources/RPCMonitorDataSource.py Property changes on: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/datasources/RPCMonitorDataSource.py ___________________________________________________________________ Name: svn:executable + * Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/datasources/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/lib/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/migrate/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/objects/objects.xml Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/RPCMonitor/skins/ZenPacks.zenoss.RPCMonitor/editRPCMonitorDataSource.pt Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/ZenPacks/zenoss/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.RPCMonitor/setup.py |
|
From: <sv...@ze...> - 2008-04-22 17:55:05
|
Author: ecn Date: 2008-04-22 13:55:07 -0400 (Tue, 22 Apr 2008) New Revision: 9081 Modified: trunk/inst/docs/INSTALL_Source.txt Log: * update install directions Modified: trunk/inst/docs/INSTALL_Source.txt =================================================================== --- trunk/inst/docs/INSTALL_Source.txt 2008-04-22 17:24:05 UTC (rev 9080) +++ trunk/inst/docs/INSTALL_Source.txt 2008-04-22 17:55:07 UTC (rev 9081) @@ -10,6 +10,8 @@ 1.1. Major Dependencies +- A build environment including binutils, gcc/g++. + - MySQL 5.0.x Where x >= 22. @@ -17,9 +19,6 @@ * Make sure you assign a password to root * Make sure mysql_config is in the path -- Python 2.3.5 or 2.4 * note the development environment is required (i.e. -python-dev)! - - GNU build environment (GNU Make) - SWIG >= 1.3 @@ -37,8 +36,9 @@ environment; add the following to the appropriate rc or profile for your shell (e.g., .bashrc, .profile, etc.): -export ZENHOME=/usr/local/zenoss export PYTHONPATH=$ZENHOME/lib/python export -PATH=$ZENHOME/bin:$PATH +export ZENHOME=/usr/local/zenoss +export PYTHONPATH=$ZENHOME/lib/python +export PATH=$ZENHOME/bin:$PATH ZENHOME is the path to your zenoss install. PYTHONPATH lets python find the libraries we use. @@ -46,7 +46,7 @@ We recommend installing in a directory *other than* the Zenoss' user home directory (e.g., don't use /home/zenoss). The reason for this recommendation is that once you learn more about Zenoss (or if you encounter problems during -installtion), you may need to reinstall at some point, and this will be much +installation), you may need to reinstall at some point, and this will be much easier if you have a dedicated directory for the installtion. - When you run the install script below, you will need to login as the zenoss @@ -54,7 +54,8 @@ - Create the Zenoss install directory and set the ownership: -bash$ mkdir /usr/local/zenoss bash$ chown zenoss /usr/local/zenoss +bash$ mkdir /usr/local/zenoss +bash$ chown zenoss /usr/local/zenoss - Start MySQL (if it's not already started...) @@ -68,41 +69,41 @@ bash$ svn co http://dev.zenoss.org/svn/trunk/inst zenossinst -notes: - this will put the installer files in the directory zenossinst - the -following commands are run from this directory +notes: + - this will put the installer files in the directory zenossinst + - the following commands are run from this directory - - Run the Zenoss installation script bash$ ./install.sh -notes: - to clean a failed install, execute the following command: bash$ make -clean +notes: +- to clean a failed install, execute the following command: + bash$ make clean + - all files needed for execution will be built and installed under $ZENHOME, -including Zenoss and other components such as Zope, RDD, PySNMP, Twisted, etc. +including Zenoss and other components such as Zope, RDD, Twisted, etc. - This script will create several tables as well as a trigger to move events from status -> history on deletion. This trigger requires "SUPER" permission which is granted to root by default (but can be granted to other users manually). -- There seems to be a problem with clustering and the "in memory" table zenoss -uses for active events. For now, please use a single mysql instance. - - By default, the zenoss web server will listen on port 8080. This can changed by modifying $ZENHOME/zope.conf and other references to the port number in deamon configs. - zensocket needs to be setuid in order to open raw sockets. As root, run: -chown root:zenoss /usr/local/zenoss/bin/zensocket chmod 04750 -/usr/local/zenoss/bin/zensocket + chown root:zenoss /usr/local/zenoss/bin/zensocket + chmod 04750 /usr/local/zenoss/bin/zensocket - Access the Zenoss portal -Web Browser: - go to url http://hostname:8080/zport/dmd - username is "admin" - -password is the one entered for Zenoss "admin" user +Web Browser: - go to url http://hostname:8080/zport/dmd + - username is "admin" + - password is the one entered for Zenoss "admin" user 2. Start Daemons @@ -112,21 +113,26 @@ - The entire system can be stopped and started using the "zenoss" script. Start it up: -bash$ $ZENHOME/bin/zenoss start + bash$ $ZENHOME/bin/zenoss start - Now all daemons should be running. Check by running: -bash$ $ZENHOME/bin/zenoss status + bash$ $ZENHOME/bin/zenoss status expected output: -Daemon: zeoctl program running; pid=4295 Daemon: zopectl program running; -pid=4299 Daemon: zenhub program running; pid=1093 Daemon: zenping program -running; pid=8721 Daemon: zensyslog program running; pid=8726 Daemon: zenstatus -program running; pid=8731 Daemon: zenactions program running; pid=8736 Daemon: -zentrap program running; pid=8742 Daemon: zenmodeler program running; pid=8751 -Daemon: zenperfsnmp program running; pid=8757 Daemon: zencommand program -running; pid=8765 Daemon: zenprocess program running; pid=8770 +Daemon: zeoctl program running; pid=4295 +Daemon: zopectl program running; pid=4299 +Daemon: zenhub program running; pid=1093 +Daemon: zenping program running; pid=8721 +Daemon: zensyslog program running; pid=8726 +Daemon: zenstatus program running; pid=8731 +Daemon: zenactions program running; pid=8736 +Daemon: zentrap program running; pid=8742 +Daemon: zenmodeler program running; pid=8751 +Daemon: zenperfsnmp program running; pid=8757 +Daemon: zencommand program running; pid=8765 +Daemon: zenprocess program running; pid=8770 3. Platform Specific Notes @@ -146,16 +152,6 @@ - To create the zenoss user use System Preferences -> Accounts instead of useradd. -- To get the python bindings on Macos X with framework python: - -cd zenossinst mkdir build cd build tar zxf ../externallibs/rrdtool-1.2.11.tar.gz -cd rrdtool-1.2.11/bindings/python vi Makefile.in - -change the line: rrdtoolmodule_so_LDFLAGS = -module -shared - -to read: rrdtoolmodule_so_LDFLAGS = -Wl,-framework -Wl,Python -module --dynamiclib - If the installer cannot find mysql: modify the line in .bashrc: export PATH=$ZENHOME/bin:$PATH @@ -169,15 +165,21 @@ - You may want to increase the size of the systems net buffers. -on linux in the file /etc/sysctl.conf, add: net.core.rmem_default=1048576 -net.core.rmem_max=1048576 net.core.wmem_default=1048576 -net.core.wmem_max=1048576 +on linux in the file /etc/sysctl.conf, add: -to configure without a reboot: sysctl -w net.core.rmem_default=1048576 sysctl -w -net.core.rmem_max=1048576 sysctl -w net.core.wmem_default=1048576 sysctl -w -net.core.wmem_max=1048576 + net.core.rmem_default=1048576 + net.core.rmem_max=1048576 + net.core.wmem_default=1048576 + net.core.wmem_max=1048576 +to configure without a reboot: + + sysctl -w net.core.rmem_default=1048576 + sysctl -w net.core.rmem_max=1048576 + sysctl -w net.core.wmem_default=1048576 + sysctl -w net.core.wmem_max=1048576 + 3.4 Setting up Zenoss to run with a remote MySQL Instance -Please see the section "Using Zenoss with a Remote MySQL Instance" in the Zenoss -Admin Guide. +Please see the section "Using Zenoss with a Remote MySQL Instance" in +the Zenoss Admin Guide. |
|
From: <sv...@ze...> - 2008-04-22 17:24:11
|
Author: jstevens
Date: 2008-04-22 13:24:05 -0400 (Tue, 22 Apr 2008)
New Revision: 9080
Modified:
trunk/zendocs/AdminGuide/docbook/Backup-CH.xml
trunk/zendocs/AdminGuide/docbook/CreateZenpack.xml
trunk/zendocs/AdminGuide/docbook/InstallingZenpacks.xml
trunk/zendocs/AdminGuide/docbook/ZenPacks-CH.xml
Log:
refs #2475
* Modifications to ZenPack section
* Modifications to Backup/Restore section
Modified: trunk/zendocs/AdminGuide/docbook/Backup-CH.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/Backup-CH.xml 2008-04-22 17:16:40 UTC (rev 9079)
+++ trunk/zendocs/AdminGuide/docbook/Backup-CH.xml 2008-04-22 17:24:05 UTC (rev 9080)
@@ -158,8 +158,34 @@
<para>Print progress messages. Incompatible with --stdout.</para>
</section>
+ <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
+ Create New Backup section allows you to create a backup through the GUI.
+ The options available are a subset of those available with the zenbackup
+ command line tool (see above for details on the options.) Below that is
+ the Backups section which lists all backup files in $ZENHOME/backups.
+ You can delete one or more backup files by selecting them using the
+ checkboxes and selecting the Delete Backup... menu item. Backup files
+ can become large as your databases grow, so you may want to limit the
+ number of backups you keep if drive space becomes an issue.</para>
+ </section>
+
+ <section>
+ <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
+ problematic, etc. It will probably not help you recover from a situation
+ where your disk fails or any other failure that affects the system as a
+ whole. For this reason it is advisable to keep at least one recent
+ backup file on a different server, ideally at a different physical
+ location.</para>
+ </section>
+
<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
Modified: trunk/zendocs/AdminGuide/docbook/CreateZenpack.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/CreateZenpack.xml 2008-04-22 17:16:40 UTC (rev 9079)
+++ trunk/zendocs/AdminGuide/docbook/CreateZenpack.xml 2008-04-22 17:24:05 UTC (rev 9080)
@@ -1,12 +1,25 @@
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="CreateZenpack"><info><title>Creating a ZenPack</title></info>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="CreateZenpack"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns6="http://www.w3.org/1999/xlink"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title>Creating a ZenPack</title>
+ </info>
- <para>While logged into Zenoss as an Administrator click on Settings then on
- the ZenPacks tab. Use the "Create a ZenPack..." menu item from the page menu
- to create a new ZenPack. A dialog asks for the name of the new ZenPack as
- well as some other basic information. When you click the Save button the new
- ZenPack object is created in the database and a corresponding directory is
- created in $ZENHOME/Products/<NewZenPackId>.</para>
+ <para>When logged into Zenoss as an Administrator click on the Setting link
+ and then on the ZenPacks tab. Select the "Create a ZenPack..." menu item.
+ You will get a dialog asking for a name for your new ZenPack. The name must
+ be of the form ZenPacks.<organization>.<identifier>, where
+ organization is a name that identifies you or your organization and
+ identifier is a string that represents the intent of your ZenPack. For
+ example, ZenPacks.zenoss.HttpMonitor was created by zenoss to help monitor
+ HTTP sites. Once you have entered a name click the save button. This creates
+ both the ZenPack object in the database as well as a new directory in the
+ filesystem $ZENHOME/ZenPacks/<your zenpack id>.</para>
<para>Many types of objects can be added to a ZenPack via the user
interface. Some examples are:</para>
@@ -59,28 +72,31 @@
from the ZenPack by selecting the checkboxes next to them and using the
"Delete from ZenPack..." menu item.</para>
- <para>ZenPack items which are not database objects are added to a ZenPack by
- placing them in the correct location within
- $ZENHOME/Products/<YourZenPackId>. This is how you would add daemons,
- reports, skins, etc. See Section 22.5 An Example ZenPack and Section 22.6
- ZenPack Structure for more details on how to include these types of items
- within a ZenPack.</para>
+ <para>ZenPacks can contain items that are not zeo database items, such as
+ new daemons, Data Source types, skins, etc. These are added to a ZenPack by
+ placing them in the appropriate subdirectory within the ZenPack's directory.
+ See the Core ZenPacks at http://www.zenoss.com/community/projects/zenpacks/
+ for examples of how to incorporate such items into your ZenPack. Further
+ information regarding ZenPack development is available in the Zenoss
+ Developers Guide.</para>
<para>Discussion regarding development of ZenPacks takes place on the
zenoss-dev mailing list and forumns:
http://community.zenoss.com/forums/viewforum.php?f=3</para>
- <section><info><title>Packaging and Distributing Your ZenPack</title></info>
-
+ <section>
+ <info>
+ <title>Packaging and Distributing Your ZenPack</title>
+ </info>
- <para>ZenPacks are usually distributed as .zip files. To create the
- installable .zip file for a ZenPack use the "Export ZenPack..." menu item
+ <para>ZenPacks are usually distributed as .egg files. To create the
+ installable .egg file for a ZenPack use the "Export ZenPack..." menu item
in the page menu when viewing a ZenPack. The dialog that follows has two
options. The first option simply exports the ZenPack to a file named
- <ZenPackId>.zip in the $ZENHOME/exports directory on the Zenoss
+ <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 .zip file as described in Section 22.1 Installing
+ exported .egg file as described in Section 22.1 Installing
ZenPacks.</para>
<para>For information on how to make your ZenPack available on the
Modified: trunk/zendocs/AdminGuide/docbook/InstallingZenpacks.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/InstallingZenpacks.xml 2008-04-22 17:16:40 UTC (rev 9079)
+++ trunk/zendocs/AdminGuide/docbook/InstallingZenpacks.xml 2008-04-22 17:24:05 UTC (rev 9080)
@@ -1,39 +1,45 @@
<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="IntallZenpacks"><info><title>Installing ZenPacks</title></info>
- <para>ZenPacks can be installed either from the command line on the Zenoss
- server or via the Zenoss user interface.</para>
+ <para>ZenPacks are usually distributed as .egg files. Zenoss also supports
+ .zip files, though support for this format will be removed in a future
+ version of Zenoss. Either ZenPacks of either type can be installed from the
+ command line on the Zenoss server or via the Zenoss user interface.</para>
<section><info><title>Installing via the Command Line</title></info>
<para>The following ZenPack command can be used from the command line to
- install .zip ZenPack files:</para>
+ install ZenPack files:</para>
- <para><programlisting>zenpack run --install filename</programlisting>This
- unzips the specified file into $ZENHOME/Products/<ZenPackId> and
- installs the ZenPack into Zenoss. If you are authorizing a ZenPack you may
- sometimes want to install from a directory rather than a .zip file. The
- zenpack command can also take a directory as an option:</para>
+ <para><programlisting>zenpack --install <filename></programlisting></para>
- <para><programlisting>zenpack --install directoryname</programlisting>This
- copies the contents of the given directory into
- $ZENHOME/Products/<ZenPackId> and installs it. It is important to
- note that all files in the original directory have been copied, so further
- changes to those files will not take effect until you again install from
- that directory. You can avoid this if you wish by specifying --link to the
- zenpack command. This directs zenpack to create a symlink in
- $ZENHOME/Products rather than a copy of the directory you specify. This is
- often the most convenient way to install a ZenPack when the ZenPack is
- maintained in version control system.</para>
+ <para>If you have the source code for the ZenPack you can install directly
+ from that rather than from a .egg or .zip file. The command is the same,
+ you just specify the directory containing the source code. This copies the
+ source code into either $ZENHOME/ZenPacks (for newer egg ZenPacks) or
+ $ZENHOME/Products (for older style ZenPacks.)</para>
- <para><programlisting>zenpack --link --install directoryname</programlisting></para>
+ <para><programlisting>zenpack --install <directoryname></programlisting>If
+ you are developing a ZenPack you usually will want to maintain your source
+ code outside of $ZENHOME/ZenPacks or $ZENHOME/Products. This is advisable
+ for two reasons. First, if you issue a zenpack --remove command it will
+ delete your code from either of those two locations and you would lose
+ your files unless you had them backed up elsewhere. Second, if you are
+ maintaining your source code in a version control system it is frequently
+ more convenient to have the files reside elsewhere on the filesystem.
+ Using the --link option you can install the ZenPack but have Zenoss use
+ your code from its current location. Instead of installing your code in
+ $ZENHOME/ZenPacks or $ZENHOME/Products Zenoss will create a link in one of
+ those locations that points to your source code directory.</para>
+
+ <programlisting>zenpack --link --install <directoryname></programlisting>
</section>
<section><info><title>Installing via the User Interface</title></info>
- <para>You can upload and install a ZenPack .zip file via the user
+ <para>You can upload and install a ZenPack .egg or .zip file via the user
interface. From the Settings->ZenPacks page choose the Install
Zenpack... menu item. In the dialog that follows use the Browse button to
select the .zip file from your local computer. When you click the OK
@@ -43,19 +49,27 @@
<section><info><title>Installing All Core ZenPacks via RPM</title></info>
- <para>Zenoss also provides an RPM to the Zenoss Core ZenPacks. To install
- the ZenPacks from the ZenPack RPMs:</para>
+ <para>The Zenoss Core ZenPacks, along with third party ZenPacks, are
+ available for download individually from
+ http://www.zenoss.com/community/projects/zenpacks/. Also on that page is a
+ link to download an RPM that includes the most popular Core ZenPacks. To
+ install via the Core ZenPacks RPM follow these steps:</para>
<orderedlist inheritnum="ignore" continuation="restarts">
<listitem>
- <para>Make sure zeo is running.</para>
+ <para>Download the appropriate file from
+ http://www.zenoss.com/community/projects/zenpacks/all-core-zenpacks</para>
</listitem>
<listitem>
- <para>As root user, run the following command:</para>
+ <para>Make sure zeo is running (as zenoss user):<programlisting>zeoctl start</programlisting></para>
</listitem>
+
+ <listitem>
+ <para>Install the rpm (as root user):</para>
+
+ <para><programlisting>rpm -ihv <rpm file></programlisting></para>
+ </listitem>
</orderedlist>
-
- <para><programlisting>rpm -ihv <rpm name></programlisting></para>
</section>
</section>
\ No newline at end of file
Modified: trunk/zendocs/AdminGuide/docbook/ZenPacks-CH.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/ZenPacks-CH.xml 2008-04-22 17:16:40 UTC (rev 9079)
+++ trunk/zendocs/AdminGuide/docbook/ZenPacks-CH.xml 2008-04-22 17:24:05 UTC (rev 9080)
@@ -1,8 +1,20 @@
-<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="ZenPacks-CH"><info><title>ZenPacks</title></info>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter version="5.0" xml:id="ZenPacks-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/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title>ZenPacks</title>
+ </info>
- <section><info><title>Introduction to ZenPacks</title></info>
-
+ <section>
+ <info>
+ <title>Introduction to ZenPacks</title>
+ </info>
<para>A ZenPack is a package that adds new functionality to the Zenoss. A
ZenPack may add Action Rules, Event Classes, Event Commands, User
@@ -13,10 +25,10 @@
<para>ZenPacks are a mechanism for extending and modifying Zenoss. This
can be as simple as adding new Device Classes or Performance Templates or
as complex as extending the data model and providing new collection
- daemons. ZenPacks can be distributed (as .zip files) for installation on
- other Zenoss systems. Simple ZenPacks can be created completely within the
- Zenoss user interface while more complex ZenPacks require development of
- scripts or daemons in Python or another programming language.</para>
+ daemons. ZenPacks can be distributed for installation on other Zenoss
+ systems. Simple ZenPacks can be created completely within the Zenoss user
+ interface while more complex ZenPacks require development of scripts or
+ daemons in Python or another programming language.</para>
<para>For example, say you have developed a Performance Template for a new
piece of hardware. You've created Data Sources for the OID's you think are
@@ -38,16 +50,12 @@
for the previous example, but this functionality can still be distributed
as a ZenPack.</para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="InstallingZenpacks.xml" xpointer="IntallZenpacks"/>
+ <xi:include href="InstallingZenpacks.xml" xpointer="IntallZenpacks" />
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="CreateZenpack.xml" xpointer="CreateZenpack"/>
+ <xi:include href="CreateZenpack.xml" xpointer="CreateZenpack" />
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="ExampleZenpack.xml" xpointer="ExampleZenpack"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="ZenpackStructure.xml" xpointer="ZenpackStructure"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="RemoveZenpack.xml" xpointer="RemoveZenpack"/>
+ <xi:include href="RemoveZenpack.xml" xpointer="RemoveZenpack" />
</section>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="CoreZenpacks.xml" xpointer="corezenpacks"/>
+ <xi:include href="CoreZenpacks.xml" xpointer="corezenpacks" />
</chapter>
\ No newline at end of file
|
|
From: <sv...@ze...> - 2008-04-22 17:16:49
|
Author: ian
Date: 2008-04-22 13:16:40 -0400 (Tue, 22 Apr 2008)
New Revision: 9079
Modified:
trunk/Products/ZenWin/zenwinmodeler.py
Log:
add space to an error message
Modified: trunk/Products/ZenWin/zenwinmodeler.py
===================================================================
--- trunk/Products/ZenWin/zenwinmodeler.py 2008-04-22 16:00:44 UTC (rev 9078)
+++ trunk/Products/ZenWin/zenwinmodeler.py 2008-04-22 17:16:40 UTC (rev 9079)
@@ -217,7 +217,7 @@
wcode, source, descr, hfile, hcont, scode = info
scode = abs(scode)
if descr: wmsg = descr.strip()
- msg += "%d: %s" % (scode, wmsg)
+ msg += " %d: %s" % (scode, wmsg)
if msg.find('RPC_S_CALL_FAILED') >= 0:
# transient error, log it but don't create an event
self.log.exception('Ignoring: %s' % msg)
|
|
From: <sv...@ze...> - 2008-04-22 16:00:45
|
Author: ecn
Date: 2008-04-22 12:00:44 -0400 (Tue, 22 Apr 2008)
New Revision: 9078
Modified:
trunk/bin/runtests
Log:
* support ZOPEHOME != ZENHOME, and ZENHOME/bin not in PATH
Modified: trunk/bin/runtests
===================================================================
--- trunk/bin/runtests 2008-04-22 15:40:53 UTC (rev 9077)
+++ trunk/bin/runtests 2008-04-22 16:00:44 UTC (rev 9078)
@@ -6,7 +6,9 @@
import time
ZENHOME = os.environ['ZENHOME']
+ZOPEHOME = os.environ.get('ZOPEHOME', ZENHOME)
zenhome = lambda *args:os.path.join(ZENHOME, *args)
+zopehome = lambda *args:os.path.join(ZOPEHOME, *args)
STDOUT = sys.stdout
@@ -48,7 +50,7 @@
def runUnitTests(packages=[], regex=None, coverage=False):
for prod in findTestableProducts(packages, regex):
- parts = [ 'zopectl', 'test']
+ parts = [ zopehome('bin', 'zopectl'), 'test']
if coverage: parts.append('--coverage')
parts.extend(['--libdir', zenhome('Products', prod)])
if regex: parts.append(regex)
|
|
From: <sv...@ze...> - 2008-04-22 15:40:53
|
Author: ecn
Date: 2008-04-22 11:40:53 -0400 (Tue, 22 Apr 2008)
New Revision: 9077
Modified:
trunk/Products/ZenUITests/tests/selenium/SelTestBase.py
Log:
* add another wait so we are in a known state
Modified: trunk/Products/ZenUITests/tests/selenium/SelTestBase.py
===================================================================
--- trunk/Products/ZenUITests/tests/selenium/SelTestBase.py 2008-04-22 15:33:02 UTC (rev 9076)
+++ trunk/Products/ZenUITests/tests/selenium/SelTestBase.py 2008-04-22 15:40:53 UTC (rev 9077)
@@ -220,6 +220,7 @@
self.waitForElement("manage_addOSProcessClass:method")
self.selenium.type("id", "httpd")
self.selenium.click("manage_addOSProcessClass:method")
+ self.selenium.wait_for_page_to_load(self.WAITTIME)
def deleteOSProcessClasses(self):
"""Deletes an OSProcessClass"""
|
|
From: <sv...@ze...> - 2008-04-22 15:33:04
|
Author: ecn
Date: 2008-04-22 11:33:02 -0400 (Tue, 22 Apr 2008)
New Revision: 9076
Modified:
trunk/Products/ZenUITests/tests/selenium/TestDeviceInstance.py
Log:
* check locks on the device page, not the device list
Modified: trunk/Products/ZenUITests/tests/selenium/TestDeviceInstance.py
===================================================================
--- trunk/Products/ZenUITests/tests/selenium/TestDeviceInstance.py 2008-04-22 15:16:46 UTC (rev 9075)
+++ trunk/Products/ZenUITests/tests/selenium/TestDeviceInstance.py 2008-04-22 15:33:02 UTC (rev 9076)
@@ -48,10 +48,10 @@
"""Customized setUp for testing under the OS tab"""
TestDeviceInstanceBase.setUp(self)
self._goToOSTab()
-
+
def tearDown(self):
"""Customized setUp for testing under the OS tab"""
-
+
self._goToOSTab()
TestDeviceInstanceBase.tearDown(self)
@@ -274,10 +274,10 @@
self.selenium.click("link=Device List")
#self.selenium.wait_for_page_to_load(self.WAITTIME)
self.waitForElement("name=evids:list " + curtarget)
+ # Unlocking the device now
+ self.goToDevice(curtarget)
self.assert_(self.selenium.is_element_present("//img[@src='locked-update-icon.png']"))
self.assert_(self.selenium.is_element_present("//img[@src='locked-delete-icon.png']"))
- # Unlocking the device now
- self.goToDevice(curtarget)
self.waitForElement("link=Lock...")
self.selenium.click("link=Lock...")
self.waitForElement("dialog_cancel")
|
|
From: <sv...@ze...> - 2008-04-22 15:16:52
|
Author: abray
Date: 2008-04-22 11:16:46 -0400 (Tue, 22 Apr 2008)
New Revision: 9075
Removed:
trunk/zendocs/Admin Guide 2.0/
trunk/zendocs/AdminGuide/docbook/MySqlMonitorZenPack.xml~
trunk/zendocs/AdminGuide/docbook/OptionalWinConfig.xml~
trunk/zendocs/AdminGuide/docbook/Perf-CH.xml~
trunk/zendocs/AdminGuide/docbook/ProcesszProp.xml~
trunk/zendocs/AdminGuide/docbook/SMTPSettings.xml~
trunk/zendocs/AdminGuide/docbook/perfdatastorage.xml~
Modified:
trunk/zendocs/DevGuide/devguide/reporting.xml
trunk/zendocs/DevGuide/devguide/zproperty.xml
Log:
comiting svn updates for docs
Deleted: trunk/zendocs/AdminGuide/docbook/MySqlMonitorZenPack.xml~
Deleted: trunk/zendocs/AdminGuide/docbook/OptionalWinConfig.xml~
Deleted: trunk/zendocs/AdminGuide/docbook/Perf-CH.xml~
Deleted: trunk/zendocs/AdminGuide/docbook/ProcesszProp.xml~
Deleted: trunk/zendocs/AdminGuide/docbook/SMTPSettings.xml~
Deleted: trunk/zendocs/AdminGuide/docbook/perfdatastorage.xml~
Modified: trunk/zendocs/DevGuide/devguide/reporting.xml
===================================================================
--- trunk/zendocs/DevGuide/devguide/reporting.xml 2008-04-22 14:41:16 UTC (rev 9074)
+++ trunk/zendocs/DevGuide/devguide/reporting.xml 2008-04-22 15:16:46 UTC (rev 9075)
@@ -90,11 +90,12 @@
$ZENHOME/Products/ZenReports/reports directory, you can load it in with
the ReportLoader?:</para>
- <para></para>
+ <para><programlisting>
+$ cd $ZENHOME/Products/ZenReports
- <para><command>$ cd $ZENHOME/Products/ZenReports</command></para>
+$ python ReportLoader.py --force
- <para><command>$ python ReportLoader.py --force</command></para>
+</programlisting></para>
</section>
<section xml:id="reporting_plugins">
Modified: trunk/zendocs/DevGuide/devguide/zproperty.xml
===================================================================
--- trunk/zendocs/DevGuide/devguide/zproperty.xml 2008-04-22 14:41:16 UTC (rev 9074)
+++ trunk/zendocs/DevGuide/devguide/zproperty.xml 2008-04-22 15:16:46 UTC (rev 9075)
@@ -1,71 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE book [
+<!DOCTYPE chapter [
<!ENTITY % CONFIGURED_ENTITIES SYSTEM "configured_entities.xml">
%CONFIGURED_ENTITIES;
]>
+<chapter version="5.0" xml:id="zproperty_management"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:mml="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>zProperty Management</title>
-<chapter version="5.0" xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:mml="http://www.w3.org/1998/Math/MathML"
- xmlns:html="http://www.w3.org/1999/xhtml"
- xmlns:db="http://docbook.org/ns/docbook"
-xml:id="zproperty_management"
->
+ <section xml:id="zproperty_adding">
+ <title>Adding a zProperty</title>
- <title>zProperty Management</title>
+ <section xml:id="zproperty_adding_to_event">
+ <title>Adding a zProperty to an Event</title>
-<section xml:id="zproperty_adding">
-<title>Adding a zProperty</title>
+ <para>In <filename>EventClass.py</filename>...</para>
-<section xml:id="zproperty_adding_to_event">
- <title>Adding a zProperty to an Event</title>
-<para>In <filename>EventClass.py</filename>...</para>
-<programlisting>
+ <programlisting>
...
def buildZProperties(self):
- edict = self.getDmdRoot("Events")
- edict._setProperty("zNewProperty", "default value")
- edict._setProperty("zNewIntegerProperty", -1, type="int")
- edict._setProperty("zNewFloatProperties", 10.01, type="float")
- edict._setProperty("zNewListProperty", ["default value", "another default value"], type="lines")
- edict._setProperty("zNewBooleanProperty", False, type="boolean")
+ edict = self.getDmdRoot("Events")
+ edict._setProperty("zNewProperty", "default value")
+ edict._setProperty("zNewIntegerProperty", -1, type="int")
+ edict._setProperty("zNewFloatProperties", 10.01, type="float")
+ edict._setProperty("zNewListProperty", ["default value", "another default value"], type="lines")
+ edict._setProperty("zNewBooleanProperty", False, type="boolean")
...
</programlisting>
-<para>Adding a new property to the EventClass is as easy adding a new line to the buildZProperties method. You need to set a new property at the "Events" level.</para>
-</section>
-<section xml:id="zproperty_adding_to_device">
-<title>Adding a zProperty to a Device</title>
-<para>In <filename>DeviceClass.py</filename></para>
-<programlisting>
+ <para>Adding a new property to the EventClass is as easy adding a new
+ line to the buildZProperties method. You need to set a new property at
+ the "Events" level.</para>
+ </section>
+
+ <section xml:id="zproperty_adding_to_device">
+ <title>Adding a zProperty to a Device</title>
+
+ <para>In <filename>DeviceClass.py</filename></para>
+
+ <programlisting>
...
def buildDeviceTreeProperties(self):
- devs= self.getDmdRoot("Devices")
+ devs= self.getDmdRoot("Devices")
...
- devs._setProperty("zNewProperty", "default value")
- devs._setProperty("zNewIntegerProperty", -1, type="int")
- devs._setProperty("zNewFloatProperties", 10.01, type="float")
- devs._setProperty("zNewListProperty", ["default value", "another default value"], type="lines")
- devs._setProperty("zNewBooleanProperty", False, type="boolean")
+ devs._setProperty("zNewProperty", "default value")
+ devs._setProperty("zNewIntegerProperty", -1, type="int")
+ devs._setProperty("zNewFloatProperties", 10.01, type="float")
+ devs._setProperty("zNewListProperty", ["default value", "another default value"], type="lines")
+ devs._setProperty("zNewBooleanProperty", False, type="boolean")
...
...
</programlisting>
-<para>Adding a new property to the DeviceClass is as easy adding a new line to the buildDeviceTreeProperties method. You need to set a new property at the "Devices" level.</para>
-</section>
-</section>
-<section xml:id="zproperty_migrating">
-<title>Migrating the zProperty Code</title>
-<para>Create a new file in <filename>$ZENHOME/Products/ZenModel/migrate/zNewProperty.py</filename></para>
-<programlisting>
+ <para>Adding a new property to the DeviceClass is as easy adding a new
+ line to the buildDeviceTreeProperties method. You need to set a new
+ property at the "Devices" level.</para>
+ </section>
+ </section>
+
+ <section xml:id="zproperty_migrating">
+ <title>Migrating the zProperty Code</title>
+
+ <para>Create a new file in
+ <filename>$ZENHOME/Products/ZenModel/migrate/zNewProperty.py</filename></para>
+
+ <programlisting>
__doc__='''
Add zNewProperty to DeviceClass.
@@ -73,16 +82,19 @@
import Migrate
class zNewProperty( Migrate.Step ):
- version= Migrate.Version(1, 1, 0)
+ version= Migrate.Version(1, 1, 0)
- def cutover(self, dmd):
- if not dmd.Devices.hasProperty( "zNewProperty" ):
- dmd.Devices._setProperty( "zNewProperty", "default value here" )
+ def cutover(self, dmd):
+ if not dmd.Devices.hasProperty( "zNewProperty" ):
+ dmd.Devices._setProperty( "zNewProperty", "default value here" )
zNewProperty()
</programlisting>
-<para>When a zenmigrate is executed, this code will create the new zProperty for all Devices. Do not forget to update the Migrate.Version to your current working version. For more information on migrating: see the section on “How to Migrate Zenoss Code”.</para>
-</section>
-</chapter>
+ <para>When a zenmigrate is executed, this code will create the new
+ zProperty for all Devices. Do not forget to update the Migrate.Version to
+ your current working version. For more information on migrating: see the
+ section on “How to Migrate Zenoss Code”.</para>
+ </section>
+</chapter>
\ No newline at end of file
|
|
From: <sv...@ze...> - 2008-04-22 14:42:19
|
Author: abray Date: 2008-04-22 10:41:16 -0400 (Tue, 22 Apr 2008) New Revision: 9074 Added: trunk/zendocs/AdminGuide/docbook/IncludedReports.xml~ trunk/zendocs/AdminGuide/docbook/ModelingSNMP.xml~ trunk/zendocs/AdminGuide/docbook/MySqlMonitorZenPack.xml~ trunk/zendocs/AdminGuide/docbook/OptionalWinConfig.xml~ trunk/zendocs/AdminGuide/docbook/Perf-CH.xml~ trunk/zendocs/AdminGuide/docbook/ProcesszProp.xml trunk/zendocs/AdminGuide/docbook/ProcesszProp.xml~ trunk/zendocs/AdminGuide/docbook/SMTPSettings.xml~ trunk/zendocs/AdminGuide/docbook/TestingWMI.xml~ trunk/zendocs/AdminGuide/docbook/WatchList.xml~ trunk/zendocs/AdminGuide/docbook/WinSNMPInformant.xml~ trunk/zendocs/AdminGuide/docbook/WindowsEventLog.xml~ trunk/zendocs/AdminGuide/docbook/WindowsMon-CH.xml~ trunk/zendocs/AdminGuide/docbook/adminguide22.xml trunk/zendocs/AdminGuide/docbook/perfdatastorage.xml trunk/zendocs/AdminGuide/docbook/perfdatastorage.xml~ trunk/zendocs/AdminGuide/docbook/troubleappendix.xml trunk/zendocs/AdminGuide/docbook/troubleappendix.xml~ trunk/zendocs/AdminGuide/docbook/troubleshooting.xml trunk/zendocs/AdminGuide/docbook/troubleshooting.xml~ trunk/zendocs/AdminGuide/docbook/windowszprop.xml trunk/zendocs/AdminGuide/docbook/windowszprop.xml~ trunk/zendocs/AdminGuide/docbook/zProperties-CH.xml~ trunk/zendocs/AdminGuide/docbook/zenjmx.xml~ Modified: trunk/zendocs/AdminGuide/docbook/AckEvents.xml trunk/zendocs/AdminGuide/docbook/AddIndDevice.xml trunk/zendocs/AdminGuide/docbook/AdddeviceWContext.xml trunk/zendocs/AdminGuide/docbook/AlertingRules-CH.xml trunk/zendocs/AdminGuide/docbook/ApacheMonitorZenpack.xml trunk/zendocs/AdminGuide/docbook/AutoDiscAdd.xml trunk/zendocs/AdminGuide/docbook/AutoStart.xml trunk/zendocs/AdminGuide/docbook/Availability-CH.xml trunk/zendocs/AdminGuide/docbook/Backup-CH.xml trunk/zendocs/AdminGuide/docbook/ChangingGraphOrder.xml trunk/zendocs/AdminGuide/docbook/CheckUpdates.xml trunk/zendocs/AdminGuide/docbook/ClearHistory.xml trunk/zendocs/AdminGuide/docbook/CollectDataZencom.xml trunk/zendocs/AdminGuide/docbook/CollectionControlxml.xml trunk/zendocs/AdminGuide/docbook/CoreZenpacks.xml trunk/zendocs/AdminGuide/docbook/CreateAlertRule.xml trunk/zendocs/AdminGuide/docbook/CreateCustomReport.xml trunk/zendocs/AdminGuide/docbook/CreateSystem.xml trunk/zendocs/AdminGuide/docbook/CreateUser.xml trunk/zendocs/AdminGuide/docbook/CreateUserAccount.xml trunk/zendocs/AdminGuide/docbook/CreateZenpack.xml trunk/zendocs/AdminGuide/docbook/CustGraphPoints.xml trunk/zendocs/AdminGuide/docbook/CustomDash.xml trunk/zendocs/AdminGuide/docbook/CustomEventView.xml trunk/zendocs/AdminGuide/docbook/CustomGraphDef.xml trunk/zendocs/AdminGuide/docbook/CustomLinks.xml trunk/zendocs/AdminGuide/docbook/DPGraphPoints.xml trunk/zendocs/AdminGuide/docbook/DaemonCommands.xml trunk/zendocs/AdminGuide/docbook/DaemonStartStop.xml trunk/zendocs/AdminGuide/docbook/Dashboard-CH.xml trunk/zendocs/AdminGuide/docbook/DataLayer.xml trunk/zendocs/AdminGuide/docbook/DataPoints.xml trunk/zendocs/AdminGuide/docbook/DataSources.xml trunk/zendocs/AdminGuide/docbook/DebuggingModeling.xml trunk/zendocs/AdminGuide/docbook/DefiningUICommands.xml trunk/zendocs/AdminGuide/docbook/DelayAlert.xml trunk/zendocs/AdminGuide/docbook/DellMonitorZenPack.xml trunk/zendocs/AdminGuide/docbook/DetailedArch-CH.xml trunk/zendocs/AdminGuide/docbook/DeviceClass.xml trunk/zendocs/AdminGuide/docbook/DeviceIssues.xml trunk/zendocs/AdminGuide/docbook/DeviceList.xml trunk/zendocs/AdminGuide/docbook/DevicePrep-APP.xml trunk/zendocs/AdminGuide/docbook/DeviceStatusTab-CH.xml trunk/zendocs/AdminGuide/docbook/DeviceStatusTab.xml trunk/zendocs/AdminGuide/docbook/DeviceSummary.xml trunk/zendocs/AdminGuide/docbook/DevicezProp.xml trunk/zendocs/AdminGuide/docbook/DirectoryPath.xml trunk/zendocs/AdminGuide/docbook/DumpLoad.xml trunk/zendocs/AdminGuide/docbook/EditUserAcct.xml trunk/zendocs/AdminGuide/docbook/EmailReport.xml trunk/zendocs/AdminGuide/docbook/EmailSettings-CH.xml trunk/zendocs/AdminGuide/docbook/EventClassMapping.xml trunk/zendocs/AdminGuide/docbook/EventClasses.xml trunk/zendocs/AdminGuide/docbook/EventCommands.xml trunk/zendocs/AdminGuide/docbook/EventConcepts.xml trunk/zendocs/AdminGuide/docbook/EventConsole.xml trunk/zendocs/AdminGuide/docbook/EventDataDic-APP.xml trunk/zendocs/AdminGuide/docbook/EventManSettings.xml trunk/zendocs/AdminGuide/docbook/EventMonitoring-CH.xml trunk/zendocs/AdminGuide/docbook/EventSysDefinition.xml trunk/zendocs/AdminGuide/docbook/EventTransforms.xml trunk/zendocs/AdminGuide/docbook/EventzPropContext.xml trunk/zendocs/AdminGuide/docbook/EvtTransDevClass.xml trunk/zendocs/AdminGuide/docbook/ExampleZenpack.xml trunk/zendocs/AdminGuide/docbook/ExportReport.xml trunk/zendocs/AdminGuide/docbook/FileSysChangeThresh.xml trunk/zendocs/AdminGuide/docbook/GeneralAdmin-CH.xml trunk/zendocs/AdminGuide/docbook/Google-CH.xml trunk/zendocs/AdminGuide/docbook/GoogleMapsPortlet.xml trunk/zendocs/AdminGuide/docbook/GraphCommands.xml trunk/zendocs/AdminGuide/docbook/GraphDef.xml trunk/zendocs/AdminGuide/docbook/GraphPoints.xml trunk/zendocs/AdminGuide/docbook/GraphReport21-CH.xml trunk/zendocs/AdminGuide/docbook/Groupings-CH.xml trunk/zendocs/AdminGuide/docbook/Groups.xml trunk/zendocs/AdminGuide/docbook/HPMonitorZenpack.xml trunk/zendocs/AdminGuide/docbook/IncludedReports.xml trunk/zendocs/AdminGuide/docbook/IndDevTabs.xml trunk/zendocs/AdminGuide/docbook/Inheritance.xml trunk/zendocs/AdminGuide/docbook/InstallingZenpacks.xml trunk/zendocs/AdminGuide/docbook/Introduction-CH.xml trunk/zendocs/AdminGuide/docbook/InventoryConfig-CH.xml trunk/zendocs/AdminGuide/docbook/KeyConcepts.xml trunk/zendocs/AdminGuide/docbook/LeftNavMenu.xml trunk/zendocs/AdminGuide/docbook/License-APP.xml trunk/zendocs/AdminGuide/docbook/Locations.xml trunk/zendocs/AdminGuide/docbook/MaintenanceWindows.xml trunk/zendocs/AdminGuide/docbook/ManagingDevices.xml trunk/zendocs/AdminGuide/docbook/ManufactzProp.xml trunk/zendocs/AdminGuide/docbook/MappingCorrelate.xml trunk/zendocs/AdminGuide/docbook/MappingEventsUI.xml trunk/zendocs/AdminGuide/docbook/MenuElements.xml trunk/zendocs/AdminGuide/docbook/MessageEscalation.xml trunk/zendocs/AdminGuide/docbook/MinZeoZope.xml trunk/zendocs/AdminGuide/docbook/ModelPortScan.xml trunk/zendocs/AdminGuide/docbook/Modeling.xml trunk/zendocs/AdminGuide/docbook/ModelingPlugins.xml trunk/zendocs/AdminGuide/docbook/ModelingSNMP.xml trunk/zendocs/AdminGuide/docbook/ModelingSSH.xml trunk/zendocs/AdminGuide/docbook/MonitorRemoteSSH-CH.xml trunk/zendocs/AdminGuide/docbook/MonitorRemoteSSH.xml trunk/zendocs/AdminGuide/docbook/MonitorUseZencom-CH.xml trunk/zendocs/AdminGuide/docbook/MonitoringTCP.xml trunk/zendocs/AdminGuide/docbook/MonitoringZenping.xml trunk/zendocs/AdminGuide/docbook/MoveToHistory.xml trunk/zendocs/AdminGuide/docbook/MultiGraphReports.xml trunk/zendocs/AdminGuide/docbook/MySqlMonitorZenPack.xml trunk/zendocs/AdminGuide/docbook/NavReportResult.xml trunk/zendocs/AdminGuide/docbook/NetworkMap-CH.xml trunk/zendocs/AdminGuide/docbook/NetworkMap.xml trunk/zendocs/AdminGuide/docbook/NetworkzProp.xml trunk/zendocs/AdminGuide/docbook/NewCustomDash-CH.xml trunk/zendocs/AdminGuide/docbook/OptionalWinConfig.xml trunk/zendocs/AdminGuide/docbook/OrganizingReports.xml trunk/zendocs/AdminGuide/docbook/Perf-CH.xml trunk/zendocs/AdminGuide/docbook/PerfMonDefinition.xml trunk/zendocs/AdminGuide/docbook/PeriodicBackups.xml trunk/zendocs/AdminGuide/docbook/ProcessMonitoring.xml trunk/zendocs/AdminGuide/docbook/ProdState-CH.xml trunk/zendocs/AdminGuide/docbook/ProdStatesPortlet.xml trunk/zendocs/AdminGuide/docbook/ProductionStates.xml trunk/zendocs/AdminGuide/docbook/RRDTemplateObjects.xml trunk/zendocs/AdminGuide/docbook/RRDTemplates.xml trunk/zendocs/AdminGuide/docbook/RegisterMIB.xml trunk/zendocs/AdminGuide/docbook/RemoteMysql.xml trunk/zendocs/AdminGuide/docbook/RemoveZenpack.xml trunk/zendocs/AdminGuide/docbook/RepeatingAlerts-CH.xml trunk/zendocs/AdminGuide/docbook/RepeatingAlerts.xml trunk/zendocs/AdminGuide/docbook/ReportTroubleshooting.xml trunk/zendocs/AdminGuide/docbook/Reporting-CH.xml trunk/zendocs/AdminGuide/docbook/RunCommandEvent.xml trunk/zendocs/AdminGuide/docbook/RunCommandsUI.xml trunk/zendocs/AdminGuide/docbook/SMTPSettings.xml trunk/zendocs/AdminGuide/docbook/SNMP-APP.xml trunk/zendocs/AdminGuide/docbook/SNMPEventTransforms.xml trunk/zendocs/AdminGuide/docbook/SNMPMonitor-CH.xml trunk/zendocs/AdminGuide/docbook/SearchBox.xml trunk/zendocs/AdminGuide/docbook/SendEvents-CH.xml trunk/zendocs/AdminGuide/docbook/SendEvents.xml trunk/zendocs/AdminGuide/docbook/ServicezProp.xml trunk/zendocs/AdminGuide/docbook/TALES-APP.xml trunk/zendocs/AdminGuide/docbook/TemplateBinding.xml trunk/zendocs/AdminGuide/docbook/TestSendEvent.xml trunk/zendocs/AdminGuide/docbook/TestZenCommand.xml trunk/zendocs/AdminGuide/docbook/TestingWMI.xml trunk/zendocs/AdminGuide/docbook/ThresholdGraphPoint.xml trunk/zendocs/AdminGuide/docbook/Thresholds.xml trunk/zendocs/AdminGuide/docbook/TopLevelOrg.xml trunk/zendocs/AdminGuide/docbook/TroubleshootingDaemons.xml trunk/zendocs/AdminGuide/docbook/UICommands-CH.xml trunk/zendocs/AdminGuide/docbook/UserGroups-CH.xml trunk/zendocs/AdminGuide/docbook/UserGroups.xml trunk/zendocs/AdminGuide/docbook/UserInfoDashboard.xml trunk/zendocs/AdminGuide/docbook/UserLayer.xml trunk/zendocs/AdminGuide/docbook/UserManagement-CH.xml trunk/zendocs/AdminGuide/docbook/VersionCheck.xml trunk/zendocs/AdminGuide/docbook/WatchList.xml trunk/zendocs/AdminGuide/docbook/WinSNMPInformant.xml trunk/zendocs/AdminGuide/docbook/WindowsEventLog.xml trunk/zendocs/AdminGuide/docbook/WindowsMon-CH.xml trunk/zendocs/AdminGuide/docbook/WindowsServiceModeling.xml trunk/zendocs/AdminGuide/docbook/ZenCom-checkhttp.xml trunk/zendocs/AdminGuide/docbook/ZenComPluginFormat.xml trunk/zendocs/AdminGuide/docbook/ZenJMX-CH.xml trunk/zendocs/AdminGuide/docbook/ZenPacks-CH.xml trunk/zendocs/AdminGuide/docbook/ZenWinParameters.xml trunk/zendocs/AdminGuide/docbook/ZenmodlerDaemon.xml trunk/zendocs/AdminGuide/docbook/ZenossIssues.xml trunk/zendocs/AdminGuide/docbook/ZenpackStructure.xml trunk/zendocs/AdminGuide/docbook/adminguide211.xml trunk/zendocs/AdminGuide/docbook/availability.xml trunk/zendocs/AdminGuide/docbook/editingdevconfigs.xml trunk/zendocs/AdminGuide/docbook/eventzProp.xml trunk/zendocs/AdminGuide/docbook/googlemaps.xml trunk/zendocs/AdminGuide/docbook/searching.xml trunk/zendocs/AdminGuide/docbook/standardmodel.xml trunk/zendocs/AdminGuide/docbook/winexeCommands.xml trunk/zendocs/AdminGuide/docbook/zProperties-CH.xml trunk/zendocs/AdminGuide/docbook/zenjmx.xml trunk/zendocs/AdminGuide/docbook/zenmail.xml Log: checking in various admin guide tickets Modified: trunk/zendocs/AdminGuide/docbook/AckEvents.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/AckEvents.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/AckEvents.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,8 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="AckEvents"> - <title>Acknowledging Events</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="AckEvents"><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 @@ -11,18 +8,18 @@ <para>To acknowledge an event:</para> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <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> Modified: trunk/zendocs/AdminGuide/docbook/AddIndDevice.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/AddIndDevice.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/AddIndDevice.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,33 +1,30 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="AddIndDevice"> - <title>Adding an Individual Device</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="AddIndDevice"><info><title>Adding an Individual Device</title></info> + <para>Zenoss will add, model, and monitor those devices you add to the system. This section will walk you through adding an individual device.</para> - <para></para> + <para/> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>From the menu on the left side of the page, select Add Device.</para> <para>The Add Device page appears.</para> - <figure> - <title>Add Device - Full Page</title> + <figure><info><title>Add Device - Full Page</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/add-devicebig.png" scale="65" /> + <imagedata fileref="Graphics/screens/add-devicebig.png" scale="65"/> </imageobject> </mediaobject> </figure> - <para></para> + <para/> </listitem> <listitem> @@ -35,7 +32,7 @@ address of the device. Additionally, you can see all of the fields and areas where you can add additional information about a device.</para> - <para></para> + <para/> </listitem> <listitem> @@ -43,7 +40,7 @@ will classify this sever as a windows server so we choose /Server/Windows as the device class path.</para> - <para></para> + <para/> </listitem> <listitem> @@ -53,7 +50,7 @@ <para>These methods are described in the above section about how Zenoss models devices.</para> - <para></para> + <para/> </listitem> <listitem> @@ -68,7 +65,7 @@ you additional information about Cisco routers. The option is already set to True by default for the /Network class.</para> - <para></para> + <para/> </listitem> <listitem> @@ -78,7 +75,7 @@ <para>A Status page appears showing a log of the operations Zenoss is using to gather information about the device.</para> - <para></para> + <para/> </listitem> <listitem> @@ -90,17 +87,17 @@ <para>The Main Device page appears showing the Status Tab.</para> - <figure> - <title>Main Device Page</title> + <figure><info><title>Main Device Page</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/ind-statustab.png" scale="70" /> + <imagedata fileref="Graphics/screens/ind-statustab.png" scale="70"/> </imageobject> </mediaobject> </figure> - <para></para> + <para/> </listitem> </orderedlist> </section> \ No newline at end of file Modified: trunk/zendocs/AdminGuide/docbook/AdddeviceWContext.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/AdddeviceWContext.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/AdddeviceWContext.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,8 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="AddDeviceWContext"> - <title>Add an Individual Device with Context</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="AddDeviceWContext"><info><title>Add an Individual Device with Context</title></info> + <para>You can also add an individual device with context. This means that wherever in the hierarchy you choose to add the device, that is where the @@ -12,16 +9,16 @@ <para>To add a device with context:</para> - <para></para> + <para/> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>Navigate to the place in the Device tree where you want to add the device.</para> <para>This is the context part.</para> - <para></para> + <para/> </listitem> <listitem> @@ -30,20 +27,19 @@ <para>The Add Device dialog appears.</para> - <para></para> + <para/> - <figure> - <title>Add Device with Context Dialog</title> + <figure><info><title>Add Device with Context Dialog</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/add-device-dialog.png" - scale="75" /> + <imagedata fileref="Graphics/screens/add-device-dialog.png" scale="75"/> </imageobject> </mediaobject> </figure> - <para></para> + <para/> </listitem> <listitem> @@ -51,7 +47,7 @@ context (The only difference here is that the Device Class is pre-selected.)</para> - <para></para> + <para/> </listitem> <listitem> Modified: trunk/zendocs/AdminGuide/docbook/AlertingRules-CH.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/AlertingRules-CH.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/AlertingRules-CH.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,47 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<chapter id="AlertRule-CH"> - <title>Alerting Rules</title> +<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="AlertRule-CH"><info><title>Alerting Rules</title></info> + - <section> - <title>Creating and Using Alerts</title> + <section><info><title>Creating and Using Alerts</title></info> + <para>The daemon ZenActions provides functionality for sending emails or pages based on events received. It continuously evaluates every user’s paging rules against the event database. Each user has their own set of alerting rules.</para> - <figure> - <title>Sending Alerts</title> + <figure><info><title>Sending Alerts</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/diagrams/sendingalerts.png" scale="80" /> + <imagedata fileref="Graphics/diagrams/sendingalerts.png" scale="80"/> </imageobject> </mediaobject> </figure> - <section> - <title>Setting SMTP Settings For Alerts</title> + <section><info><title>Setting SMTP Settings For Alerts</title></info> + <para>To use email and pager alerts, you must have Zenoss pointing to an SMTP relay with the proper settings.</para> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>From the navigation menu on the left side of the Dashboard, select Settings.</para> <para>The Settings page appears.</para> - <figure> - <title>Settings Tab Showing SMTP Settings</title> + <figure><info><title>Settings Tab Showing SMTP Settings</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/settingtabforsnmp.png" - scale="70" /> + <imagedata fileref="Graphics/screens/settingtabforsnmp.png" scale="70"/> </imageobject> </mediaobject> </figure> @@ -58,14 +54,9 @@ </section> </section> - <xi:include href="CreateAlertRule.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="CreateAlertRule" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="CreateAlertRule.xml" xpointer="CreateAlertRule"/> - <xi:include href="MessageEscalation.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="MessageEscalation" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="MessageEscalation.xml" xpointer="MessageEscalation"/> - <xi:include href="DelayAlert.xml" xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="DelayAlerts" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="DelayAlert.xml" xpointer="DelayAlerts"/> </chapter> \ No newline at end of file Modified: trunk/zendocs/AdminGuide/docbook/ApacheMonitorZenpack.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/ApacheMonitorZenpack.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/ApacheMonitorZenpack.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,8 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="ApacheMonitorZenPack"> - <title>ApacheMonitor ZenPack</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="ApacheMonitorZenPack"><info><title>ApacheMonitor ZenPack</title></info> + <para>ApacheMonitor provides a method for pulling performance metrics from the Apache HTTP Server (http://httpd.apache.org/) directly into Zenoss @@ -36,14 +33,14 @@ <para>Follow these steps to setup your HTTP server so that it will allow Zenoss to access the server status.</para> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>On the Apache server, find your httpd.conf file. This is normally located in /etc/httpd/httpd.conf or /etc/httpd/conf/httpd.conf. Other locations are possible depending on your operating system and setup.</para> - <para></para> + <para/> </listitem> <listitem> @@ -56,7 +53,7 @@ <para><programlisting>ExtendedStatus on</programlisting></para> - <para></para> + <para/> </listitem> <listitem> @@ -64,7 +61,7 @@ another option that typically already exists but is commented out.</para> - <para></para> + <para/> <para><programlisting>#<Location /server-status> # SetHandler server-status @@ -82,7 +79,7 @@ Allow from zenoss.yourdomain.com </Location></programlisting></para> - <para></para> + <para/> </listitem> <listitem> @@ -97,9 +94,9 @@ the extended status, you can add Apache monitoring to the device within Zenoss by simply binding the Apache template to the device.</para> - <para></para> + <para/> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>Navigate to the device in the Zenoss web interface.</para> </listitem> Modified: trunk/zendocs/AdminGuide/docbook/AutoDiscAdd.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/AutoDiscAdd.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/AutoDiscAdd.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,8 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="AutoDiscAdd"> - <title>Auto-Discovery of Devices</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="AutoDiscAdd"><info><title>Auto-Discovery of Devices</title></info> + <para>Zenoss can SNMP-walk the entire network and the routing tables and then model each individual device to add them all at once to the database. @@ -12,28 +9,27 @@ <para>To add all of the devices on a given network or subnetwork into the Zenoss system:</para> - <para></para> + <para/> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>From the left navigation menu select networks.</para> <para>The Networks Overview page appears.</para> - <para></para> + <para/> - <figure> - <title>Networks Overview Tab</title> + <figure><info><title>Networks Overview Tab</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/networksoverview.jpg" - scale="70" /> + <imagedata fileref="Graphics/screens/networksoverview.jpg" scale="70"/> </imageobject> </mediaobject> </figure> - <para></para> + <para/> </listitem> <listitem> @@ -41,28 +37,28 @@ devices from. You can also use Subnetworks table menu to add a new network to the list.</para> - <para></para> + <para/> </listitem> <listitem> <para>Once you have selected the network, open the Subnetworks table menu and select Discover Devices.</para> - <para></para> + <para/> </listitem> <listitem> <para>The Discover Device page will appear showing you the status of all the device collections going on.</para> - <para></para> + <para/> - <figure> - <title>Auto-Discovery of Devices</title> + <figure><info><title>Auto-Discovery of Devices</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/autodiscover.png" scale="65" /> + <imagedata fileref="Graphics/screens/autodiscover.png" scale="65"/> </imageobject> </mediaobject> </figure> Modified: trunk/zendocs/AdminGuide/docbook/AutoStart.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/AutoStart.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/AutoStart.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,8 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="AutoStart"> - <title>Automatic Startup in Linux Environments</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="AutoStart"><info><title>Automatic Startup in Linux Environments</title></info> + <para>Zenoss can be controlled entirely by the bin/zenoss script. To provide automatic startup in Linux environments, you must link Zenoss to the Modified: trunk/zendocs/AdminGuide/docbook/Availability-CH.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/Availability-CH.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/Availability-CH.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,18 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<chapter> - <title>Availability Monitoring</title> +<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"><info><title>Availability Monitoring</title></info> + - <xi:include href="MonitoringZenping.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="MonitoringZenping" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="MonitoringZenping.xml" xpointer="MonitoringZenping"/> - <xi:include href="MonitoringTCP.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="MonitoringTCP" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="MonitoringTCP.xml" xpointer="MonitoringTCP"/> - <xi:include href="ProcessMonitoring.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="ProcessMonitoring" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ProcessMonitoring.xml" xpointer="ProcessMonitoring"/> </chapter> \ No newline at end of file Modified: trunk/zendocs/AdminGuide/docbook/Backup-CH.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/Backup-CH.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/Backup-CH.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<chapter id="Backup-CH"> - <title>Backup, Recovery and Maintenance</title> +<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Backup-CH"><info><title>Backup, Recovery and Maintenance</title></info> + - <section> - <title>Backup and Restore</title> + <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 @@ -43,7 +40,7 @@ <programlisting>> zenrestore --file=BACKUPFILEPATH</programlisting> - <para></para> + <para/> <para>Suggestions for a satisfying backup/restore experience:</para> @@ -53,14 +50,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> @@ -68,7 +65,7 @@ older version could be bad news and should really be avoided.</para> - <para></para> + <para/> </listitem> <listitem> @@ -76,7 +73,7 @@ to a newer version you should run zenmigrate after the restore.</para> - <para></para> + <para/> </listitem> <listitem> @@ -89,8 +86,8 @@ </listitem> </itemizedlist> - <section> - <title>Backup Details</title> + <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 @@ -107,7 +104,7 @@ zenbackup will attempt to retrieve this information from zeo unless you specify --dont-fetch-args.</para> - <para></para> + <para/> <para>--dbuser, --dbpassword</para> @@ -116,14 +113,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> @@ -131,14 +128,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></para> + <para/> <para>--save-mysql-access</para> @@ -147,22 +144,22 @@ 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> - <title>Restore Details</title> + <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 @@ -171,21 +168,21 @@ 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> @@ -197,7 +194,7 @@ restore you'll need to set the database name on the Event Manager page.</para> - <para></para> + <para/> <para>--dbuser, --dbpassword</para> @@ -206,7 +203,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> @@ -214,15 +211,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 href="PeriodicBackups.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="PeriodicBackup" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="PeriodicBackups.xml" xpointer="PeriodicBackup"/> </section> </chapter> \ No newline at end of file Modified: trunk/zendocs/AdminGuide/docbook/ChangingGraphOrder.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/ChangingGraphOrder.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/ChangingGraphOrder.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,36 +1,33 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="ChangeGraphOrder"> - <title>Changing the Order of the Graphs</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="ChangeGraphOrder"><info><title>Changing the Order of the Graphs</title></info> + <para>You can customize many of the features of the graphs including things like thresholds. As an example, you can change the sequence of the appearance of the graphs on the page.</para> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>Navigate to a device in your system.</para> - <para></para> + <para/> </listitem> <listitem> <para>From the page menu, select More >> Templates.</para> - <para></para> + <para/> </listitem> <listitem> <para>Click the “Create Local Copy” button.</para> - <para></para> + <para/> </listitem> <listitem> <para>Click on the name of the template.</para> - <para></para> + <para/> </listitem> <listitem> Modified: trunk/zendocs/AdminGuide/docbook/CheckUpdates.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CheckUpdates.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/CheckUpdates.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,8 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="CheckUpdates"> - <title>Checking for Zenoss Updates</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="CheckUpdates"><info><title>Checking for Zenoss Updates</title></info> + <para>Use the Settings page Versions tab to check for updates to the Zenoss software. You can have Zenoss to check daily or click the Check Zenoss Modified: trunk/zendocs/AdminGuide/docbook/ClearHistory.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/ClearHistory.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/ClearHistory.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,21 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="ClearHistory"> - <title>Clearing The Event History</title> +<section version="5.0" xml:id="ClearHistory" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns5="http://www.w3.org/1999/xhtml" + xmlns:ns4="http://www.w3.org/1998/Math/MathML" + xmlns:ns3="http://www.w3.org/2000/svg" + xmlns:ns2="http://www.w3.org/1999/xlink" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Clearing The Event History</title> + </info> - <para>You can use the mySQL procedure clean_event_history to clear out the - event history database if the database gets too large to allow for - reasonable speeds of data processing. From the command line, users can - execute the MySQL procedure like this:</para> + <para>By default, the Event History is set to 0 which means to never age-out + and delete any events in the Event History. You can change this setting by + using the left navigation menu and choosing Event Manager. In the + Maintenance area, set the number days to wait before deleting items from the + history in the "Delete Historical Events Older Than (days)" field.</para> - <para> $ mysql events -uzenoss -pzenoss -e 'call clean_history(12)'</para> - - <para>The above example assumes the MySQL username is zenoss, and the - password is zenoss, and the number of months you want to keep is 12.</para> - - <para>The only variable you need to pass is the “months” and this is the - number of months back from where you want to start to delete the history. - For example, if you wanted to remove all events older than 12 months in the - event history database, enter 12.</para> + <para></para> </section> \ No newline at end of file Modified: trunk/zendocs/AdminGuide/docbook/CollectDataZencom.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CollectDataZencom.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/CollectDataZencom.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="CollectDataZenCom"> - <title>Collect Data from A ZenCommand</title> +<section version="5.0" xml:id="CollectDataZenCom" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns5="http://www.w3.org/1998/Math/MathML" + xmlns:ns4="http://www.w3.org/2000/svg" + xmlns:ns3="http://www.w3.org/1999/xhtml" + xmlns:ns2="http://www.w3.org/1999/xlink" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Collect Data from A ZenCommand</title> + </info> <para>To collect and display some data from the ZenCommand example above, you can log the data to see something like response time in a graphical format.</para> - <orderedlist> + <orderedlist continuation="restarts" inheritnum="ignore"> <listitem> <para>Go to the /Web/Device template.</para> @@ -24,7 +30,7 @@ <listitem> <para>At the bottom there is a table of Data Points add one called - “responseTime”</para> + “time”</para> <para></para> </listitem> Modified: trunk/zendocs/AdminGuide/docbook/CollectionControlxml.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CollectionControlxml.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/CollectionControlxml.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="CollectionControl"> - <title>Collection and Control Services Layer</title> +<section version="5.0" xml:id="CollectionControl" + xmlns="http://docbook.org/ns/docbook" + xmlns:ns5="http://www.w3.org/1999/xhtml" + xmlns:ns4="http://www.w3.org/1998/Math/MathML" + xmlns:ns3="http://www.w3.org/2000/svg" + xmlns:ns2="http://www.w3.org/1999/xlink" + xmlns:ns="http://docbook.org/ns/docbook"> + <info> + <title>Collection and Control Services Layer</title> + </info> <para>The services that collect the data and feed it to the Data Layer come from the daemons associated with the Collection and Control Services Layer. @@ -12,7 +18,9 @@ below.</para> <section> - <title>Automated Modeling Daemons</title> + <info> + <title>Automated Modeling Daemons</title> + </info> <para></para> @@ -58,7 +66,9 @@ </section> <section> - <title>Availability Modeling Daemons</title> + <info> + <title>Availability Modeling Daemons</title> + </info> <para></para> @@ -82,17 +92,10 @@ </row> <row> - <entry>Zenwin</entry> - - <entry>Zenwin is used for Windows Service Monitoring - (WMI).</entry> - </row> - - <row> <entry>Zenstatus</entry> <entry>Zenstatus performs active TCP connection testing of remote - daemons. </entry> + daemons.</entry> </row> <row> @@ -107,7 +110,9 @@ </section> <section> - <title>Event Collection Daemons</title> + <info> + <title>Event Collection Daemons</title> + </info> <para></para> @@ -147,7 +152,9 @@ </section> <section> - <title>Performance Monitoring Daemons</title> + <info> + <title>Performance Monitoring Daemons</title> + </info> <para></para> @@ -166,7 +173,7 @@ <entry>ZenperfSNMP</entry> <entry>ZenperfSNMP does the high performance asynchronous SNMP - performance collection. </entry> + performance collection.</entry> </row> <row> @@ -180,7 +187,7 @@ <entry>Zencommand is used for XML RPC Collection specifically it allows the running of Nagios© and Cactii plug-ins on the local box - or on remote boxes through SSH. </entry> + or on remote boxes through SSH.</entry> </row> </tbody> </tgroup> @@ -188,7 +195,9 @@ </section> <section> - <title>Automated Response Daemons</title> + <info> + <title>Automated Response Daemons</title> + </info> <para></para> Modified: trunk/zendocs/AdminGuide/docbook/CoreZenpacks.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CoreZenpacks.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/CoreZenpacks.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,25 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="corezenpacks"> - <title>Zenoss Core ZenPacks</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="corezenpacks"><info><title>Zenoss Core ZenPacks</title></info> + - <xi:include href="zenjmx.xml" xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="zenjmx" /> + <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="ApacheMonitorZenpack.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="ApacheMonitorZenPack" /> + <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="DellMonitorZenPack.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="DellMonitorZenPack" /> + <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="HPMonitorZenpack.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="HpMonitorZenPack" /> + <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="MySqlMonitorZenPack.xml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xpointer="MySqlMonitor" /> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" href="MySqlMonitorZenPack.xml" xpointer="MySqlMonitor"/> </section> \ No newline at end of file Modified: trunk/zendocs/AdminGuide/docbook/CreateAlertRule.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CreateAlertRule.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/CreateAlertRule.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,27 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="CreateAlertRule"> - <title>Creating a New Alerting Rule</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="CreateAlertRule"><info><title>Creating a New Alerting Rule</title></info> + <para>Alerting rules are created on a per user basis. You can add additional recipients for rules, but upon creation, the rules are tied to a user account.</para> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>From the upper right corner of the Zenoss Dashboard, click the Preferences link.</para> <para>The Preferences page appears.</para> - <figure> - <title>Preferences Tab - Edit Tab</title> + <figure><info><title>Preferences Tab - Edit Tab</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/preferences-edittab.png" - scale="70" /> + <imagedata fileref="Graphics/screens/preferences-edittab.png" scale="70"/> </imageobject> </mediaobject> </figure> @@ -32,13 +28,12 @@ <para>The Alerting Rules tab appears.</para> - <figure> - <title>Alerting Rules Tab</title> + <figure><info><title>Alerting Rules Tab</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/alertingrulestab.png" - scale="70" /> + <imagedata fileref="Graphics/screens/alertingrulestab.png" scale="70"/> </imageobject> </mediaobject> </figure> @@ -50,13 +45,12 @@ <para>The Add Alerting Rule dialog appears.</para> - <figure> - <title>Add Alerting Rule Dialog</title> + <figure><info><title>Add Alerting Rule Dialog</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/addalertingrule.png" - scale="75" /> + <imagedata fileref="Graphics/screens/addalertingrule.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -65,7 +59,7 @@ <listitem> <para>In the ID field, enter a name for the alert.</para> - <para></para> + <para/> </listitem> <listitem> @@ -80,46 +74,46 @@ <para>The Alert Details page appears.</para> - <figure> - <title>Alert Details Edit Page</title> + <figure><info><title>Alert Details Edit Page</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/alertdetails.png" scale="70" /> + <imagedata fileref="Graphics/screens/alertdetails.png" scale="70"/> </imageobject> </mediaobject> </figure> - <para></para> + <para/> </listitem> </orderedlist> - <section> - <title>Define and Enable This Alert</title> + <section><info><title>Define and Enable This Alert</title></info> + <para>Set the attributes from the Alert Details page, and clicking the Edit tab.</para> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>Use the Delay field to set the number of seconds to wait before sending the alert. If an event clears before delay time no alert is sent.</para> - <para></para> + <para/> </listitem> <listitem> <para>To enable the alert, set Enabled to True.</para> - <para></para> + <para/> </listitem> <listitem> <para>Use the Repeat Time to set the time for repeating the alert to send the alert every x seconds until the event is acknowledged.</para> - <para></para> + <para/> </listitem> <listitem> @@ -158,7 +152,7 @@ values to filter the event. To Remove any of the filters for the alert, click the (-) minus button.</para> - <para></para> + <para/> </listitem> <listitem> @@ -167,25 +161,24 @@ </orderedlist> </section> - <section> - <title>1.1.1 Create the Content of the Alert Message</title> + <section><info><title>1.1.1 Create the Content of the Alert Message</title></info> + - <para></para> + <para/> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>From the Alerting Rules Page, click the Message tab to customize the message that is sent to the specified address.</para> <para>The Message tab appears.</para> - <figure> - <title>Alerting Rules Message Tab</title> + <figure><info><title>Alerting Rules Message Tab</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/alertmessagetab.png" - scale="70" /> + <imagedata fileref="Graphics/screens/alertmessagetab.png" scale="70"/> </imageobject> </mediaobject> </figure> @@ -215,30 +208,29 @@ <listitem> <para>Click Save to save the data you entered on this page.</para> - <para></para> + <para/> </listitem> </orderedlist> </section> - <section> - <title>Create a Schedule for Sending the Alert</title> + <section><info><title>Create a Schedule for Sending the Alert</title></info> + - <para></para> + <para/> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>From the Alerting Rules page, click the Schedule tab to set up a schedule for the Alert.</para> <para>The Schedule tab appears.</para> - <figure> - <title>Alerting Rules - Schedule Tab</title> + <figure><info><title>Alerting Rules - Schedule Tab</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/alert-scheduletab.png" - scale="70" /> + <imagedata fileref="Graphics/screens/alert-scheduletab.png" scale="70"/> </imageobject> </mediaobject> </figure> @@ -250,13 +242,12 @@ <para>The Add Active Period dialog appears.</para> - <figure> - <title>Add Active Period Dialog</title> + <figure><info><title>Add Active Period Dialog</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/addalertingwindow.jpg" - scale="75" /> + <imagedata fileref="Graphics/screens/addalertingwindow.jpg" scale="75"/> </imageobject> </mediaobject> </figure> @@ -276,13 +267,12 @@ <para>The Schedule Details page appears.</para> - <figure> - <title>Alerting Rules - Schedule Details Page</title> + <figure><info><title>Alerting Rules - Schedule Details Page</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/alertscheduledetail.jpg" - scale="70" /> + <imagedata fileref="Graphics/screens/alertscheduledetail.jpg" scale="70"/> </imageobject> </mediaobject> </figure> @@ -292,28 +282,28 @@ <para>If you want to restrict this Alert to only monitor at certain times for certain durations, set the Enabled field to True.</para> - <para></para> + <para/> </listitem> <listitem> <para>In the Start area, enter the date you want the alert to start, or click the Select button to choose the date from a calendar.</para> - <para></para> + <para/> </listitem> <listitem> <para>In the fields to the right of the date, select an hour and minute for the Alert to start.</para> - <para></para> + <para/> </listitem> <listitem> <para>Use the Duration area to specify the length of time you want to Alert to be listening based on the start time.</para> - <para></para> + <para/> </listitem> <listitem> @@ -350,7 +340,7 @@ <listitem> <para>Choose a number of times to repeat the selected interval.</para> - <para></para> + <para/> </listitem> <listitem> Modified: trunk/zendocs/AdminGuide/docbook/CreateCustomReport.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CreateCustomReport.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/CreateCustomReport.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,15 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="CreateCustomReports"> - <title>Creating Custom Reports</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="CreateCustomReports"><info><title>Creating Custom Reports</title></info> + <para>There are a few ways to create reports of your own. You can create some reports through the Zenoss user Interface or using the Zope management Interface (ZMI).</para> - <section> - <title>Creating Custom Reports Using the ZMI</title> + <section><info><title>Creating Custom Reports Using the ZMI</title></info> + <para>Zenoss Reports are written in python and templates are available through the Zope Management Interface (ZMI). To access the ZMI for a @@ -20,17 +17,17 @@ more.</para> </section> - <section> - <title> Create A Custom Device Report Example</title> + <section><info><title> Create A Custom Device Report Example</title></info> + <para>Here are the steps for creating a Custom Device Report that will show device name, network address, and device serial number.</para> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>From the left navigation menu, select Reports.</para> - <para></para> + <para/> </listitem> <listitem> @@ -44,7 +41,7 @@ <para>From the bottom of the page enter a name for this custom report in the Add text box.</para> - <para></para> + <para/> </listitem> <listitem> @@ -63,7 +60,7 @@ <listitem> <para>Click the Edit tab to define the report parameters.</para> - <para></para> + <para/> </listitem> <listitem> @@ -140,7 +137,7 @@ <listitem> <para>Click the Save button.</para> - <para></para> + <para/> </listitem> <listitem> Modified: trunk/zendocs/AdminGuide/docbook/CreateSystem.xml =================================================================== --- trunk/zendocs/AdminGuide/docbook/CreateSystem.xml 2008-04-22 13:53:43 UTC (rev 9073) +++ trunk/zendocs/AdminGuide/docbook/CreateSystem.xml 2008-04-22 14:41:16 UTC (rev 9074) @@ -1,60 +1,55 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" -"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<section id="Systems"> - <title>Systems</title> +<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Systems"><info><title>Systems</title></info> + <para>Systems are intended to follow virtual setups like you would have in a network setup or systems grouped by functionality.</para> - <section> - <title>Adding, Moving and Nesting Systems</title> + <section><info><title>Adding, Moving and Nesting Systems</title></info> + <para>To create a new System or Sub-System:</para> - <orderedlist> + <orderedlist inheritnum="ignore" continuation="restarts"> <listitem> <para>From the Navigation menu on the left, under Browse by, select Systems.</para> <para>The Sub-systems Status tab appears.</para> - <figure> - <title>Sub-systems Status Menu</title> + <figure><info><title>Sub-systems Status Menu</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/systems-statustab.png" - scale="75" /> + <imagedata fileref="Graphics/screens/systems-statustab.png" scale="75"/> </imageobject> </mediaobject> </figure> - <para></para> + <para/> </listitem> <listitem> <para>Open the Sub-Systems table menu and select the Add New Organizer option. The Add Organizer dialog appears.</para> - <figure> - <title>Add Organizer Dialog</title> + <figure><info><title>Add Organizer Dialog</title></info> + <mediaobject> <imageobject> - <imagedata fileref="Graphics/screens/addorganizerdialog.png" - scale="75" /> + <imagedata fileref="Graphics/screens/addorganizerdialog.png" scale="75"/> </imageobject> </mediaobject> </figure> - <para></para> + <para/> </listitem> <listitem> <para>In the ID field, Enter the n... [truncated message content] |
|
From: <sv...@ze...> - 2008-04-22 13:53:46
|
Author: marc Date: 2008-04-22 09:53:43 -0400 (Tue, 22 Apr 2008) New Revision: 9073 Modified: trunk/Products/ZenWin/WinCollector.py Log: * Set default value for queryTimeout to 100ms, refs #3001 Modified: trunk/Products/ZenWin/WinCollector.py =================================================================== --- trunk/Products/ZenWin/WinCollector.py 2008-04-22 13:18:48 UTC (rev 9072) +++ trunk/Products/ZenWin/WinCollector.py 2008-04-22 13:53:43 UTC (rev 9073) @@ -38,7 +38,7 @@ MAX_THREADS_WAITING = 10 MAX_WAIT_FOR_WMI_REQUEST = 10 -DEFAULT_QUERY_TIMEOUT = 500 +DEFAULT_QUERY_TIMEOUT = 100 class WinCollector(PBDaemon): |
|
From: <sv...@ze...> - 2008-04-22 13:18:48
|
Author: marc
Date: 2008-04-22 09:18:48 -0400 (Tue, 22 Apr 2008)
New Revision: 9072
Modified:
trunk/Products/ZenWin/WinCollector.py
trunk/Products/ZenWin/zenwin.py
Log:
* Added queryTimeout option and set the default to 500
* refs #3001
Modified: trunk/Products/ZenWin/WinCollector.py
===================================================================
--- trunk/Products/ZenWin/WinCollector.py 2008-04-22 03:36:49 UTC (rev 9071)
+++ trunk/Products/ZenWin/WinCollector.py 2008-04-22 13:18:48 UTC (rev 9072)
@@ -38,6 +38,7 @@
MAX_THREADS_WAITING = 10
MAX_WAIT_FOR_WMI_REQUEST = 10
+DEFAULT_QUERY_TIMEOUT = 500
class WinCollector(PBDaemon):
@@ -139,21 +140,25 @@
def buildOptions(self):
PBDaemon.buildOptions(self)
self.parser.add_option('-d', '--device',
- dest='device',
- default=None,
- help="single device to collect")
+ dest='device',
+ default=None,
+ help="single device to collect")
self.parser.add_option('--debug',
- dest='debug',
- default=False,
- action='store_true',
- help="turn on additional debugging")
+ dest='debug',
+ default=False,
+ action='store_true',
+ help="turn on additional debugging")
self.parser.add_option('--proxywmi',
- dest='proxywmi',
- default=False,
- action='store_true',
- help="use a process proxy to avoid long-term blocking")
+ dest='proxywmi',
+ default=False,
+ action='store_true',
+ help="use a process proxy to avoid long-term blocking")
+ self.parser.add_option('--queryTimeout',
+ dest='queryTimeout',
+ default=DEFAULT_QUERY_TIMEOUT,
+ help='The number of milliseconds to wait for WMI query to respond.'
+ ' Default value is %s' % DEFAULT_QUERY_TIMEOUT)
-
def configService(self):
return self.services.get('Products.ZenWin.services.WmiConfig',
FakeRemote())
Modified: trunk/Products/ZenWin/zenwin.py
===================================================================
--- trunk/Products/ZenWin/zenwin.py 2008-04-22 03:36:49 UTC (rev 9071)
+++ trunk/Products/ZenWin/zenwin.py 2008-04-22 13:18:48 UTC (rev 9072)
@@ -101,7 +101,8 @@
self.watchers[device.id] = w = self.getWatcher(device, wql)
try:
self.log.debug("Querying %s", device.id)
- s = w.boundedCall(MAX_WAIT_FOR_WMI_REQUEST, 'nextEvent', 500)
+ s = w.boundedCall(MAX_WAIT_FOR_WMI_REQUEST, 'nextEvent',
+ int(self.options.queryTimeout))
self.deviceUp(device)
if not s.state:
return
|
Author: cgibbons Date: 2008-04-21 23:36:49 -0400 (Mon, 21 Apr 2008) New Revision: 9071 Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/INSTALL.txt trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/README.txt trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/__init__.py trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/__init__.py trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/daemons/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/datasources/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/datasources/NNTPMonitorDataSource.py trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/datasources/__init__.py trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/lib/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/lib/__init__.py trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/migrate/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/migrate/__init__.py trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/modeler/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/modeler/plugins/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/objects/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/reports/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/skins/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/skins/ZenPacks.zenoss.NNTPMonitor/ trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/skins/ZenPacks.zenoss.NNTPMonitor/editNNTPMonitorDataSource.pt trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/__init__.py trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/setup.py Log: * Fixes # 3005 : new ZenPack for monitoring NNTP server response time Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/INSTALL.txt Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/README.txt Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/datasources/NNTPMonitorDataSource.py Property changes on: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/datasources/NNTPMonitorDataSource.py ___________________________________________________________________ Name: svn:executable + * Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/datasources/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/lib/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/migrate/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/skins/ZenPacks.zenoss.NNTPMonitor/editNNTPMonitorDataSource.pt Property changes on: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/NNTPMonitor/skins/ZenPacks.zenoss.NNTPMonitor/editNNTPMonitorDataSource.pt ___________________________________________________________________ Name: svn:executable + * Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/ZenPacks/zenoss/__init__.py Added: trunk/zenpacks/ZenPacks.zenoss.NNTPMonitor/setup.py |
|
From: <sv...@ze...> - 2008-04-21 23:38:07
|
Author: cluther
Date: 2008-04-21 19:38:14 -0400 (Mon, 21 Apr 2008)
New Revision: 9070
Modified:
trunk/Products/ZenHub/services/CommandConfig.py
trunk/Products/ZenModel/RRDDataSource.py
Log:
* Fixes #3004: Allow TALES to be used in COMMAND datasource component property.
Modified: trunk/Products/ZenHub/services/CommandConfig.py
===================================================================
--- trunk/Products/ZenHub/services/CommandConfig.py 2008-04-21 21:16:44 UTC (rev 9069)
+++ trunk/Products/ZenHub/services/CommandConfig.py 2008-04-21 23:38:14 UTC (rev 9070)
@@ -37,7 +37,7 @@
cmd = Cmd()
cmd.useSsh = getattr(ds, 'usessh', False)
cmd.cycleTime = ds.cycletime
- cmd.component = ds.component
+ cmd.component = ds.getComponent(comp)
cmd.eventClass = ds.eventClass
cmd.eventKey = key
cmd.severity = ds.severity
Modified: trunk/Products/ZenModel/RRDDataSource.py
===================================================================
--- trunk/Products/ZenModel/RRDDataSource.py 2008-04-21 21:16:44 UTC (rev 9069)
+++ trunk/Products/ZenModel/RRDDataSource.py 2008-04-21 23:38:14 UTC (rev 9070)
@@ -204,8 +204,30 @@
raise res
res = self.checkCommandPrefix(context, res)
return res
+
+ def getComponent(self, context, component=None):
+ """Return localized component.
+ """
+ if component is None:
+ component = self.component
+ if not component.startswith('string:') and \
+ not component.startswith('python:'):
+ component = 'string:%s' % component
+ compiled = talesCompile(component)
+ d = context.device()
+ environ = {'dev' : d,
+ 'device': d,
+ 'devname': d.id,
+ 'here' : context,
+ 'nothing' : None,
+ 'now' : DateTime() }
+ res = compiled(getEngine().getContext(environ))
+ if isinstance(res, Exception):
+ raise res
+ return res
+
def checkCommandPrefix(self, context, cmd):
if not cmd.startswith('/') and not cmd.startswith('$'):
if not cmd.startswith(context.zCommandPath):
|
|
From: <sv...@ze...> - 2008-04-21 21:16:38
|
Author: jplouis
Date: 2008-04-21 17:16:44 -0400 (Mon, 21 Apr 2008)
New Revision: 9069
Modified:
trunk/zenpacks/ZenPacks.zenoss.NtpMonitor/ZenPacks/zenoss/NtpMonitor/datasources/NtpMonitorDataSource.py
Log:
change datasource command from check_http to check_ntp; refs #2980
Modified: trunk/zenpacks/ZenPacks.zenoss.NtpMonitor/ZenPacks/zenoss/NtpMonitor/datasources/NtpMonitorDataSource.py
===================================================================
--- trunk/zenpacks/ZenPacks.zenoss.NtpMonitor/ZenPacks/zenoss/NtpMonitor/datasources/NtpMonitorDataSource.py 2008-04-21 19:46:13 UTC (rev 9068)
+++ trunk/zenpacks/ZenPacks.zenoss.NtpMonitor/ZenPacks/zenoss/NtpMonitor/datasources/NtpMonitorDataSource.py 2008-04-21 21:16:44 UTC (rev 9069)
@@ -79,7 +79,7 @@
return True
def getCommand(self, context):
- parts = ['check_http']
+ parts = ['check_ntp']
if self.hostname:
parts.append('-H %s' % self.hostname)
if self.port:
|
|
From: <sv...@ze...> - 2008-04-21 19:46:09
|
Author: ian
Date: 2008-04-21 15:46:13 -0400 (Mon, 21 Apr 2008)
New Revision: 9068
Modified:
trunk/Products/ZenModel/DeviceOrganizer.py
Log:
* Fixes #2958: Applied Simon's patch that fixes bug and cleans up DeviceOrganizer
Modified: trunk/Products/ZenModel/DeviceOrganizer.py
===================================================================
--- trunk/Products/ZenModel/DeviceOrganizer.py 2008-04-21 19:02:25 UTC (rev 9067)
+++ trunk/Products/ZenModel/DeviceOrganizer.py 2008-04-21 19:46:13 UTC (rev 9068)
@@ -12,6 +12,7 @@
###########################################################################
from itertools import ifilter
+from types import StringTypes
from AccessControl import ClassSecurityInfo
from Globals import InitializeClass
@@ -236,39 +237,64 @@
return self.dmd.Devices.moveDevices(moveTarget, deviceNames, REQUEST)
- def setProdState(self, state, deviceNames=None,
- isOrganizer=False, REQUEST=None):
- """Set production state of all devices in this Organizer.
- """
+ def _handleOrganizerCall(self, arg=None, deviceNames=None, \
+ isOrganizer=False, REQUEST=None, \
+ deviceMethod=None):
+ """ Handle the many many methods that simply call one
+ method on device differently"""
+ #check to see if we have the essentials to work with
+ if not deviceMethod: return
if deviceNames is None and not isOrganizer:
if REQUEST: REQUEST['message'] = "No Devices Selected"
return self.callZenScreen(REQUEST)
for dev in self._buildDeviceList(deviceNames):
- dev.setProdState(state)
+ devMethod = getattr(dev, deviceMethod, None)
+ if devMethod and arg:
+ devMethod(arg)
+ elif devMethod:
+ devMethod()
+
+
+ def _buildReturnMessage(self, REQUEST, message, paths=None, \
+ checkPaths=False):
+ """build the standard return message for the various set
+ methods"""
+ if checkPaths:
+ if paths:
+ if type(paths) not in StringTypes:
+ paths = ", ".join(paths)
+ message += paths
+ else:
+ message = "%s unset" % message.split(" ")[0]
+
+ if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
+ return message
+ else:
+ return self.callZenScreen(REQUEST)
+
+
+ def setProdState(self, state, deviceNames=None,
+ isOrganizer=False, REQUEST=None):
+ """Set production state of all devices in this Organizer.
+ """
+ self._handleOrganizerCall(state, deviceNames, isOrganizer, \
+ REQUEST, "setProdState")
if REQUEST:
statename = self.convertProdState(state)
- REQUEST['message'] = "Production State set to %s" % statename
- if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
- return REQUEST['message']
- else:
- return self.callZenScreen(REQUEST)
-
+ msg = "Production State set to %s" % statename
+ return self._buildReturnMessage(REQUEST, msg)
+
+
def setPriority(self, priority, deviceNames=None,
isOrganizer=False, REQUEST=None):
"""Set prioirty of all devices in this Organizer.
"""
- if deviceNames is None and not isOrganizer:
- if REQUEST: REQUEST['message'] = "No Devices Selected"
- return self.callZenScreen(REQUEST)
- for dev in self._buildDeviceList(deviceNames):
- dev.setPriority(priority)
+ self._handleOrganizerCall(priority, deviceNames, isOrganizer, \
+ REQUEST, "setPriority")
if REQUEST:
priname = self.convertPriority(priority)
- REQUEST['message'] = "Priority set to %s" % priname
- if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
- return REQUEST['message']
- else:
- return self.callZenScreen(REQUEST)
+ msg = "Priority set to %s" % priname
+ return self._buildReturnMessage(REQUEST, msg)
def setPerformanceMonitor(self, performanceMonitor=None, deviceNames=None,
@@ -277,121 +303,68 @@
if not performanceMonitor:
if REQUEST: REQUEST['message'] = "No Monitor Selected"
return self.callZenScreen(REQUEST)
- if deviceNames is None and not isOrganizer:
- if REQUEST: REQUEST['message'] = "No Devices Selected"
- return self.callZenScreen(REQUEST)
- for dev in self._buildDeviceList(deviceNames):
- dev.setPerformanceMonitor(performanceMonitor)
+ self._handleOrganizerCall(performanceMonitor, deviceNames, isOrganizer, \
+ REQUEST, "setPerformanceMonitor")
if REQUEST:
- REQUEST['message'] = "Performance monitor set to %s" % (
- performanceMonitor)
- if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
- return REQUEST['message']
- else:
- return self.callZenScreen(REQUEST)
-
+ msg = "Collector set to %s" % (performanceMonitor)
+ return self._buildReturnMessage(REQUEST, msg)
+
def setGroups(self, groupPaths=None, deviceNames=None,
isOrganizer=False, REQUEST=None):
""" Provide a method to set device groups from any organizer """
- if deviceNames is None and not isOrganizer:
- if REQUEST: REQUEST['message'] = "No Devices Selected"
- return self.callZenScreen(REQUEST)
if not groupPaths: groupPaths = []
- for dev in self._buildDeviceList(deviceNames):
- dev.setGroups(groupPaths)
+ self._handleOrganizerCall(groupPaths, deviceNames, isOrganizer, \
+ REQUEST, "setGroups")
if REQUEST:
- if len(groupPaths) == 1:
- REQUEST['message'] = "Groups set to %s" % groupPaths
- elif len(groupPaths) > 1:
- REQUEST['message'] = "Groups set to %s" % ", ".join(groupPaths)
- else:
- REQUEST['message'] = "Groups unset"
- if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
- return REQUEST['message']
- else:
- return self.callZenScreen(REQUEST)
+ msg = "Groups set to"
+ return self._buildReturnMessage(REQUEST, msg, groupPaths, True)
def setSystems(self, systemPaths=None, deviceNames=None,
isOrganizer=False, REQUEST=None):
""" Provide a method to set device systems from any organizer """
- if deviceNames is None and not isOrganizer:
- if REQUEST: REQUEST['message'] = "No Devices Selected"
- return self.callZenScreen(REQUEST)
if not systemPaths: systemPaths = []
- for dev in self._buildDeviceList(deviceNames):
- dev.setSystems(systemPaths)
+ self._handleOrganizerCall(systemPaths, deviceNames, isOrganizer, \
+ REQUEST, "setSystems")
if REQUEST:
- if len(systemPaths) == 1:
- REQUEST['message'] = "Systems set to %s" % systemPaths
- elif len(systemPaths) > 1:
- REQUEST['message'] = "Systems set to %s" % ", ".join(systemPaths)
- else:
- REQUEST['message'] = "Systems unset"
- if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
- return REQUEST['message']
- else:
- return self.callZenScreen(REQUEST)
+ msg = "Systems set to"
+ return self._buildReturnMessage(REQUEST, msg, systemPaths, True)
def setLocation(self, locationPath="", deviceNames=None,
isOrganizer=False, REQUEST=None):
""" Provide a method to set device location from any organizer """
- if deviceNames is None and not isOrganizer:
- if REQUEST: REQUEST['message'] = "No Devices Selected"
- return self.callZenScreen(REQUEST)
- for dev in self._buildDeviceList(deviceNames):
- dev.setLocation(locationPath)
+ self._handleOrganizerCall(locationPath, deviceNames, isOrganizer, \
+ REQUEST, "setLocation")
if REQUEST:
- REQUEST['message'] = "Location set to %s" % locationPath
- if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
- return REQUEST['message']
- else:
- return self.callZenScreen(REQUEST)
+ msg = "Location set to %s" % locationPath
+ return self._buildReturnMessage(REQUEST, msg)
def unlockDevices(self, deviceNames=None, isOrganizer=False, REQUEST=None):
"""Unlock devices"""
- if deviceNames is None and not isOrganizer:
- if REQUEST: REQUEST['message'] = "No Devices Selected"
- return self.callZenScreen(REQUEST)
- for dev in self._buildDeviceList(deviceNames):
- dev.unlock()
+ self._handleOrganizerCall(None, deviceNames, isOrganizer, \
+ REQUEST, "unlock")
if REQUEST:
- REQUEST['message'] = "Devices unlocked"
- if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
- return REQUEST['message']
- else:
- return self.callZenScreen(REQUEST)
+ msg = "Devices unlocked"
+ return self._buildReturnMessage(REQUEST, msg)
def lockDevicesFromDeletion(self, deviceNames=None,
sendEventWhenBlocked=None, isOrganizer=False, REQUEST=None):
"""Lock devices from being deleted"""
- if deviceNames is None and not isOrganizer:
- if REQUEST: REQUEST['message'] = "No Devices Selected"
- return self.callZenScreen(REQUEST)
- for dev in self._buildDeviceList(deviceNames):
- dev.lockFromDeletion(sendEventWhenBlocked)
+ self._handleOrganizerCall(sendEventWhenBlocked, deviceNames, isOrganizer, \
+ REQUEST, "lockFromDeletion")
if REQUEST:
- REQUEST['message'] = "Devices locked from deletion"
- if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
- return REQUEST['message']
- else:
- return self.callZenScreen(REQUEST)
+ msg = "Devices locked from deletion"
+ return self._buildReturnMessage(REQUEST, msg)
def lockDevicesFromUpdates(self, deviceNames=None,
sendEventWhenBlocked=None, isOrganizer=False, REQUEST=None):
"""Lock devices from being deleted or updated"""
- if deviceNames is None and not isOrganizer:
- if REQUEST: REQUEST['message'] = "No Devices Selected"
- return self.callZenScreen(REQUEST)
- for dev in self._buildDeviceList(deviceNames):
- dev.lockFromUpdates(sendEventWhenBlocked)
+ self._handleOrganizerCall(sendEventWhenBlocked, deviceNames, isOrganizer, \
+ REQUEST, "lockFromUpdates")
if REQUEST:
- REQUEST['message'] = "Devices locked from updates and deletion"
- if REQUEST.has_key('oneKeyValueSoInstanceIsntEmptyAndEvalToFalse'):
- return REQUEST['message']
- else:
- return self.callZenScreen(REQUEST)
+ msg = "Devices locked from updates and deletion"
+ return self._buildReturnMessage(REQUEST, msg)
def index_object(self):
|
|
From: <sv...@ze...> - 2008-04-21 19:02:25
|
Author: jstevens
Date: 2008-04-21 15:02:25 -0400 (Mon, 21 Apr 2008)
New Revision: 9067
Modified:
trunk/Products/ZenModel/ZenPackPersistence.py
Log:
fixes #3002
Modified: trunk/Products/ZenModel/ZenPackPersistence.py
===================================================================
--- trunk/Products/ZenModel/ZenPackPersistence.py 2008-04-21 18:56:09 UTC (rev 9066)
+++ trunk/Products/ZenModel/ZenPackPersistence.py 2008-04-21 19:02:25 UTC (rev 9067)
@@ -91,7 +91,7 @@
"""
Return the ZenPack instance that provides this object.
"""
- return context.dmd.ZenPackManager.packs._getOb(self.ZENPACK_ID, None)
+ return context.dmd.ZenPackManager.packs._getOb(self.ZENPACKID, None)
# index_object and unindex_object are overridden so that instances
|
|
From: <sv...@ze...> - 2008-04-21 18:56:11
|
Author: noel
Date: 2008-04-21 14:56:09 -0400 (Mon, 21 Apr 2008)
New Revision: 9066
Modified:
trunk/Products/ZenModel/data/events.xml
Log:
*fixes #1967 Removed edahl and all of the other objects under users
Modified: trunk/Products/ZenModel/data/events.xml
===================================================================
--- trunk/Products/ZenModel/data/events.xml 2008-04-21 18:28:19 UTC (rev 9065)
+++ trunk/Products/ZenModel/data/events.xml 2008-04-21 18:56:09 UTC (rev 9066)
@@ -5351,16 +5351,6 @@
</object>
</object>
<object id='Users' module='Products.ZenEvents.EventClass' class='EventClass'>
-<object id='edahl' module='Products.ZenEvents.EventClass' class='EventClass'>
-<object id='zenoss' module='Products.ZenEvents.EventClass' class='EventClass'>
-<object id='Products' module='Products.ZenEvents.EventClass' class='EventClass'>
-<object id='ZenEvents' module='Products.ZenEvents.EventClass' class='EventClass'>
-<object id='ZenEventClasses.pyc' module='Products.ZenEvents.EventClass' class='EventClass'>
</object>
</object>
-</object>
-</object>
-</object>
-</object>
-</object>
</objects>
|
|
From: <sv...@ze...> - 2008-04-21 18:28:12
|
Author: cluther
Date: 2008-04-21 14:28:19 -0400 (Mon, 21 Apr 2008)
New Revision: 9065
Modified:
trunk/Products/ZenWin/zenwin.py
Log:
* Refs #3001: Increase WQL query timeout value from 100ms to 500ms.
Modified: trunk/Products/ZenWin/zenwin.py
===================================================================
--- trunk/Products/ZenWin/zenwin.py 2008-04-21 18:18:20 UTC (rev 9064)
+++ trunk/Products/ZenWin/zenwin.py 2008-04-21 18:28:19 UTC (rev 9065)
@@ -101,7 +101,7 @@
self.watchers[device.id] = w = self.getWatcher(device, wql)
try:
self.log.debug("Querying %s", device.id)
- s = w.boundedCall(MAX_WAIT_FOR_WMI_REQUEST, 'nextEvent', 100)
+ s = w.boundedCall(MAX_WAIT_FOR_WMI_REQUEST, 'nextEvent', 500)
self.deviceUp(device)
if not s.state:
return
|
|
From: <sv...@ze...> - 2008-04-21 18:18:23
|
Author: jstevens
Date: 2008-04-21 14:18:20 -0400 (Mon, 21 Apr 2008)
New Revision: 9064
Modified:
trunk/Products/ZenModel/ZenPackTemplate/setup.py
Log:
fixes #2999
Modified: trunk/Products/ZenModel/ZenPackTemplate/setup.py
===================================================================
--- trunk/Products/ZenModel/ZenPackTemplate/setup.py 2008-04-21 18:16:45 UTC (rev 9063)
+++ trunk/Products/ZenModel/ZenPackTemplate/setup.py 2008-04-21 18:18:20 UTC (rev 9064)
@@ -1,6 +1,7 @@
################################
# These variables are overwritten by Zenoss when the ZenPack is exported
# or saved. Do not modify them directly here.
+# NB: PACKAGES is deprecated
NAME = ''
VERSION = '1.0'
AUTHOR = ''
@@ -39,7 +40,7 @@
namespace_packages = NAMESPACE_PACKAGES,
# Tell setuptools what packages this zenpack provides.
- packages = PACKAGES,
+ packages = find_packages(),
# Tell setuptools to figure out for itself which files to include
# in the binary egg when it is built.
|
|
From: <sv...@ze...> - 2008-04-21 18:16:37
|
Author: jstevens
Date: 2008-04-21 14:16:45 -0400 (Mon, 21 Apr 2008)
New Revision: 9063
Modified:
trunk/Products/ZenEvents/EventManagerBase.py
trunk/Products/ZenModel/Device.py
trunk/Products/ZenModel/skins/zenmodel/dialog_deleteDevice.pt
trunk/Products/ZenWidgets/skins/zenui/dialog_removeDevices.pt
Log:
fixes #2996
Modified: trunk/Products/ZenEvents/EventManagerBase.py
===================================================================
--- trunk/Products/ZenEvents/EventManagerBase.py 2008-04-21 18:15:37 UTC (rev 9062)
+++ trunk/Products/ZenEvents/EventManagerBase.py 2008-04-21 18:16:45 UTC (rev 9063)
@@ -1873,6 +1873,9 @@
don't want to test the combination.
This is an option during device deletion. It is also used
by zenactions to keep history table clean.
+
+ NB: Device.deleteDevice() is not currently calling this when devices
+ are deleted. See ticket #2996.
"""
import subprocess
import os
Modified: trunk/Products/ZenModel/Device.py
===================================================================
--- trunk/Products/ZenModel/Device.py 2008-04-21 18:15:37 UTC (rev 9062)
+++ trunk/Products/ZenModel/Device.py 2008-04-21 18:16:45 UTC (rev 9063)
@@ -1602,14 +1602,18 @@
"""
Delete device from the database
+ NB: deleteHistory is disabled for the 2.2 release. In some
+ circumstances it was causing many subprocesses to be spawned
+ and creating a gridlock situation.
+
@permission: ZEN_ADMIN_DEVICE
"""
parent = self.getPrimaryParent()
if deleteStatus:
self.getEventManager().manage_deleteHeartbeat(self.getId())
self.getEventManager().manage_deleteAllEvents(self.getId())
- if deleteHistory:
- self.getEventManager().manage_deleteHistoricalEvents(self.getId())
+ # if deleteHistory:
+ # self.getEventManager().manage_deleteHistoricalEvents(self.getId())
if deletePerf:
self.getPerformanceServer().deleteRRDFiles(self.id)
parent._delObject(self.getId())
Modified: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteDevice.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/dialog_deleteDevice.pt 2008-04-21 18:15:37 UTC (rev 9062)
+++ trunk/Products/ZenModel/skins/zenmodel/dialog_deleteDevice.pt 2008-04-21 18:16:45 UTC (rev 9063)
@@ -7,7 +7,9 @@
</p>
<p>
<input type="checkbox" name="deleteStatus" value="1" checked="1"> Delete current events for this device<br />
+<!--
<input type="checkbox" name="deleteHistory" value="1" checked="1"> Delete historical events for this device<br />
+-->
<input type="checkbox" name="deletePerf" value="1" checked="1"> Delete performance data for this device<br />
</p>
<br/>
Modified: trunk/Products/ZenWidgets/skins/zenui/dialog_removeDevices.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/dialog_removeDevices.pt 2008-04-21 18:15:37 UTC (rev 9062)
+++ trunk/Products/ZenWidgets/skins/zenui/dialog_removeDevices.pt 2008-04-21 18:16:45 UTC (rev 9063)
@@ -6,7 +6,9 @@
</p>
<p>
<input type="checkbox" name="deleteStatus" value="1" checked="1"> Delete current events for these devices<br />
+<!--
<input type="checkbox" name="deleteHistory" value="1" checked="1"> Delete historical events for these devices<br />
+-->
<input type="checkbox" name="deletePerf" value="1" checked="1"> Delete performance data for these devices<br />
</p>
<br/>
|
