Menu
▾
▴
zenoss-commit — svn commit list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(65) |
Mar
(276) |
Apr
(544) |
May
(638) |
Jun
(225) |
Jul
(204) |
Aug
(294) |
Sep
(532) |
Oct
(506) |
Nov
(324) |
Dec
(359) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(208) |
Feb
(225) |
Mar
(248) |
Apr
(388) |
May
(222) |
Jun
(47) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@ze...> - 2008-05-14 19:50:40
|
Author: jstevens
Date: 2008-05-14 15:50:48 -0400 (Wed, 14 May 2008)
New Revision: 9240
Modified:
trunk/Products/ZenHub/tests/testRRDImpl.py
Log:
* Switched 127.0.0.10 to 127.0.0.1 for snmp unit test
Modified: trunk/Products/ZenHub/tests/testRRDImpl.py
===================================================================
--- trunk/Products/ZenHub/tests/testRRDImpl.py 2008-05-14 19:40:55 UTC (rev 9239)
+++ trunk/Products/ZenHub/tests/testRRDImpl.py 2008-05-14 19:50:48 UTC (rev 9240)
@@ -28,7 +28,7 @@
from Products.ZenHub.services.RRDImpl import RRDImpl
from Products.ZenModel.Device import manage_createDevice
d = manage_createDevice(self.dmd,
- deviceName='127.0.0.10',
+ deviceName='127.0.0.1',
devicePath='/Test')
from Products.ZenModel.RRDTemplate import manage_addRRDTemplate
manage_addRRDTemplate(self.dmd.Devices.Test.rrdTemplates, 'Device')
|
|
From: <sv...@ze...> - 2008-05-14 19:40:47
|
Author: jstevens
Date: 2008-05-14 15:40:55 -0400 (Wed, 14 May 2008)
New Revision: 9239
Modified:
trunk/Products/ZenModel/TemperatureSensor.py
Log:
fixes #3160
Modified: trunk/Products/ZenModel/TemperatureSensor.py
===================================================================
--- trunk/Products/ZenModel/TemperatureSensor.py 2008-05-14 19:39:01 UTC (rev 9238)
+++ trunk/Products/ZenModel/TemperatureSensor.py 2008-05-14 19:40:55 UTC (rev 9239)
@@ -39,7 +39,8 @@
)
_relations = HWComponent._relations + (
- ("hw", ToOne(ToManyCont, "Products.ZenModel.DeviceHW", "fans")),
+ ("hw", ToOne(
+ ToManyCont, "Products.ZenModel.DeviceHW", "temperaturesensors")),
)
|
|
From: <sv...@ze...> - 2008-05-14 19:38:53
|
Author: jstevens
Date: 2008-05-14 15:39:01 -0400 (Wed, 14 May 2008)
New Revision: 9238
Modified:
trunk/Products/ZenRelations/checkrel.py
Log:
* Made it work better with classes that are not RelationshipManager subclasses
Modified: trunk/Products/ZenRelations/checkrel.py
===================================================================
--- trunk/Products/ZenRelations/checkrel.py 2008-05-14 19:37:37 UTC (rev 9237)
+++ trunk/Products/ZenRelations/checkrel.py 2008-05-14 19:39:01 UTC (rev 9238)
@@ -22,6 +22,17 @@
from utils import importClass, importClasses
from Products.ZenRelations.Exceptions import ZenSchemaError
+def lookupSchema(cls, relname):
+ """
+ Lookup the schema definition for a relationship.
+ All base classes are checked until RelationshipManager is found.
+ """
+ for name, schema in cls._relations:
+ if name == relname: return schema
+ raise ZenSchemaError("Schema for relation %s not found on %s" %
+ (relname, cls.__name__))
+
+
def checkRelationshipSchema(cls, baseModule):
"""
Walk all relationship schema definitions and confirm that they
@@ -33,10 +44,9 @@
except AttributeError, e:
logging.critical("RemoteClass '%s' from '%s.%s' not found",
rel.remoteClass, cls.__name__, relname)
- continue
-
+ continue
try:
- rschema = remoteClass.lookupSchema(rel.remoteName)
+ rschema = lookupSchema(remoteClass, rel.remoteName)
except ZenSchemaError, e:
logging.critical("Inverse def '%s' for '%s.%s' not found on '%s'",
rel.remoteName, cls.__name__, relname,rel.remoteClass)
@@ -45,6 +55,7 @@
logging.critical("RemoteClass '%s' for '%s.%s' problem.",
rel.remoteName, cls.__name__, relname)
logging.critical(e)
+ continue
try:
localClass = importClass(rschema.remoteClass, None)
except AttributeError, e:
@@ -71,6 +82,6 @@
skipnames=("ZentinelPortal", "ZDeviceLoader"))
for classdef in classList:
- if hasattr(classdef, "lookupSchema"):
+ if hasattr(classdef, '_relations'):
logging.info("checking class %s...", classdef.__name__)
checkRelationshipSchema(classdef, baseModule)
|
|
From: <sv...@ze...> - 2008-05-14 19:37:28
|
Author: jstevens
Date: 2008-05-14 15:37:37 -0400 (Wed, 14 May 2008)
New Revision: 9237
Modified:
trunk/Products/ZenModel/ZenPackManager.py
Log:
fixes #3159
Modified: trunk/Products/ZenModel/ZenPackManager.py
===================================================================
--- trunk/Products/ZenModel/ZenPackManager.py 2008-05-14 19:34:45 UTC (rev 9236)
+++ trunk/Products/ZenModel/ZenPackManager.py 2008-05-14 19:37:37 UTC (rev 9237)
@@ -46,7 +46,7 @@
default_catalog = 'zenPackNameSearch'
_relations = ZenModelRM._relations + (
- ('packs', ToManyCont(ToOne, 'Products.ZenModel.ZenPack', 'root')),
+ ('packs', ToManyCont(ToOne, 'Products.ZenModel.ZenPack', 'manager')),
)
factory_type_information = (
|
|
From: <sv...@ze...> - 2008-05-14 19:22:08
|
Author: jplouis Date: 2008-05-14 15:22:15 -0400 (Wed, 14 May 2008) New Revision: 9235 Added: sandboxen/jplouis/Products-remoteStuff/ Log: branch for refactoring add device Copied: sandboxen/jplouis/Products-remoteStuff (from rev 9234, trunk/Products) |
|
From: <sv...@ze...> - 2008-05-14 19:21:36
|
Author: jplouis Date: 2008-05-14 15:21:44 -0400 (Wed, 14 May 2008) New Revision: 9234 Added: sandboxen/jplouis/ Log: adding a jplouis sandbox |
|
From: <sv...@ze...> - 2008-05-14 18:31:10
|
Author: ian
Date: 2008-05-14 14:31:16 -0400 (Wed, 14 May 2008)
New Revision: 9233
Modified:
branches/zenoss-2.2.x/zenpacks/zenpacks.spec
Log:
* Refs # 3157, Backporting into branch
Modified: branches/zenoss-2.2.x/zenpacks/zenpacks.spec
===================================================================
--- branches/zenoss-2.2.x/zenpacks/zenpacks.spec 2008-05-14 18:16:12 UTC (rev 9232)
+++ branches/zenoss-2.2.x/zenpacks/zenpacks.spec 2008-05-14 18:31:16 UTC (rev 9233)
@@ -35,7 +35,7 @@
BuildRequires: make
BuildRequires: patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: zenoss == %{version}
+Requires: zenoss >= %{version}
%description
Extensions to the Core Zenoss Network Monitoring System.
|
|
From: <sv...@ze...> - 2008-05-14 18:16:21
|
Author: ian
Date: 2008-05-14 14:16:12 -0400 (Wed, 14 May 2008)
New Revision: 9232
Modified:
trunk/zenpacks/zenpacks.spec
Log:
* Fixes #3157, reviewed by EAD and Jason: fixed zenpacks.spec to require zenoss >= instead of ==
Modified: trunk/zenpacks/zenpacks.spec
===================================================================
--- trunk/zenpacks/zenpacks.spec 2008-05-14 16:01:28 UTC (rev 9231)
+++ trunk/zenpacks/zenpacks.spec 2008-05-14 18:16:12 UTC (rev 9232)
@@ -35,7 +35,7 @@
BuildRequires: make
BuildRequires: patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: zenoss == %{version}
+Requires: zenoss >= %{version}
%description
Extensions to the Core Zenoss Network Monitoring System.
|
|
From: <sv...@ze...> - 2008-05-14 16:47:31
|
Author: ian
Date: 2008-05-14 12:01:28 -0400 (Wed, 14 May 2008)
New Revision: 9231
Modified:
branches/zenoss-2.2.x/inst/install-functions.sh
Log:
* Refs #3156: Backporting changes to branch
Modified: branches/zenoss-2.2.x/inst/install-functions.sh
===================================================================
--- branches/zenoss-2.2.x/inst/install-functions.sh 2008-05-14 15:59:04 UTC (rev 9230)
+++ branches/zenoss-2.2.x/inst/install-functions.sh 2008-05-14 16:01:28 UTC (rev 9231)
@@ -29,6 +29,10 @@
FORMAT="pid,comm"
fi
+ if [ -z "${OS_USERNAME}" ] ; then
+ export OS_USERNAME=zenoss
+ fi
+
ps -o ${FORMAT} -U ${OS_USERNAME} | grep python | egrep -v 'grep|buildbot' | egrep 'zeo|zope|zen'
}
@@ -66,9 +70,9 @@
fi
mysql --port=${MYSQLPORT} -h ${MYSQLHOST} -u ${MYSQLROOTUSER} --password="${MYSQLROOTPASSWD}" <<EOF
- grant all on $MYSQLEVENTDB.* to '$MYSQLUSER'@'${MYSQL_HOST_PERM}' identified by '$MYSQLPASS';
- grant super, file on *.* to '$MYSQLUSER'@'${MYSQL_HOST_PERM}';
- flush privileges;
+ grant all on $MYSQLEVENTDB.* to '$MYSQLUSER'@'${MYSQL_HOST_PERM}' identified by '$MYSQLPASS';
+ grant super, file on *.* to '$MYSQLUSER'@'${MYSQL_HOST_PERM}';
+ flush privileges;
EOF
# attempt to login to the database using the mysql user
@@ -133,7 +137,7 @@
echo Loading initial Zenoss objects into the Zeo database
echo '(this can take a few minutes)'
$ZENHOME/bin/zenbuild --evtport $MYSQLPORT -s $MYSQLHOST -u $MYSQLUSER -p "$MYSQLPASS" -d $MYSQLEVENTDB 2>>zenbuild.log || \
- fail unable to create the initial Zenoss object database
+ fail unable to create the initial Zenoss object database
fi
if [ "$MIGRATE" != "n" ]; then
|
|
From: <sv...@ze...> - 2008-05-14 16:10:58
|
Author: jstevens
Date: 2008-05-14 11:59:04 -0400 (Wed, 14 May 2008)
New Revision: 9230
Modified:
trunk/inst/install-functions.sh
Log:
refs #3156
Modified: trunk/inst/install-functions.sh
===================================================================
--- trunk/inst/install-functions.sh 2008-05-14 15:32:42 UTC (rev 9229)
+++ trunk/inst/install-functions.sh 2008-05-14 15:59:04 UTC (rev 9230)
@@ -29,6 +29,10 @@
FORMAT="pid,comm"
fi
+ if [ -z "${OS_USERNAME}" ] ; then
+ export OS_USERNAME=zenoss
+ fi
+
ps -o ${FORMAT} -U ${OS_USERNAME} | grep python | egrep -v 'grep|buildbot' | egrep 'zeo|zope|zen'
}
@@ -66,9 +70,9 @@
fi
mysql --port=${MYSQLPORT} -h ${MYSQLHOST} -u ${MYSQLROOTUSER} --password="${MYSQLROOTPASSWD}" <<EOF
- grant all on $MYSQLEVENTDB.* to '$MYSQLUSER'@'${MYSQL_HOST_PERM}' identified by '$MYSQLPASS';
- grant super, file on *.* to '$MYSQLUSER'@'${MYSQL_HOST_PERM}';
- flush privileges;
+ grant all on $MYSQLEVENTDB.* to '$MYSQLUSER'@'${MYSQL_HOST_PERM}' identified by '$MYSQLPASS';
+ grant super, file on *.* to '$MYSQLUSER'@'${MYSQL_HOST_PERM}';
+ flush privileges;
EOF
# attempt to login to the database using the mysql user
@@ -133,7 +137,7 @@
echo Loading initial Zenoss objects into the Zeo database
echo '(this can take a few minutes)'
$ZENHOME/bin/zenbuild --evtport $MYSQLPORT -s $MYSQLHOST -u $MYSQLUSER -p "$MYSQLPASS" -d $MYSQLEVENTDB 2>>zenbuild.log || \
- fail unable to create the initial Zenoss object database
+ fail unable to create the initial Zenoss object database
fi
if [ "$MIGRATE" != "n" ]; then
|
|
From: <sv...@ze...> - 2008-05-14 15:32:40
|
Author: ian Date: 2008-05-14 11:32:42 -0400 (Wed, 14 May 2008) New Revision: 9229 Modified: branches/zenoss-2.2.x/Products/ZenUtils/CmdBase.py Log: * Refs #3146: Backporting changes to branch Modified: branches/zenoss-2.2.x/Products/ZenUtils/CmdBase.py =================================================================== --- branches/zenoss-2.2.x/Products/ZenUtils/CmdBase.py 2008-05-14 15:32:02 UTC (rev 9228) +++ branches/zenoss-2.2.x/Products/ZenUtils/CmdBase.py 2008-05-14 15:32:42 UTC (rev 9229) @@ -26,6 +26,11 @@ import logging from optparse import OptionParser, SUPPRESS_HELP, NO_DEFAULT +# There is a nasty incompatability between pkg_resources and twisted. +# This pkg_resources import works around the problem. +# See http://dev.zenoss.org/trac/ticket/3146 for details +import pkg_resources + from Products.ZenUtils.Utils import unused def parseconfig(options): |
|
From: <sv...@ze...> - 2008-05-14 15:31:55
|
Author: ian
Date: 2008-05-14 11:32:02 -0400 (Wed, 14 May 2008)
New Revision: 9228
Modified:
branches/zenoss-2.2.x/inst/rpm/zenoss.spec
Log:
* Refs #3156: Backporting changes to branch
Modified: branches/zenoss-2.2.x/inst/rpm/zenoss.spec
===================================================================
--- branches/zenoss-2.2.x/inst/rpm/zenoss.spec 2008-05-14 15:31:17 UTC (rev 9227)
+++ branches/zenoss-2.2.x/inst/rpm/zenoss.spec 2008-05-14 15:32:02 UTC (rev 9228)
@@ -381,12 +381,13 @@
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
%preun
+
+export OS_USERNAME=%{os_username}
+
# load up the install functions
. %{zenhome}/bin/shared-functions.sh
. %{zenhome}/bin/install-functions.sh
-export OS_USERNAME=%{os_username}
-
# kill off any zeo/zope/zen processes that are running
kill_running
|
|
From: <sv...@ze...> - 2008-05-14 15:31:12
|
Author: ian
Date: 2008-05-14 11:31:17 -0400 (Wed, 14 May 2008)
New Revision: 9227
Modified:
branches/zenoss-2.2.x/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py
branches/zenoss-2.2.x/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py
branches/zenoss-2.2.x/zenpacks/build-egg.sh
Log:
* Refs #3154, refs #3155: backporting changes to branch
Modified: branches/zenoss-2.2.x/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py
===================================================================
--- branches/zenoss-2.2.x/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py 2008-05-14 15:29:04 UTC (rev 9226)
+++ branches/zenoss-2.2.x/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py 2008-05-14 15:31:17 UTC (rev 9227)
@@ -21,6 +21,23 @@
from Products.ZenModel.ZenPack import ZenPackBase
+# --------------------------------------------------
+# The 2.1.x DellMonitor zenpack overrides the remove()
+# method. In 2.2 the ZenPack.remove() method
+# gained a 3rd parameter and the code was not
+# backwards compatible with older method sigs.
+# This monkeypatch fixes that problem when user
+# is upgrading to 2.2
+def betterRemove(self, app, leaveObjects=False):
+ self.cleanupOurPlugins(app.zport.dmd)
+ ZenPackBase.remove(self, app, leaveObjects)
+try:
+ import Products.DellMonitor
+ Products.DellMonitor.ZenPack.remove = betterRemove
+except ImportError:
+ pass
+# --------------------------------------------------
+
class ZenPack(ZenPackBase):
""" DellMonitor loader
"""
Modified: branches/zenoss-2.2.x/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py
===================================================================
--- branches/zenoss-2.2.x/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py 2008-05-14 15:29:04 UTC (rev 9226)
+++ branches/zenoss-2.2.x/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py 2008-05-14 15:31:17 UTC (rev 9227)
@@ -21,6 +21,23 @@
from Products.ZenModel.ZenPack import ZenPackBase
+# --------------------------------------------------
+# The 2.1.x HPMonitor zenpack overrides the remove()
+# method. In 2.2 the ZenPack.remove() method
+# gained a 3rd parameter and the code was not
+# backwards compatible with older method sigs.
+# This monkeypatch fixes that problem when user
+# is upgrading to 2.2
+def betterRemove(self, app, leaveObjects=False):
+ self.cleanupOurPlugins(app.zport.dmd)
+ ZenPackBase.remove(self, app, leaveObjects)
+try:
+ import Products.HPMonitor
+ Products.HPMonitor.ZenPack.remove = betterRemove
+except ImportError:
+ pass
+# --------------------------------------------------
+
class ZenPack(ZenPackBase):
""" HPMonitor loader
"""
Modified: branches/zenoss-2.2.x/zenpacks/build-egg.sh
===================================================================
--- branches/zenoss-2.2.x/zenpacks/build-egg.sh 2008-05-14 15:29:04 UTC (rev 9226)
+++ branches/zenoss-2.2.x/zenpacks/build-egg.sh 2008-05-14 15:31:17 UTC (rev 9227)
@@ -22,6 +22,11 @@
cd $PACK
echo In $PACK
python setup.py bdist_egg
+cd dist
+for f in `ls -1 | grep py2.3.egg` ; do
+ mv $f `echo $f | sed 's/2.3/2.4/'`
+done ;
+cd ..
cp dist/*.egg ..
true
|
|
From: <sv...@ze...> - 2008-05-14 15:05:56
|
Author: jstevens
Date: 2008-05-14 11:06:03 -0400 (Wed, 14 May 2008)
New Revision: 9225
Modified:
trunk/inst/rpm/zenoss.spec
Log:
fixes #3156
* reviewed by Ian
Modified: trunk/inst/rpm/zenoss.spec
===================================================================
--- trunk/inst/rpm/zenoss.spec 2008-05-14 00:42:47 UTC (rev 9224)
+++ trunk/inst/rpm/zenoss.spec 2008-05-14 15:06:03 UTC (rev 9225)
@@ -381,12 +381,13 @@
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
%preun
+
+export OS_USERNAME=%{os_username}
+
# load up the install functions
. %{zenhome}/bin/shared-functions.sh
. %{zenhome}/bin/install-functions.sh
-export OS_USERNAME=%{os_username}
-
# kill off any zeo/zope/zen processes that are running
kill_running
|
|
From: <sv...@ze...> - 2008-05-14 00:42:39
|
Author: jstevens Date: 2008-05-13 20:42:47 -0400 (Tue, 13 May 2008) New Revision: 9224 Modified: trunk/zenpacks/build-egg.sh Log: * Another attempt at proper naming of the eggs on cent4 Modified: trunk/zenpacks/build-egg.sh =================================================================== --- trunk/zenpacks/build-egg.sh 2008-05-14 00:25:50 UTC (rev 9223) +++ trunk/zenpacks/build-egg.sh 2008-05-14 00:42:47 UTC (rev 9224) @@ -22,10 +22,11 @@ cd $PACK echo In $PACK python setup.py bdist_egg -cp dist/*.egg .. -cd .. +cd dist for f in `ls -1 | grep py2.3.egg` ; do - mv $f `echo $f | sed 's/2.3/2.4/'` + mv $f `echo $f | sed 's/2.3/2.4/'` done ; +cd .. +cp dist/*.egg .. true |
|
From: <sv...@ze...> - 2008-05-14 00:25:44
|
Author: jstevens Date: 2008-05-13 20:25:50 -0400 (Tue, 13 May 2008) New Revision: 9223 Modified: trunk/zenpacks/build-egg.sh Log: * Added renaming of 2.3 eggs to 2.4. This works around a problem building on cent4 Modified: trunk/zenpacks/build-egg.sh =================================================================== --- trunk/zenpacks/build-egg.sh 2008-05-13 22:29:38 UTC (rev 9222) +++ trunk/zenpacks/build-egg.sh 2008-05-14 00:25:50 UTC (rev 9223) @@ -23,5 +23,9 @@ echo In $PACK python setup.py bdist_egg cp dist/*.egg .. +cd .. +for f in `ls -1 | grep py2.3.egg` ; do + mv $f `echo $f | sed 's/2.3/2.4/'` +done ; true |
|
From: <sv...@ze...> - 2008-05-13 22:29:32
|
Author: jstevens
Date: 2008-05-13 18:29:38 -0400 (Tue, 13 May 2008)
New Revision: 9222
Modified:
trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py
trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py
Log:
Monkey patching previously installed versions to work around problem with overridden ZenPack.remove() calls
Modified: trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py
===================================================================
--- trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py 2008-05-13 21:11:14 UTC (rev 9221)
+++ trunk/zenpacks/ZenPacks.zenoss.DellMonitor/ZenPacks/zenoss/DellMonitor/__init__.py 2008-05-13 22:29:38 UTC (rev 9222)
@@ -21,6 +21,23 @@
from Products.ZenModel.ZenPack import ZenPackBase
+# --------------------------------------------------
+# The 2.1.x DellMonitor zenpack overrides the remove()
+# method. In 2.2 the ZenPack.remove() method
+# gained a 3rd parameter and the code was not
+# backwards compatible with older method sigs.
+# This monkeypatch fixes that problem when user
+# is upgrading to 2.2
+def betterRemove(self, app, leaveObjects=False):
+ self.cleanupOurPlugins(app.zport.dmd)
+ ZenPackBase.remove(self, app, leaveObjects)
+try:
+ import Products.DellMonitor
+ Products.DellMonitor.ZenPack.remove = betterRemove
+except ImportError:
+ pass
+# --------------------------------------------------
+
class ZenPack(ZenPackBase):
""" DellMonitor loader
"""
Modified: trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py
===================================================================
--- trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py 2008-05-13 21:11:14 UTC (rev 9221)
+++ trunk/zenpacks/ZenPacks.zenoss.HPMonitor/ZenPacks/zenoss/HPMonitor/__init__.py 2008-05-13 22:29:38 UTC (rev 9222)
@@ -21,6 +21,23 @@
from Products.ZenModel.ZenPack import ZenPackBase
+# --------------------------------------------------
+# The 2.1.x HPMonitor zenpack overrides the remove()
+# method. In 2.2 the ZenPack.remove() method
+# gained a 3rd parameter and the code was not
+# backwards compatible with older method sigs.
+# This monkeypatch fixes that problem when user
+# is upgrading to 2.2
+def betterRemove(self, app, leaveObjects=False):
+ self.cleanupOurPlugins(app.zport.dmd)
+ ZenPackBase.remove(self, app, leaveObjects)
+try:
+ import Products.HPMonitor
+ Products.HPMonitor.ZenPack.remove = betterRemove
+except ImportError:
+ pass
+# --------------------------------------------------
+
class ZenPack(ZenPackBase):
""" HPMonitor loader
"""
|
|
From: <sv...@ze...> - 2008-05-13 21:11:08
|
Author: chris Date: 2008-05-13 17:11:14 -0400 (Tue, 13 May 2008) New Revision: 9221 Modified: trunk/inst/docs/INSTALL_EL4.txt trunk/inst/docs/INSTALL_EL5.txt Log: * updated to the latest version numbers Modified: trunk/inst/docs/INSTALL_EL4.txt =================================================================== --- trunk/inst/docs/INSTALL_EL4.txt 2008-05-13 19:17:30 UTC (rev 9220) +++ trunk/inst/docs/INSTALL_EL4.txt 2008-05-13 21:11:14 UTC (rev 9221) @@ -13,27 +13,32 @@ 2. Download and install the el4 dependencies and install them -# wget http://downloads.sourceforge.net/zenoss/zenoss-deps-el4.i386.tar.bz2 # -tar jxf zenoss-deps-el4.i386.tar.bz2 # rpm -Uvh zenoss-deps/*.rpm +# wget http://downloads.sourceforge.net/zenoss/zenoss-deps-el4.i386.tar.bz2 +# tar jxf zenoss-deps-el4.i386.tar.bz2 +# rpm -Uvh zenoss-deps/*.rpm 2. Download the latest Zenoss RPM from the SourceForge downloads page, and install it using the following command: -# rpm -ivh zenoss-2.0.0-0.el4.i386.rpm +# rpm -ivh zenoss-2.2.0-0.el4.i386.rpm 3. Start Zenoss using the command: -# /etc/init.d/mysql restart # /etc/init.d/zenoss start +# /etc/init.d/mysql restart +# /etc/init.d/zenoss start 4. Several ports need to be open for Zenoss to operate. One option for doing this is to disable the firewall: -# service iptables stop # chkconfig iptables off +# service iptables stop +# chkconfig iptables off -Alternatively you can open the following ports in your firewall: 8080 - HTTP -access to the zenoss console 514 - syslog 162 - SNMP traps +Alternatively you can open the following ports in your firewall: +8080 - HTTP access to the zenoss console +514 - syslog +162 - SNMP traps Modified: trunk/inst/docs/INSTALL_EL5.txt =================================================================== --- trunk/inst/docs/INSTALL_EL5.txt 2008-05-13 19:17:30 UTC (rev 9220) +++ trunk/inst/docs/INSTALL_EL5.txt 2008-05-13 21:11:14 UTC (rev 9221) @@ -11,20 +11,21 @@ Zenoss depends on in order to properly function. To run yum, issue the following command: -# yum -y install mysql mysql-server net-snmp net-snmp-utils gmp \ swig autoconf +# yum -y install mysql mysql-server net-snmp net-snmp-utils gmp swig autoconf 2. Download the latest Zenoss RPM from the SourceForge downloads page, and install it using the following command: -# rpm -ivh [zenoss-el-5-rpm-file] +# rpm -ivh zenoss-2.2.0-0.el5.i386.rpm 3. Setup your MySQL access permissions or access details: -MySQL freshly installed: Start MySQL and adjust the permissions # -/etc/init.d/mysqld restart # /usr/bin/mysqladmin -u root password 'new-password' +MySQL freshly installed: Start MySQL and adjust the permissions +# /etc/init.d/mysqld restart +# /usr/bin/mysqladmin -u root password 'new-password' # /usr/bin/mysqladmin -u root -h YOUR_SERVER_NAME -p password 'new-password' MySQL already installed on system: Edit the file /opt/zenoss/bin/zenoss_init_pre @@ -46,6 +47,8 @@ # service iptables stop # chkconfig iptables off -Alternatively you can open the following ports in your firewall: 8080 - HTTP -access to the zenoss console 514 - syslog 162 - SNMP traps +Alternatively you can open the following ports in your firewall: +8080 - HTTP access to the zenoss console +514 - syslog +162 - SNMP traps |
|
From: <sv...@ze...> - 2008-05-13 19:17:25
|
Author: abray Date: 2008-05-13 15:17:30 -0400 (Tue, 13 May 2008) New Revision: 9220 Added: trunk/zendocs/AdminGuide/docbook/out211/apa.html trunk/zendocs/AdminGuide/docbook/out211/apas01.html trunk/zendocs/AdminGuide/docbook/out211/apb.html trunk/zendocs/AdminGuide/docbook/out211/apbs01.html trunk/zendocs/AdminGuide/docbook/out211/apc.html trunk/zendocs/AdminGuide/docbook/out211/apcs01.html trunk/zendocs/AdminGuide/docbook/out211/apcs02.html trunk/zendocs/AdminGuide/docbook/out211/apcs03.html trunk/zendocs/AdminGuide/docbook/out211/apd.html trunk/zendocs/AdminGuide/docbook/out211/apds01.html trunk/zendocs/AdminGuide/docbook/out211/apds02.html trunk/zendocs/AdminGuide/docbook/out211/apds03.html trunk/zendocs/AdminGuide/docbook/out211/apds04.html trunk/zendocs/AdminGuide/docbook/out211/apds05.html trunk/zendocs/AdminGuide/docbook/out211/apds06.html trunk/zendocs/AdminGuide/docbook/out211/ape.html trunk/zendocs/AdminGuide/docbook/out211/apes01.html trunk/zendocs/AdminGuide/docbook/out211/apes02.html trunk/zendocs/AdminGuide/docbook/out211/ch01.html trunk/zendocs/AdminGuide/docbook/out211/ch01s01.html trunk/zendocs/AdminGuide/docbook/out211/ch02.html trunk/zendocs/AdminGuide/docbook/out211/ch02s01.html trunk/zendocs/AdminGuide/docbook/out211/ch02s02.html trunk/zendocs/AdminGuide/docbook/out211/ch02s03.html trunk/zendocs/AdminGuide/docbook/out211/ch02s04.html trunk/zendocs/AdminGuide/docbook/out211/ch03.html trunk/zendocs/AdminGuide/docbook/out211/ch03s01.html trunk/zendocs/AdminGuide/docbook/out211/ch03s02.html trunk/zendocs/AdminGuide/docbook/out211/ch03s03.html trunk/zendocs/AdminGuide/docbook/out211/ch04.html trunk/zendocs/AdminGuide/docbook/out211/ch04s01.html trunk/zendocs/AdminGuide/docbook/out211/ch04s02.html trunk/zendocs/AdminGuide/docbook/out211/ch04s03.html trunk/zendocs/AdminGuide/docbook/out211/ch04s04.html trunk/zendocs/AdminGuide/docbook/out211/ch04s05.html trunk/zendocs/AdminGuide/docbook/out211/ch04s06.html trunk/zendocs/AdminGuide/docbook/out211/ch04s07.html trunk/zendocs/AdminGuide/docbook/out211/ch04s08.html trunk/zendocs/AdminGuide/docbook/out211/ch05.html trunk/zendocs/AdminGuide/docbook/out211/ch05s01.html trunk/zendocs/AdminGuide/docbook/out211/ch05s02.html trunk/zendocs/AdminGuide/docbook/out211/ch05s03.html trunk/zendocs/AdminGuide/docbook/out211/ch05s04.html trunk/zendocs/AdminGuide/docbook/out211/ch06.html trunk/zendocs/AdminGuide/docbook/out211/ch06s01.html trunk/zendocs/AdminGuide/docbook/out211/ch06s02.html trunk/zendocs/AdminGuide/docbook/out211/ch07.html trunk/zendocs/AdminGuide/docbook/out211/ch07s01.html trunk/zendocs/AdminGuide/docbook/out211/ch07s02.html trunk/zendocs/AdminGuide/docbook/out211/ch07s03.html trunk/zendocs/AdminGuide/docbook/out211/ch07s04.html trunk/zendocs/AdminGuide/docbook/out211/ch07s05.html trunk/zendocs/AdminGuide/docbook/out211/ch07s06.html trunk/zendocs/AdminGuide/docbook/out211/ch07s07.html trunk/zendocs/AdminGuide/docbook/out211/ch08.html trunk/zendocs/AdminGuide/docbook/out211/ch08s01.html trunk/zendocs/AdminGuide/docbook/out211/ch08s02.html trunk/zendocs/AdminGuide/docbook/out211/ch08s03.html trunk/zendocs/AdminGuide/docbook/out211/ch08s04.html trunk/zendocs/AdminGuide/docbook/out211/ch08s05.html trunk/zendocs/AdminGuide/docbook/out211/ch08s06.html trunk/zendocs/AdminGuide/docbook/out211/ch09.html trunk/zendocs/AdminGuide/docbook/out211/ch09s01.html trunk/zendocs/AdminGuide/docbook/out211/ch09s02.html trunk/zendocs/AdminGuide/docbook/out211/ch09s03.html trunk/zendocs/AdminGuide/docbook/out211/ch09s04.html trunk/zendocs/AdminGuide/docbook/out211/ch09s05.html trunk/zendocs/AdminGuide/docbook/out211/ch09s06.html trunk/zendocs/AdminGuide/docbook/out211/ch09s07.html trunk/zendocs/AdminGuide/docbook/out211/ch09s08.html trunk/zendocs/AdminGuide/docbook/out211/ch09s09.html trunk/zendocs/AdminGuide/docbook/out211/ch09s10.html trunk/zendocs/AdminGuide/docbook/out211/ch09s11.html trunk/zendocs/AdminGuide/docbook/out211/ch09s12.html trunk/zendocs/AdminGuide/docbook/out211/ch09s13.html trunk/zendocs/AdminGuide/docbook/out211/ch09s14.html trunk/zendocs/AdminGuide/docbook/out211/ch09s15.html trunk/zendocs/AdminGuide/docbook/out211/ch09s16.html trunk/zendocs/AdminGuide/docbook/out211/ch09s17.html trunk/zendocs/AdminGuide/docbook/out211/ch09s18.html trunk/zendocs/AdminGuide/docbook/out211/ch10.html trunk/zendocs/AdminGuide/docbook/out211/ch10s01.html trunk/zendocs/AdminGuide/docbook/out211/ch10s02.html trunk/zendocs/AdminGuide/docbook/out211/ch10s03.html trunk/zendocs/AdminGuide/docbook/out211/ch10s04.html trunk/zendocs/AdminGuide/docbook/out211/ch10s05.html trunk/zendocs/AdminGuide/docbook/out211/ch10s06.html trunk/zendocs/AdminGuide/docbook/out211/ch10s07.html trunk/zendocs/AdminGuide/docbook/out211/ch10s08.html trunk/zendocs/AdminGuide/docbook/out211/ch10s09.html trunk/zendocs/AdminGuide/docbook/out211/ch10s10.html trunk/zendocs/AdminGuide/docbook/out211/ch10s11.html trunk/zendocs/AdminGuide/docbook/out211/ch10s12.html trunk/zendocs/AdminGuide/docbook/out211/ch10s13.html trunk/zendocs/AdminGuide/docbook/out211/ch10s14.html trunk/zendocs/AdminGuide/docbook/out211/ch10s15.html trunk/zendocs/AdminGuide/docbook/out211/ch10s16.html trunk/zendocs/AdminGuide/docbook/out211/ch10s17.html trunk/zendocs/AdminGuide/docbook/out211/ch11.html trunk/zendocs/AdminGuide/docbook/out211/ch11s01.html trunk/zendocs/AdminGuide/docbook/out211/ch11s02.html trunk/zendocs/AdminGuide/docbook/out211/ch11s03.html trunk/zendocs/AdminGuide/docbook/out211/ch12.html trunk/zendocs/AdminGuide/docbook/out211/ch12s01.html trunk/zendocs/AdminGuide/docbook/out211/ch12s02.html trunk/zendocs/AdminGuide/docbook/out211/ch12s03.html trunk/zendocs/AdminGuide/docbook/out211/ch12s04.html trunk/zendocs/AdminGuide/docbook/out211/ch12s05.html trunk/zendocs/AdminGuide/docbook/out211/ch12s06.html trunk/zendocs/AdminGuide/docbook/out211/ch12s07.html trunk/zendocs/AdminGuide/docbook/out211/ch12s08.html trunk/zendocs/AdminGuide/docbook/out211/ch12s09.html trunk/zendocs/AdminGuide/docbook/out211/ch13.html trunk/zendocs/AdminGuide/docbook/out211/ch13s01.html trunk/zendocs/AdminGuide/docbook/out211/ch14.html trunk/zendocs/AdminGuide/docbook/out211/ch14s01.html trunk/zendocs/AdminGuide/docbook/out211/ch14s02.html trunk/zendocs/AdminGuide/docbook/out211/ch14s03.html trunk/zendocs/AdminGuide/docbook/out211/ch14s04.html trunk/zendocs/AdminGuide/docbook/out211/ch14s05.html trunk/zendocs/AdminGuide/docbook/out211/ch15.html trunk/zendocs/AdminGuide/docbook/out211/ch15s01.html trunk/zendocs/AdminGuide/docbook/out211/ch15s02.html trunk/zendocs/AdminGuide/docbook/out211/ch15s03.html trunk/zendocs/AdminGuide/docbook/out211/ch15s04.html trunk/zendocs/AdminGuide/docbook/out211/ch15s05.html trunk/zendocs/AdminGuide/docbook/out211/ch15s06.html trunk/zendocs/AdminGuide/docbook/out211/ch15s07.html trunk/zendocs/AdminGuide/docbook/out211/ch15s08.html trunk/zendocs/AdminGuide/docbook/out211/ch16.html trunk/zendocs/AdminGuide/docbook/out211/ch16s01.html trunk/zendocs/AdminGuide/docbook/out211/ch17.html trunk/zendocs/AdminGuide/docbook/out211/ch17s01.html trunk/zendocs/AdminGuide/docbook/out211/ch17s02.html trunk/zendocs/AdminGuide/docbook/out211/ch17s03.html trunk/zendocs/AdminGuide/docbook/out211/ch17s04.html trunk/zendocs/AdminGuide/docbook/out211/ch18.html trunk/zendocs/AdminGuide/docbook/out211/ch18s01.html trunk/zendocs/AdminGuide/docbook/out211/ch18s02.html trunk/zendocs/AdminGuide/docbook/out211/ch18s03.html trunk/zendocs/AdminGuide/docbook/out211/ch18s04.html trunk/zendocs/AdminGuide/docbook/out211/ch19.html trunk/zendocs/AdminGuide/docbook/out211/ch19s01.html trunk/zendocs/AdminGuide/docbook/out211/ch19s02.html trunk/zendocs/AdminGuide/docbook/out211/ch19s03.html trunk/zendocs/AdminGuide/docbook/out211/ch20.html trunk/zendocs/AdminGuide/docbook/out211/ch20s01.html trunk/zendocs/AdminGuide/docbook/out211/ch20s02.html trunk/zendocs/AdminGuide/docbook/out211/ch20s03.html trunk/zendocs/AdminGuide/docbook/out211/ch20s04.html trunk/zendocs/AdminGuide/docbook/out211/ch20s05.html trunk/zendocs/AdminGuide/docbook/out211/ch20s06.html trunk/zendocs/AdminGuide/docbook/out211/ch20s07.html trunk/zendocs/AdminGuide/docbook/out211/ch20s08.html trunk/zendocs/AdminGuide/docbook/out211/ch20s09.html trunk/zendocs/AdminGuide/docbook/out211/ch21.html trunk/zendocs/AdminGuide/docbook/out211/ch21s01.html trunk/zendocs/AdminGuide/docbook/out211/ch21s02.html trunk/zendocs/AdminGuide/docbook/out211/ch21s03.html trunk/zendocs/AdminGuide/docbook/out211/ch21s04.html trunk/zendocs/AdminGuide/docbook/out211/ch21s05.html trunk/zendocs/AdminGuide/docbook/out211/ch21s06.html trunk/zendocs/AdminGuide/docbook/out211/ch21s07.html trunk/zendocs/AdminGuide/docbook/out211/ch21s08.html trunk/zendocs/AdminGuide/docbook/out211/ch21s09.html trunk/zendocs/AdminGuide/docbook/out211/ch21s10.html trunk/zendocs/AdminGuide/docbook/out211/ch22.html trunk/zendocs/AdminGuide/docbook/out211/ch22s01.html trunk/zendocs/AdminGuide/docbook/out211/ch23.html trunk/zendocs/AdminGuide/docbook/out211/ch23s01.html trunk/zendocs/AdminGuide/docbook/out211/ch23s02.html trunk/zendocs/AdminGuide/docbook/out211/html.css trunk/zendocs/AdminGuide/docbook/out211/index.html Log: Checking in some older 211 HTML doc files Added: trunk/zendocs/AdminGuide/docbook/out211/apa.html Added: trunk/zendocs/AdminGuide/docbook/out211/apas01.html Added: trunk/zendocs/AdminGuide/docbook/out211/apb.html Added: trunk/zendocs/AdminGuide/docbook/out211/apbs01.html Added: trunk/zendocs/AdminGuide/docbook/out211/apc.html Added: trunk/zendocs/AdminGuide/docbook/out211/apcs01.html Added: trunk/zendocs/AdminGuide/docbook/out211/apcs02.html Added: trunk/zendocs/AdminGuide/docbook/out211/apcs03.html Added: trunk/zendocs/AdminGuide/docbook/out211/apd.html Added: trunk/zendocs/AdminGuide/docbook/out211/apds01.html Added: trunk/zendocs/AdminGuide/docbook/out211/apds02.html Added: trunk/zendocs/AdminGuide/docbook/out211/apds03.html Added: trunk/zendocs/AdminGuide/docbook/out211/apds04.html Added: trunk/zendocs/AdminGuide/docbook/out211/apds05.html Added: trunk/zendocs/AdminGuide/docbook/out211/apds06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ape.html Added: trunk/zendocs/AdminGuide/docbook/out211/apes01.html Added: trunk/zendocs/AdminGuide/docbook/out211/apes02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch01s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch02s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch02s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch02s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch02s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch03s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch03s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch03s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch04s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch04s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch04s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch04s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch04s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch04s06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch04s07.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch04s08.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch05s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch05s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch05s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch05s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch06s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch06s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch07.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch07s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch07s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch07s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch07s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch07s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch07s06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch07s07.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch08.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch08s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch08s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch08s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch08s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch08s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch08s06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s07.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s08.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s09.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s10.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s11.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s12.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s13.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s14.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s15.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s16.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s17.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch09s18.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s07.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s08.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s09.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s10.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s11.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s12.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s13.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s14.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s15.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s16.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch10s17.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch11.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch11s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch11s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch11s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12s06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12s07.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12s08.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch12s09.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch13.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch13s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch14.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch14s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch14s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch14s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch14s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch14s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch15.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch15s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch15s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch15s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch15s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch15s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch15s06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch15s07.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch15s08.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch16.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch16s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch17.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch17s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch17s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch17s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch17s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch18.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch18s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch18s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch18s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch18s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch19.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch19s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch19s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch19s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20s06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20s07.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20s08.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch20s09.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s03.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s04.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s05.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s06.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s07.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s08.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s09.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch21s10.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch22.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch22s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch23.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch23s01.html Added: trunk/zendocs/AdminGuide/docbook/out211/ch23s02.html Added: trunk/zendocs/AdminGuide/docbook/out211/html.css Added: trunk/zendocs/AdminGuide/docbook/out211/index.html |
|
From: <sv...@ze...> - 2008-05-13 19:12:34
|
Author: abray Date: 2008-05-13 15:12:40 -0400 (Tue, 13 May 2008) New Revision: 9219 Added: trunk/zendocs/AdminGuide/docbook/out/resources/collectors-indcollector.png trunk/zendocs/AdminGuide/docbook/out/resources/collectors-main.png trunk/zendocs/AdminGuide/docbook/out/resources/ind-collectoredit.png Modified: trunk/zendocs/AdminGuide/docbook/out/resources/DeviceClassTemp.png trunk/zendocs/AdminGuide/docbook/out/resources/DeviceClasstab.png trunk/zendocs/AdminGuide/docbook/out/resources/DeviceClasszProp.png trunk/zendocs/AdminGuide/docbook/out/resources/EventManger-edit.png trunk/zendocs/AdminGuide/docbook/out/resources/GraphReportEditPage.png trunk/zendocs/AdminGuide/docbook/out/resources/GraphReportElement.png trunk/zendocs/AdminGuide/docbook/out/resources/GraphReportGraphs.png trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportCollection.png trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportEditPage.png trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportGraphDef.png trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportGraphGroup.png trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportGraphs.png trunk/zendocs/AdminGuide/docbook/out/resources/Usertabshowinggroups.png trunk/zendocs/AdminGuide/docbook/out/resources/add-devicebig.png trunk/zendocs/AdminGuide/docbook/out/resources/adminobjectadded.png trunk/zendocs/AdminGuide/docbook/out/resources/adminsteredobject.png trunk/zendocs/AdminGuide/docbook/out/resources/alert-scheduletab.png trunk/zendocs/AdminGuide/docbook/out/resources/alertdetails.png trunk/zendocs/AdminGuide/docbook/out/resources/alertingrulestab.png trunk/zendocs/AdminGuide/docbook/out/resources/alertmessagetab.png trunk/zendocs/AdminGuide/docbook/out/resources/alertscheduledetail.jpg trunk/zendocs/AdminGuide/docbook/out/resources/commandoutput.jpg trunk/zendocs/AdminGuide/docbook/out/resources/customeventview.png trunk/zendocs/AdminGuide/docbook/out/resources/daemonstab.png trunk/zendocs/AdminGuide/docbook/out/resources/dashboard20.png trunk/zendocs/AdminGuide/docbook/out/resources/datapoints.png trunk/zendocs/AdminGuide/docbook/out/resources/datasource.png trunk/zendocs/AdminGuide/docbook/out/resources/definecommanddialog.jpg trunk/zendocs/AdminGuide/docbook/out/resources/devgroupzproptab.png trunk/zendocs/AdminGuide/docbook/out/resources/devicelist.png trunk/zendocs/AdminGuide/docbook/out/resources/editeventcommand.jpg trunk/zendocs/AdminGuide/docbook/out/resources/editeventviewtab.png trunk/zendocs/AdminGuide/docbook/out/resources/editmapping.png trunk/zendocs/AdminGuide/docbook/out/resources/eventconsole.png trunk/zendocs/AdminGuide/docbook/out/resources/eventdetailsfieldstab.png trunk/zendocs/AdminGuide/docbook/out/resources/graphconfig.png trunk/zendocs/AdminGuide/docbook/out/resources/ind-HWtab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-OStab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-SWtab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-admintab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-collectorplgtab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-customtab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-edittab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-eventtab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-historytab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-modtab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-perftab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-statustab.png trunk/zendocs/AdminGuide/docbook/out/resources/ind-templatestab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ind-zpropertiestab.jpg trunk/zendocs/AdminGuide/docbook/out/resources/individualmapping.png trunk/zendocs/AdminGuide/docbook/out/resources/individualserviceedittab.png trunk/zendocs/AdminGuide/docbook/out/resources/individualservicetab.png trunk/zendocs/AdminGuide/docbook/out/resources/indservicezproptab.png trunk/zendocs/AdminGuide/docbook/out/resources/induseradmin.png trunk/zendocs/AdminGuide/docbook/out/resources/induserdetails.png trunk/zendocs/AdminGuide/docbook/out/resources/loadaveragetemplate.png trunk/zendocs/AdminGuide/docbook/out/resources/mappingstab.png trunk/zendocs/AdminGuide/docbook/out/resources/mappingzproperties.png trunk/zendocs/AdminGuide/docbook/out/resources/networksoverview.jpg trunk/zendocs/AdminGuide/docbook/out/resources/ostab-process.png trunk/zendocs/AdminGuide/docbook/out/resources/perftab2.png trunk/zendocs/AdminGuide/docbook/out/resources/preferences-edittab.png trunk/zendocs/AdminGuide/docbook/out/resources/processclasstab.png trunk/zendocs/AdminGuide/docbook/out/resources/processeszprop.png trunk/zendocs/AdminGuide/docbook/out/resources/reportslist.png trunk/zendocs/AdminGuide/docbook/out/resources/serviceclassestab.png trunk/zendocs/AdminGuide/docbook/out/resources/servicesummary.png trunk/zendocs/AdminGuide/docbook/out/resources/settingtabforsnmp.png trunk/zendocs/AdminGuide/docbook/out/resources/systems-statustab.png trunk/zendocs/AdminGuide/docbook/out/resources/thresholddefinition.png Log: Drew checking in HTML Modified: trunk/zendocs/AdminGuide/docbook/out/resources/DeviceClassTemp.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/DeviceClasstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/DeviceClasszProp.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/EventManger-edit.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/GraphReportEditPage.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/GraphReportElement.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/GraphReportGraphs.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportCollection.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportEditPage.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportGraphDef.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportGraphGroup.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/MultiGraphReportGraphs.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/Usertabshowinggroups.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/add-devicebig.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/adminobjectadded.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/adminsteredobject.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/alert-scheduletab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/alertdetails.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/alertingrulestab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/alertmessagetab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/alertscheduledetail.jpg =================================================================== (Binary files differ) Added: trunk/zendocs/AdminGuide/docbook/out/resources/collectors-indcollector.png Property changes on: trunk/zendocs/AdminGuide/docbook/out/resources/collectors-indcollector.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/AdminGuide/docbook/out/resources/collectors-main.png Property changes on: trunk/zendocs/AdminGuide/docbook/out/resources/collectors-main.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/zendocs/AdminGuide/docbook/out/resources/commandoutput.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/customeventview.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/daemonstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/dashboard20.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/datapoints.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/datasource.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/definecommanddialog.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/devgroupzproptab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/devicelist.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/editeventcommand.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/editeventviewtab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/editmapping.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/eventconsole.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/eventdetailsfieldstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/graphconfig.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-HWtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-OStab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-SWtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-admintab.jpg =================================================================== (Binary files differ) Added: trunk/zendocs/AdminGuide/docbook/out/resources/ind-collectoredit.png Property changes on: trunk/zendocs/AdminGuide/docbook/out/resources/ind-collectoredit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-collectorplgtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-customtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-edittab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-eventtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-historytab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-modtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-perftab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-statustab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-templatestab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ind-zpropertiestab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/individualmapping.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/individualserviceedittab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/individualservicetab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/indservicezproptab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/induseradmin.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/induserdetails.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/loadaveragetemplate.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/mappingstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/mappingzproperties.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/networksoverview.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/ostab-process.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/perftab2.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/preferences-edittab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/processclasstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/processeszprop.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/reportslist.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/serviceclassestab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/servicesummary.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/settingtabforsnmp.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/systems-statustab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/out/resources/thresholddefinition.png =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2008-05-13 19:03:28
|
Author: abray Date: 2008-05-13 15:03:35 -0400 (Tue, 13 May 2008) New Revision: 9218 Added: trunk/zendocs/AdminGuide/docbook/adminguide22.pdf Log: drew checking in generated pdf of admin guide Added: trunk/zendocs/AdminGuide/docbook/adminguide22.pdf |
|
From: <sv...@ze...> - 2008-05-13 18:40:06
|
Author: abray
Date: 2008-05-13 14:40:07 -0400 (Tue, 13 May 2008)
New Revision: 9216
Modified:
trunk/zendocs/AdminGuide/docbook/EditUserAcct.xml
trunk/zendocs/AdminGuide/docbook/EventCommands.xml
trunk/zendocs/AdminGuide/docbook/EventManSettings.xml
trunk/zendocs/AdminGuide/docbook/LeftNavMenu.xml
trunk/zendocs/AdminGuide/docbook/ProcessMonitoring.xml
trunk/zendocs/AdminGuide/docbook/RegisterMIB.xml
trunk/zendocs/AdminGuide/docbook/SMTPSettings.xml
Log:
Drew checking in some corrections to the admin guide
Modified: trunk/zendocs/AdminGuide/docbook/EditUserAcct.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/EditUserAcct.xml 2008-05-13 18:35:31 UTC (rev 9215)
+++ trunk/zendocs/AdminGuide/docbook/EditUserAcct.xml 2008-05-13 18:40:07 UTC (rev 9216)
@@ -194,7 +194,7 @@
<section>
<info>
- <title>Creating Object Associations</title>
+ <title>Associating Objects in Zenoss with Specific Users</title>
</info>
<para>You can associate any object in the Zenoss system with a particular
Modified: trunk/zendocs/AdminGuide/docbook/EventCommands.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/EventCommands.xml 2008-05-13 18:35:31 UTC (rev 9215)
+++ trunk/zendocs/AdminGuide/docbook/EventCommands.xml 2008-05-13 18:40:07 UTC (rev 9216)
@@ -1,5 +1,14 @@
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="EventCommands"><info><title>Event Commands</title></info>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="EventCommands"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1999/xhtml"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title>Event Commands</title>
+ </info>
<para>Event Commands allow users to define arbitrary shell commands to be
executed when events are received by Zenoss that meet the criteria defined
@@ -8,23 +17,37 @@
created in the last section. Our command will write text from our event into
a log file.</para>
- <section><info><title>Create an Event Command Example</title></info>
-
+ <section>
+ <title>Commands Tab</title>
+ <para>To access the Commands tab, from the left navigation menu, select
+ Settings and then click the Commands tab. The Commands tab appears</para>
+
+ <para><Commands Tab screen></para>
+
+ <para>This tab shows all of the defined commands in Zenoss and you use the
+ Define Commands table menu to Add or Delete any Commands.</para>
+ </section>
+
+ <section>
+ <info>
+ <title>Create an Event Command Example</title>
+ </info>
+
<para>This example will give you the framework for creating an event
command.</para>
- <orderedlist inheritnum="ignore" continuation="restarts">
+ <orderedlist continuation="restarts" inheritnum="ignore">
<listitem>
<para>Click on Event Manager and go to the Commands page.</para>
- <para/>
+ <para></para>
</listitem>
<listitem>
<para>Create a new event command called writeFile.</para>
- <para/>
+ <para></para>
</listitem>
<listitem>
@@ -42,7 +65,7 @@
<programlisting>echo "${evt/evid} ${dev/id} ${dev/manageIp} ${evt/message}" >> /tmp/cmdoutput</programlisting>
- <para/>
+ <para></para>
</listitem>
<listitem>
@@ -50,38 +73,40 @@
<programlisting>echo "${evt/evid} ${evt/clearid} ${dev/id} ${evt/message}"" >> /tmp/cmdoutput</programlisting>
- <para/>
+ <para></para>
</listitem>
<listitem>
<para>In the Where area, add a filter of Message contains "testing
event commands".</para>
- <para/>
+ <para></para>
</listitem>
<listitem>
<para>Click Save.</para>
- <para/>
+ <para></para>
</listitem>
</orderedlist>
</section>
- <section><info><title>Test the Event Command</title></info>
-
+ <section>
+ <info>
+ <title>Test the Event Command</title>
+ </info>
<para>The Add Event page is a good tool for testing event commands. Follow
these steps to create an event that meets the criteria for the event
command you just created.</para>
- <orderedlist inheritnum="ignore" continuation="restarts">
+ <orderedlist continuation="restarts" inheritnum="ignore">
<listitem>
<para>Start watching the output file with the command:</para>
<programlisting>tail -f /tmp/cmdoutput</programlisting>
- <para/>
+ <para></para>
</listitem>
<listitem>
@@ -101,7 +126,7 @@
<para>Look at the output file. After the next zenactions cycle you
should see the down event.</para>
- <para/>
+ <para></para>
</listitem>
<listitem>
Modified: trunk/zendocs/AdminGuide/docbook/EventManSettings.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/EventManSettings.xml 2008-05-13 18:35:31 UTC (rev 9215)
+++ trunk/zendocs/AdminGuide/docbook/EventManSettings.xml 2008-05-13 18:40:07 UTC (rev 9216)
@@ -122,23 +122,36 @@
<itemizedlist>
<listitem>
- <para>Event Aging Threshold (hours)</para>
+ <para>Event Aging Threshold (hours) - This threshold tells Zenoss how
+ long to wait before aging an event into the history table.</para>
</listitem>
<listitem>
- <para>Don't Age This Severity and Above</para>
+ <para>Don't Age This Severity and Above - Whichever severity you
+ specify here will not age out and be placed in the event history. So
+ any event meeting the selected severity (or greater) will remain in
+ the event list until acknowledged or moved into the event history
+ manually.</para>
</listitem>
<listitem>
- <para>Delete Historical Events Older Than (days)</para>
+ <para>Delete Historical Events Older Than (days) - When an event in
+ the event history is older than the number of days you enter here will
+ automatically be purged (deleted) events from the event
+ history.</para>
</listitem>
<listitem>
- <para>Default Availability Report (days)</para>
+ <para>Default Availability Report (days) - Enter a number of days here
+ for the automatically generated availability report for Zenoss. This
+ reports gives a graphical summary of the actual availability and
+ status of Zenoss going back the number of days you specify
+ here.</para>
</listitem>
<listitem>
- <para>Default Syslog Priority</para>
+ <para>Default Syslog Priority - This is the default level of severity
+ of an event in order to generate an entry into the syslog.</para>
</listitem>
</itemizedlist>
</section>
Modified: trunk/zendocs/AdminGuide/docbook/LeftNavMenu.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/LeftNavMenu.xml 2008-05-13 18:35:31 UTC (rev 9215)
+++ trunk/zendocs/AdminGuide/docbook/LeftNavMenu.xml 2008-05-13 18:40:07 UTC (rev 9216)
@@ -1,5 +1,13 @@
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="LeftNav"><info><title>Left Navigation Menu</title></info>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="LeftNav" xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1999/xhtml"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title>Left Navigation Menu</title>
+ </info>
<para>The Left Navigation menu consists of the three main sections: the Main
Views, Classes, Browse By, and a Management Section.</para>
@@ -10,10 +18,12 @@
menu, and then you can use the pin icon to “pin” the menu into place and the
left navigation menu will remain visible.</para>
- <para/>
+ <para></para>
- <section><info><title>Main Views</title></info>
-
+ <section>
+ <info>
+ <title>Main Views</title>
+ </info>
<para>The Main Views section of the Navigational Bar consists of the
following views: The Dashboard, which returns you to the main view; The
@@ -22,11 +32,13 @@
devices in the Zenoss system; and the Network Map link which shows you a
graphical representation of the devices in your network.</para>
- <para/>
+ <para></para>
</section>
- <section><info><title>Classes</title></info>
-
+ <section>
+ <info>
+ <title>Classes</title>
+ </info>
<para>The Classes area contains the following links: The Events link will
take you to the event management tabs where you can monitor event status,
@@ -44,11 +56,13 @@
processes, or access process zProperties. The Products link will show you
a list of all the manufacturers of devices in the Zenoss database.</para>
- <para/>
+ <para></para>
</section>
- <section><info><title>Browse By</title></info>
-
+ <section>
+ <info>
+ <title>Browse By</title>
+ </info>
<para>Use the "Browse by" areas to see data based on any of the logical
groupings Zenoss allows you to create. Either "Systems", a more generic
@@ -77,28 +91,360 @@
Networks. The Reports option allows you to see and define the Reports
available within the Zenoss system.</para>
- <para/>
+ <para></para>
- <section><info><title>Management</title></info>
-
+ <section>
+ <info>
+ <title>Management Menu</title>
+ </info>
- <para>Add Device</para>
+ <para></para>
+ </section>
- <para>Mibs - Add New organizer, Add new MIBS</para>
+ <section>
+ <title>Adding New Devices</title>
- <para>Monitors - Status Monitors and Performance Monitors</para>
+ <para>Use the Add Device left navigation menu to add new devices into
+ Zenoss. For more information about adding devices see the "Adding
+ Devices" section in this guide.</para>
- <para>Settings - Settings, commands users ZenPacks Menus Daemons
- Versions</para>
+ <para></para>
+ </section>
- <para>Event Manager - EDIT connection information, cache, maintenance,
- FIELDS - connection information, history fields, COMMANDS - commands
- triggered by events</para>
+ <section>
+ <title>Adding and Managing MIBS</title>
+
+ <para>You can use the Mibs link in the left navigation menu to add and
+ manage MIBs in Zenoss. The preferred method of MIB loading is still to
+ do it from the command line using zenmib (as decribed in the section
+ called "Loading and Registering MIBs with Zenoss". This tab is
+ especially useful for checking MIBs you have loaded through the command
+ line. You can, however use the Mibs link to create and build your own
+ Mibs. To add a MIB, select the Mibs link and from the table menu and
+ select Add Mib. You can add all of the </para>
+
+ <para></para>
+
+ <para>You can also use this table menu to delete MIBS and move them into
+ different sub folders.</para>
</section>
+
+ <section>
+ <title>Adding Additional Collectors and Scaling Zenoss</title>
+
+ <para>You can add additional collectors to Zenoss to allow for better
+ performance and scaling when the device count gets too large for one
+ collector. This number is somewhere between 1000 and 1200 devices. When
+ a Zenoss collector is collecting data from more than that number of
+ devices, it becomes harder for the collector to complete the collection
+ cycle in the given cycle interval time. The default collector is
+ localhost, but you can add another instance of Zenoss on another server
+ to act as a collector. In prior versions of Zenoss, these collectors
+ were known as Performance Monitors and Status Monitors. </para>
+
+ <figure>
+ <title>Collectors Tab</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Graphics/screens/collectors-main.png"
+ scale="65"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para></para>
+
+ <para>If you click the name of a collector you will see all of the
+ attributes of a given collector. You can also see all of the devices
+ that this </para>
+
+ <para><figure>
+ <title>Individual collector attributes</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Graphics/screens/collectors-indcollector.png"
+ scale="65"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure></para>
+
+ <para>If you click the Edit tab you can change any of the following
+ settings to better optimize this collectors performance against the
+ devices you want it to poll. </para>
+
+ <figure>
+ <title>Individual Collector Edit tab</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="Graphics/screens/ind-collectoredit.png"
+ scale="65"></imagedata>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <itemizedlist>
+ <listitem>
+ <para>Event Log Cycle Interval (secs) - The Event Log Cycle interval
+ tells the controller The default is 60 secs.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>SNMP Performance Cycle Interval (secs) - The SNMP Performance
+ Cycle Interval tells the controller at what interval to run the SNMP
+ performance cycle to get performance data from the devices. The
+ default is 300 seconds.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Process Cycle Interval (secs) - This setting sets the number
+ of seconds to wait before polling the devices for process status
+ information. The default is 180 seconds.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Process Parallel Jobs - This setting limits the number of
+ parallel jobs this collector is allowed to perform for Zenoss at any
+ given time. The default is 10 jobs.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Status Cycle Interval (secs) - This setting sets the number of
+ seconds to wait between polling the devices for this collector for
+ their status. The default is 60 seconds.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Windows Service Cycle Interval (secs) - This setting controls
+ the interval at which the collector polls Windows devices for
+ Service status data. The default is 60 seconds.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Windows Modeler Cycle Interval (secs) - This setting sets the
+ number of seconds to wait in between polling Windows devices to
+ model them. The default is a 60 second interval.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Config Cycle Interval (mins) - This setting sets the interval
+ for getting and sending configuration data for the collector and
+ associated devices. The default is 360 minutes.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Ping Time Out (secs) - This setting sets the time after which
+ an unreturned ping packet will generate another ping try up to the
+ number set in the Ping Tries setting. The default is 1.5
+ seconds.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Ping Tries - This setting sets a number of times to attempt to
+ get a ping packet returned from the collector. The default number of
+ tries is 2.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Maximum Ping Packets in Flight - This setting sets the maximum
+ number of ping packets allowed to be either coming or going from the
+ collector as generated by this central instance of Zenoss. The
+ default number of packets allowed is set to 75.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Ping Cycle Time (secs) - The number of seconds to wait before
+ sending another ping packet to a device. The default is 60
+ seconds.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Maximum Ping Failures - The default maximum ping failures is
+ 1440</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Modeler Cycle Interval (mins) - This is the default interval
+ for modeler to model the devices the collector is responsible for.
+ The default is 720 mins.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Default Discovery Networks - This where to put the networks
+ you want this collector to discover by default. For example using
+ the 10.1.2.0/24 namespace will give you that namespace as a basis
+ for the other devices.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Render URL - The render URL is the URL to provide the
+ performance data to the viewing instance of Zenoss. </para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>RenderServer - The render server is the location of the server
+ on the collector where the performance and status information is
+ served from.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>Render User - If the render server specified above requires a
+ user, you would see/enter the render server user name here. The
+ default is blank.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para></para>
+ </section>
+
+ <section>
+ <title>Editing Other Zenoss Settings</title>
+
+ <para>The following settings can be changed in this tab.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Dashboard Production State Threshold - This setting defines
+ the production state of devices that are allowed to appear on the
+ dashboard. The number here correlates with the State conversion
+ setting below. Any device having a threshold below this threshold
+ will not appear on the dashboard regardless of the event
+ severity.</para>
+ </listitem>
+
+ <listitem>
+ <para>Dashboard Priority Threshold - Use this threshold to define
+ what severity of events are allowed to appear on the dashboard. This
+ threshold correlates with the Priority conversions defined below.
+ Any event having a dashboard priority that falls below this
+ threshold will not appear on the dashboard.</para>
+ </listitem>
+
+ <listitem>
+ <para>State Conversions - These settings associate a numerical value
+ to each of the defined production states. It is not important what
+ the numbers are as much as the relationship between the numbers. It
+ is also used in the Dashboard Production state threshold
+ above.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Production:1000</para>
+ </listitem>
+
+ <listitem>
+ <para>Pre-Production:500</para>
+ </listitem>
+
+ <listitem>
+ <para>Test:400</para>
+ </listitem>
+
+ <listitem>
+ <para>Maintenance:300</para>
+ </listitem>
+
+ <listitem>
+ <para>Decommissioned:-1</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>Priority Conversions - These settings associate a numerical
+ value to each of the defined event priorities. It is not important
+ what the numbers are as much as the relationship between the
+ numbers. It is also used in the Dashboard Priority threshold
+ above.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Highest:5 </para>
+ </listitem>
+
+ <listitem>
+ <para>High:4</para>
+ </listitem>
+
+ <listitem>
+ <para>Normal:3</para>
+ </listitem>
+
+ <listitem>
+ <para>Low:2</para>
+ </listitem>
+
+ <listitem>
+ <para>Lowest:1</para>
+ </listitem>
+
+ <listitem>
+ <para>Trivial:0</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>Administrative Roles - Use the Administrative Roles file to
+ define and name administrative roles to be associated with groups of
+ users, they currently do not have differences in permission levels,
+ but are good for grouping users by job function. A decent organizer
+ tool, but it will not differentiate access levels.</para>
+
+ <para></para>
+ </listitem>
+
+ <listitem>
+ <para>For more information about the email and paging settings found
+ on this tab, see the "Setting SMTP and SNPP Information" section in
+ this guide.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para> </para>
+ </section>
</section>
- <section><info><title>Hiding the Left Navigation Menu</title></info>
-
+ <section>
+ <info>
+ <title>Hiding the Left Navigation Menu</title>
+ </info>
<para>You can use the triangle above the left navigation menu to hide the
menu, and then you can use the pin icon to “pin” the menu into place and
Modified: trunk/zendocs/AdminGuide/docbook/ProcessMonitoring.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/ProcessMonitoring.xml 2008-05-13 18:35:31 UTC (rev 9215)
+++ trunk/zendocs/AdminGuide/docbook/ProcessMonitoring.xml 2008-05-13 18:40:07 UTC (rev 9216)
@@ -1,5 +1,14 @@
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="ProcessMonitoring"><info><title>Monitoring Processes</title></info>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="ProcessMonitoring"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1999/xhtml"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title>Monitoring Processes</title>
+ </info>
<para>Zenoss is able to monitor any processes running on your network. You
can configure Zenoss to monitor process as they occur throughout your
@@ -8,12 +17,15 @@
<para>Zenoss process monitoring works according to how it appears in the
following diagram:</para>
- <figure><info><title>Process Monitoring</title></info>
-
+ <figure>
+ <info>
+ <title>Process Monitoring</title>
+ </info>
<mediaobject>
<imageobject>
- <imagedata fileref="Graphics/diagrams/processmonitoring.png" scale="75"/>
+ <imagedata fileref="Graphics/diagrams/processmonitoring.png"
+ scale="75"></imagedata>
</imageobject>
</mediaobject>
</figure>
@@ -22,25 +34,30 @@
PIDS matching the expression to see that these process are running on the
selected device.</para>
- <para/>
+ <para></para>
- <section><info><title>Adding Processes to Monitor</title></info>
-
+ <section>
+ <info>
+ <title>Adding Processes to Monitor</title>
+ </info>
<para>To add a process to monitor:</para>
- <orderedlist inheritnum="ignore" continuation="restarts">
+ <orderedlist continuation="restarts" inheritnum="ignore">
<listitem>
<para>From the left navigation menu, select Processes.</para>
<para>The Processes page appears.</para>
- <figure><info><title>Processes Page</title></info>
-
+ <figure>
+ <info>
+ <title>Processes Page</title>
+ </info>
<mediaobject>
<imageobject>
- <imagedata fileref="Graphics/screens/processclasstab.png" scale="70"/>
+ <imagedata fileref="Graphics/screens/processclasstab.png"
+ scale="70"></imagedata>
</imageobject>
</mediaobject>
</figure>
@@ -51,12 +68,15 @@
<para>The Add OS Process Dialog Appears.</para>
- <figure><info><title>Add OS Process Dialog</title></info>
-
+ <figure>
+ <info>
+ <title>Add OS Process Dialog</title>
+ </info>
<mediaobject>
<imageobject>
- <imagedata fileref="Graphics/screens/addOSprocess.png" scale="75"/>
+ <imagedata fileref="Graphics/screens/addOSprocess.png"
+ scale="75"></imagedata>
</imageobject>
</mediaobject>
</figure>
@@ -81,15 +101,17 @@
well as the count of total processes running. However, if the process
has only a single instance, CPU utilization and memory usage are
graphed for the single process. To perform process monitoring the
- device SNMP agent must have a reasonable HOST-RESOURCES mib.</para>
+ device SNMP agent must have a reasonable HOST-RESOURCES MIB.</para>
- <para/>
+ <para></para>
</listitem>
</orderedlist>
</section>
- <section><info><title>Configuring Process zProperties</title></info>
-
+ <section>
+ <info>
+ <title>Configuring Process zProperties</title>
+ </info>
<para>You can configure zProperties either for all processes for an
individual process or for any processes that fall further down in the
@@ -99,12 +121,14 @@
Overview and then click the zProperties tab for that process. The Process
zProperties Tab appears.</para>
- <figure><info><title>Processes zProperties tab</title></info>
-
+ <figure>
+ <info>
+ <title>Processes zProperties tab</title>
+ </info>
<mediaobject>
<imageobject>
- <imagedata fileref="Graphics/screens/processeszprop.png" scale="70"/>
+ <imagedata fileref="Graphics/screens/processeszprop.png" scale="70"></imagedata>
</imageobject>
</mediaobject>
</figure>
Modified: trunk/zendocs/AdminGuide/docbook/RegisterMIB.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/RegisterMIB.xml 2008-05-13 18:35:31 UTC (rev 9215)
+++ trunk/zendocs/AdminGuide/docbook/RegisterMIB.xml 2008-05-13 18:40:07 UTC (rev 9216)
@@ -1,14 +1,28 @@
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="RegisterMIB"><info><title>Registering MIBs with Zenoss</title></info>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<section version="5.0" xml:id="RegisterMIB"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns52="http://www.w3.org/1999/xhtml"
+ xmlns:ns5="http://www.w3.org/1999/xlink"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns="http://docbook.org/ns/docbook">
+ <info>
+ <title>Loading and Registering MIBs with Zenoss</title>
+ </info>
<para>The MIB loader is called zenmib. To load MIBs, first copy them to
$ZENHOME/share/mibs/site. Then run zenmib using the command:</para>
<programlisting>zenmib run mibfile</programlisting>
- <section><info><title>Resolving MIB Dependencies</title></info>
-
+ <para>The MIB is now loaaded into Zenoss. You can see the MIBs you have
+ loaded by using the left navigation menu and clicking the Mibs link.</para>
+ <section>
+ <info>
+ <title>Resolving MIB Dependencies</title>
+ </info>
+
<para>You loaded aaa.mib, and when you attempt to load bbb.mib, you get
this error:</para>
Modified: trunk/zendocs/AdminGuide/docbook/SMTPSettings.xml
===================================================================
--- trunk/zendocs/AdminGuide/docbook/SMTPSettings.xml 2008-05-13 18:35:31 UTC (rev 9215)
+++ trunk/zendocs/AdminGuide/docbook/SMTPSettings.xml 2008-05-13 18:40:07 UTC (rev 9216)
@@ -91,7 +91,8 @@
<row>
<entry>Use TLS?</entry>
- <entry></entry>
+ <entry>Check this box if you use transport layer security for
+ your email alerts. </entry>
</row>
</tbody>
</tgroup>
@@ -111,7 +112,7 @@
uses ZENHOME to send the page from the localhost, but you can use any
page command customizations you want. In this case $RECIPIENT is
actually the paging address for the user as set in the setting for each
- user. </para>
+ user.</para>
<para></para>
</listitem>
|
|
From: <sv...@ze...> - 2008-05-13 18:35:32
|
Author: abray Date: 2008-05-13 14:35:31 -0400 (Tue, 13 May 2008) New Revision: 9215 Added: trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertscheduledetail.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/collectors-indcollector.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/collectors-main.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-admintab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-collectoredit.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-historytab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/processseqtab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/settings-main.png Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/DeviceClassTemp.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/DeviceClasstab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/DeviceClasszProp.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/EventManger-edit.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/GraphReportEditPage.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/GraphReportElement.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/GraphReportGraphs.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportCollection.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportEditPage.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportGraphDef.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportGraphGroup.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportGraphs.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReports.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/Usertabshowinggroups.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/aboutpage.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/add-devicebig.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/adminobjectadded.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/adminsteredobject.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/aggregaterport.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/alert-scheduletab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertdetails.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertingrulestab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertmessagetab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertscheduledetail.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/commandoutput.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/commnadstab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/customeventview.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/daemonstab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/dashboard20.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/datapoints.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/datasource.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/definecommanddialog.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/devgroupzproptab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/device-statustab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/devicelist.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/editeventcommand.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/editeventviewtab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/editmapping.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/edittab-long.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/eventconsole.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/eventconsolebydevice.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/eventdetailsfieldstab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/graphconfig.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/graphtab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-HWtab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-OStab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-SWtab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-admintab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-collectorplgtab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-customtab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-edittab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-eventtab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-historytab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-modtab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-perftab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-statustab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-statustab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-templatestab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-zpropertiestab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/individualmapping.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/individualserviceedittab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/individualservicetab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/indservicezproptab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/induseradmin.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/induserdetails.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/loadaveragetemplate.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/maindevicepage.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/maintwindowdefine.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/mappingstab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/mappingzproperties.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/more-admintab.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/networksoverview.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/ostab-process.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/perfgraphs.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/perftab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/perftab2.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/perftemplate tab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/perftemplate-local.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/preferences-edittab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/processclasstab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/processeszprop.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/reportslist.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/serviceclassestab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/servicesummary.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/settings-main.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/settings-menus.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/settingssettingstab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/settingtabforsnmp.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/systems-statustab.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/thresholddefinition.png trunk/zendocs/AdminGuide/docbook/Graphics/screens/usersetting-dashboardprior.jpg trunk/zendocs/AdminGuide/docbook/Graphics/screens/zeneventmanager.png Log: Drew checking in new screens featuring the word Collectors instead of Monitors Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/DeviceClassTemp.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/DeviceClasstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/DeviceClasszProp.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/EventManger-edit.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/GraphReportEditPage.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/GraphReportElement.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/GraphReportGraphs.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportCollection.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportEditPage.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportGraphDef.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportGraphGroup.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReportGraphs.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/MultiGraphReports.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/Usertabshowinggroups.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/aboutpage.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/add-devicebig.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/adminobjectadded.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/adminsteredobject.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/aggregaterport.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/alert-scheduletab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertdetails.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertingrulestab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertmessagetab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertscheduledetail.jpg =================================================================== (Binary files differ) Added: trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertscheduledetail.png Property changes on: trunk/zendocs/AdminGuide/docbook/Graphics/screens/alertscheduledetail.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/AdminGuide/docbook/Graphics/screens/collectors-indcollector.png Property changes on: trunk/zendocs/AdminGuide/docbook/Graphics/screens/collectors-indcollector.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/AdminGuide/docbook/Graphics/screens/collectors-main.png Property changes on: trunk/zendocs/AdminGuide/docbook/Graphics/screens/collectors-main.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/commandoutput.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/commnadstab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/customeventview.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/daemonstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/dashboard20.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/datapoints.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/datasource.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/definecommanddialog.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/devgroupzproptab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/device-statustab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/devicelist.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/editeventcommand.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/editeventviewtab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/editmapping.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/edittab-long.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/eventconsole.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/eventconsolebydevice.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/eventdetailsfieldstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/graphconfig.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/graphtab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-HWtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-OStab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-SWtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-admintab.jpg =================================================================== (Binary files differ) Added: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-admintab.png Property changes on: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-admintab.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-collectoredit.png Property changes on: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-collectoredit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-collectorplgtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-customtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-edittab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-eventtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-historytab.jpg =================================================================== (Binary files differ) Added: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-historytab.png Property changes on: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-historytab.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-modtab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-perftab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-statustab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-statustab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-templatestab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ind-zpropertiestab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/individualmapping.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/individualserviceedittab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/individualservicetab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/indservicezproptab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/induseradmin.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/induserdetails.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/loadaveragetemplate.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/maindevicepage.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/maintwindowdefine.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/mappingstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/mappingzproperties.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/more-admintab.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/networksoverview.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/ostab-process.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/perfgraphs.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/perftab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/perftab2.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/perftemplate tab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/perftemplate-local.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/preferences-edittab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/processclasstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/processeszprop.png =================================================================== (Binary files differ) Added: trunk/zendocs/AdminGuide/docbook/Graphics/screens/processseqtab.png Property changes on: trunk/zendocs/AdminGuide/docbook/Graphics/screens/processseqtab.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/reportslist.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/serviceclassestab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/servicesummary.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/settings-main.jpg =================================================================== (Binary files differ) Added: trunk/zendocs/AdminGuide/docbook/Graphics/screens/settings-main.png Property changes on: trunk/zendocs/AdminGuide/docbook/Graphics/screens/settings-main.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/settings-menus.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/settingssettingstab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/settingtabforsnmp.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/systems-statustab.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/thresholddefinition.png =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/usersetting-dashboardprior.jpg =================================================================== (Binary files differ) Modified: trunk/zendocs/AdminGuide/docbook/Graphics/screens/zeneventmanager.png =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2008-05-13 17:53:40
|
Author: ecn Date: 2008-05-13 13:53:48 -0400 (Tue, 13 May 2008) New Revision: 9214 Added: trunk/inst/externallibs/pyip-0.7.all.patch03 Log: fixes #3137: ping fails with negative id value Added: trunk/inst/externallibs/pyip-0.7.all.patch03 |
|
From: <sv...@ze...> - 2008-05-13 14:00:07
|
Author: jstevens Date: 2008-05-13 10:00:15 -0400 (Tue, 13 May 2008) New Revision: 9213 Modified: trunk/Products/ZenUtils/CmdBase.py Log: fixes #3146 * reviewed by Chad Modified: trunk/Products/ZenUtils/CmdBase.py =================================================================== --- trunk/Products/ZenUtils/CmdBase.py 2008-05-12 19:36:01 UTC (rev 9212) +++ trunk/Products/ZenUtils/CmdBase.py 2008-05-13 14:00:15 UTC (rev 9213) @@ -26,6 +26,11 @@ import logging from optparse import OptionParser, SUPPRESS_HELP, NO_DEFAULT +# There is a nasty incompatability between pkg_resources and twisted. +# This pkg_resources import works around the problem. +# See http://dev.zenoss.org/trac/ticket/3146 for details +import pkg_resources + from Products.ZenUtils.Utils import unused def parseconfig(options): |
