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-06 17:42:07
|
Author: ian
Date: 2008-05-06 12:39:14 -0400 (Tue, 06 May 2008)
New Revision: 9186
Modified:
trunk/inst/docs/INSTALL_DEB_STACK.txt
trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt
Log:
* Merged basic zenoss user instructions into the other stack howtos
Modified: trunk/inst/docs/INSTALL_DEB_STACK.txt
===================================================================
--- trunk/inst/docs/INSTALL_DEB_STACK.txt 2008-05-06 15:26:45 UTC (rev 9185)
+++ trunk/inst/docs/INSTALL_DEB_STACK.txt 2008-05-06 16:39:14 UTC (rev 9186)
@@ -20,3 +20,22 @@
$ /etc/init.d/zenoss-stack start
+3. The package will create a zenoss user with a home directory at /home/zenoss.
+ In order to run commands that are specified in the Zenoss admin guide,
+ you must become the zenoss user. If you know your root password,
+ use the su command to become root, then to become zenoss:
+
+ $ su - root
+ # su - zenoss
+
+ If you don't know your root password, use the sudo command:
+
+ $ sudo su - zenoss
+
+ If you would prefer not to become the zenoss user, you can also run:
+
+ $ /usr/local/zenoss/zenconsole
+
+ To enter a shell with the Zenoss environment. You can then start/stop
+ daemons, enter zendmd, and perform other command line tasks.
+
Modified: trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt
===================================================================
--- trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt 2008-05-06 15:26:45 UTC (rev 9185)
+++ trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt 2008-05-06 16:39:14 UTC (rev 9186)
@@ -1,8 +1,7 @@
Installation via the zenoss-stack binary installer
==================================================
-1. Download the latest version of the package from
- http://www.zenoss.com/download.
+1. Download the latest version of the package from SourceForge.
2. Bring up a command-line prompt and cd into the download directory:
@@ -21,4 +20,25 @@
$ sudo ./zenoss*.bin
-5. Answer the installation prompts.
+5. Answer the installation prompts. The package will be installed in
+ /usr/local/zenoss.
+
+6. The package will create a zenoss user with a home directory in /home/zenoss.
+ In order to run commands that are specified in the Zenoss admin guide,
+ you must become the zenoss user. If you know your root password,
+ use the su command to become root, then to become zenoss:
+
+ $ su - root
+ # su - zenoss
+
+ If you don't know your root password, use the sudo command:
+
+ $ sudo su - zenoss
+
+ If you would prefer not to become the zenoss user, you can also run:
+
+ $ /usr/local/zenoss/zenconsole
+
+ To enter a shell with the Zenoss environment. You can then start/stop
+ daemons, enter zendmd, and perform other command line tasks.
+
|
|
From: <sv...@ze...> - 2008-05-06 17:05:51
|
Author: ecn Date: 2008-05-06 13:05:22 -0400 (Tue, 06 May 2008) New Revision: 9187 Added: trunk/inst/docs/INSTALL_ONECLICK_GNOME.txt trunk/inst/docs/INSTALL_ONECLICK_KDE.txt Log: graphical installation instructions Added: trunk/inst/docs/INSTALL_ONECLICK_GNOME.txt Added: trunk/inst/docs/INSTALL_ONECLICK_KDE.txt |
|
From: <sv...@ze...> - 2008-05-06 15:41:46
|
Author: ecn Date: 2008-05-06 11:26:45 -0400 (Tue, 06 May 2008) New Revision: 9185 Added: trunk/inst/docs/INSTALL_ONECLICK_PROMPTS.doc Log: add click-on-me instructions Added: trunk/inst/docs/INSTALL_ONECLICK_PROMPTS.doc Property changes on: trunk/inst/docs/INSTALL_ONECLICK_PROMPTS.doc ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ze...> - 2008-05-06 15:30:10
|
Author: ecn Date: 2008-05-06 11:24:14 -0400 (Tue, 06 May 2008) New Revision: 9184 Added: trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt Removed: trunk/inst/docs/INSTALL_ONECLICK.txt Log: rename instructions Deleted: trunk/inst/docs/INSTALL_ONECLICK.txt Copied: trunk/inst/docs/INSTALL_ONECLICK_COMMANDLINE.txt (from rev 9183, trunk/inst/docs/INSTALL_ONECLICK.txt) |
|
From: <sv...@ze...> - 2008-05-06 15:24:04
|
Author: ecn Date: 2008-05-06 11:23:43 -0400 (Tue, 06 May 2008) New Revision: 9183 Modified: trunk/inst/docs/INSTALL_ONECLICK.txt Log: command-line instructions Modified: trunk/inst/docs/INSTALL_ONECLICK.txt =================================================================== --- trunk/inst/docs/INSTALL_ONECLICK.txt 2008-05-06 15:03:24 UTC (rev 9182) +++ trunk/inst/docs/INSTALL_ONECLICK.txt 2008-05-06 15:23:43 UTC (rev 9183) @@ -2,8 +2,23 @@ ================================================== 1. Download the latest version of the package from - http://dev.zenoss.org/downloads. Execute the file - to begin installation: - - $ ./zenoss-stack-2.2.0-0.bin + http://www.zenoss.com/download. +2. Bring up a command-line prompt and cd into the download directory: + + $ cd Desktop/Downloads # <- use your download directory + +3. Make the installer exectuable: + + $ chmod +x ./zenoss*.bin + +4. Execute the installer as root. If you know your root password, + use the su command: + + $ su root -c ./zenoss*.bin + + If you don't know your root password, use the sudo command: + + $ sudo ./zenoss*.bin + +5. Answer the installation prompts. |
|
From: <sv...@ze...> - 2008-05-06 15:10:58
|
Author: ian
Date: 2008-05-06 11:03:24 -0400 (Tue, 06 May 2008)
New Revision: 9182
Modified:
trunk/inst/docs/INSTALL_RPM_STACK.txt
Log:
* Wrote bitrock docs about running things as zenoss user
Modified: trunk/inst/docs/INSTALL_RPM_STACK.txt
===================================================================
--- trunk/inst/docs/INSTALL_RPM_STACK.txt 2008-05-06 13:31:23 UTC (rev 9181)
+++ trunk/inst/docs/INSTALL_RPM_STACK.txt 2008-05-06 15:03:24 UTC (rev 9182)
@@ -20,5 +20,31 @@
2. Zenoss will be installed in /usr/local/zenoss. Start it using:
$ service zenoss-stack start
+
+ You can stop the service with:
+ $ service zenoss-stack stop
+ Check the status of Zenoss processes with:
+
+ $ service zenoss-stack status
+
+3. The package will create a zenoss user with a home directory at /home/zenoss.
+ In order to run commands that are specified in the Zenoss admin guide,
+ you must become the zenoss user. If you know your root password,
+ use the su command to become root, then to become zenoss:
+
+ $ su - root
+ # su - zenoss
+
+ If you don't know your root password, use the sudo command:
+
+ $ sudo su - zenoss
+
+ If you would prefer not to become the zenoss user, you can also run:
+
+ $ /usr/local/zenoss/zenconsole
+
+ To enter a shell with the Zenoss environment. You can then start/stop
+ daemons, enter zendmd, and perform other command line tasks.
+
|
|
From: <sv...@ze...> - 2008-05-06 13:31:20
|
Author: ian Date: 2008-05-06 09:31:23 -0400 (Tue, 06 May 2008) New Revision: 9181 Added: trunk/inst/docs/INSTALL_DEB_STACK.txt trunk/inst/docs/INSTALL_ONECLICK.txt trunk/inst/docs/INSTALL_RPM_STACK.txt Log: * Added stack install instructions Added: trunk/inst/docs/INSTALL_DEB_STACK.txt Added: trunk/inst/docs/INSTALL_ONECLICK.txt Added: trunk/inst/docs/INSTALL_RPM_STACK.txt |
|
From: <sv...@ze...> - 2008-05-06 12:48:26
|
Author: ecn
Date: 2008-05-06 08:48:26 -0400 (Tue, 06 May 2008)
New Revision: 9180
Modified:
branches/zenoss-2.2.x/Products/DataCollector/WmiClient.py
branches/zenoss-2.2.x/Products/DataCollector/zendisc.py
Log:
backpatching fixes to #3109 and #3110
Modified: branches/zenoss-2.2.x/Products/DataCollector/WmiClient.py
===================================================================
--- branches/zenoss-2.2.x/Products/DataCollector/WmiClient.py 2008-05-06 12:45:27 UTC (rev 9179)
+++ branches/zenoss-2.2.x/Products/DataCollector/WmiClient.py 2008-05-06 12:48:26 UTC (rev 9180)
@@ -38,7 +38,7 @@
if not self.process:
return
try:
- self.process.signalProcess(signal.SIGSTOP)
+ self.process.signalProcess(signal.SIGKILL)
except error.ProcessExitedAlready:
pass
try:
Modified: branches/zenoss-2.2.x/Products/DataCollector/zendisc.py
===================================================================
--- branches/zenoss-2.2.x/Products/DataCollector/zendisc.py 2008-05-06 12:45:27 UTC (rev 9179)
+++ branches/zenoss-2.2.x/Products/DataCollector/zendisc.py 2008-05-06 12:48:26 UTC (rev 9180)
@@ -271,6 +271,10 @@
def collectNet(self, driver):
+ import types
+ # net option from the config file is a string
+ if type(self.options.net) in types.StringTypes:
+ self.options.net = [self.options.net]
# in case someone uses 10.0.0.0,192.168.0.1 instead of
# --net 10.0.0.0 --net 192.168.0.1
if isinstance(self.options.net, list) and \
|
|
From: <sv...@ze...> - 2008-05-06 12:45:23
|
Author: ecn
Date: 2008-05-06 08:45:27 -0400 (Tue, 06 May 2008)
New Revision: 9179
Modified:
trunk/Products/DataCollector/zendisc.py
Log:
* EAD's code review changes
Modified: trunk/Products/DataCollector/zendisc.py
===================================================================
--- trunk/Products/DataCollector/zendisc.py 2008-05-06 12:34:22 UTC (rev 9178)
+++ trunk/Products/DataCollector/zendisc.py 2008-05-06 12:45:27 UTC (rev 9179)
@@ -271,8 +271,9 @@
def collectNet(self, driver):
+ import types
# net option from the config file is a string
- if isinstance(self.options.net, (str, unicode)):
+ if type(self.options.net) in types.StringTypes:
self.options.net = [self.options.net]
# in case someone uses 10.0.0.0,192.168.0.1 instead of
# --net 10.0.0.0 --net 192.168.0.1
|
|
From: <sv...@ze...> - 2008-05-06 12:34:19
|
Author: ecn
Date: 2008-05-06 08:34:22 -0400 (Tue, 06 May 2008)
New Revision: 9178
Modified:
trunk/Products/DataCollector/WmiClient.py
Log:
* fixes #3109: too many zenwinmodelers
- for some reason I though SIGSTOP was SIGINT
- i'm going to go straight to SIGKILL
Modified: trunk/Products/DataCollector/WmiClient.py
===================================================================
--- trunk/Products/DataCollector/WmiClient.py 2008-05-06 12:26:51 UTC (rev 9177)
+++ trunk/Products/DataCollector/WmiClient.py 2008-05-06 12:34:22 UTC (rev 9178)
@@ -38,7 +38,7 @@
if not self.process:
return
try:
- self.process.signalProcess(signal.SIGSTOP)
+ self.process.signalProcess(signal.SIGKILL)
except error.ProcessExitedAlready:
pass
try:
|
|
From: <sv...@ze...> - 2008-05-06 12:26:50
|
Author: ecn
Date: 2008-05-06 08:26:51 -0400 (Tue, 06 May 2008)
New Revision: 9177
Modified:
trunk/Products/DataCollector/zendisc.py
Log:
* fixes 3110: zendisc net option in config file does not scan network
Modified: trunk/Products/DataCollector/zendisc.py
===================================================================
--- trunk/Products/DataCollector/zendisc.py 2008-05-05 22:00:30 UTC (rev 9176)
+++ trunk/Products/DataCollector/zendisc.py 2008-05-06 12:26:51 UTC (rev 9177)
@@ -271,6 +271,9 @@
def collectNet(self, driver):
+ # net option from the config file is a string
+ if isinstance(self.options.net, (str, unicode)):
+ self.options.net = [self.options.net]
# in case someone uses 10.0.0.0,192.168.0.1 instead of
# --net 10.0.0.0 --net 192.168.0.1
if isinstance(self.options.net, list) and \
|
|
From: <sv...@ze...> - 2008-05-05 22:00:22
|
Author: chris Date: 2008-05-05 18:00:30 -0400 (Mon, 05 May 2008) New Revision: 9176 Added: tags/zenoss-2.1.92/ Log: * tagged Copied: tags/zenoss-2.1.92 (from rev 9175, branches/zenoss-2.2.x) |
|
From: <sv...@ze...> - 2008-05-05 21:59:17
|
Author: ian
Date: 2008-05-05 17:59:22 -0400 (Mon, 05 May 2008)
New Revision: 9175
Modified:
branches/zenoss-2.2.x/Products/ZenEvents/Schedule.py
Log:
* Refs #3105, refs #3108: Backported changes into branch
Modified: branches/zenoss-2.2.x/Products/ZenEvents/Schedule.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenEvents/Schedule.py 2008-05-05 21:52:13 UTC (rev 9174)
+++ branches/zenoss-2.2.x/Products/ZenEvents/Schedule.py 2008-05-05 21:59:22 UTC (rev 9175)
@@ -57,8 +57,17 @@
def getWindows(self):
result = []
catalog = getattr(self.dmd, 'maintenanceWindowSearch', None)
- if catalog:
- result.extend(x.getObject() for x in catalog())
+ if catalog is not None:
+ for brain in catalog():
+ try:
+ ob = brain.getObject()
+ except KeyError:
+ # We're just catching the symptom for now, but an actual
+ # fix will be forthcoming.
+ # http://dev.zenoss.org/trac/ticket/3105
+ pass
+ else:
+ result.append(ob)
else: # Should be removed in 2.3.
self.log.warn('Run zenmigrate to index your maintenance windows.')
for dev in self.dmd.Devices.getSubDevices():
|
|
From: <sv...@ze...> - 2008-05-05 21:52:06
|
Author: ian
Date: 2008-05-05 17:52:13 -0400 (Mon, 05 May 2008)
New Revision: 9174
Modified:
trunk/Products/ZenEvents/Schedule.py
Log:
* Refs #3108: Catch the symptom with the maintenanceWindowSearch thing.
Modified: trunk/Products/ZenEvents/Schedule.py
===================================================================
--- trunk/Products/ZenEvents/Schedule.py 2008-05-05 21:13:57 UTC (rev 9173)
+++ trunk/Products/ZenEvents/Schedule.py 2008-05-05 21:52:13 UTC (rev 9174)
@@ -58,7 +58,16 @@
result = []
catalog = getattr(self.dmd, 'maintenanceWindowSearch', None)
if catalog is not None:
- result.extend(x.getObject() for x in catalog())
+ for brain in catalog():
+ try:
+ ob = brain.getObject()
+ except KeyError:
+ # We're just catching the symptom for now, but an actual
+ # fix will be forthcoming.
+ # http://dev.zenoss.org/trac/ticket/3105
+ pass
+ else:
+ result.append(ob)
else: # Should be removed in 2.3.
self.log.warn('Run zenmigrate to index your maintenance windows.')
for dev in self.dmd.Devices.getSubDevices():
|
|
From: <sv...@ze...> - 2008-05-05 21:13:49
|
Author: ian
Date: 2008-05-05 17:13:57 -0400 (Mon, 05 May 2008)
New Revision: 9173
Modified:
trunk/Products/ZenEvents/Schedule.py
Log:
* Fixes #3108: Empty catalog won't log message
Modified: trunk/Products/ZenEvents/Schedule.py
===================================================================
--- trunk/Products/ZenEvents/Schedule.py 2008-05-05 20:13:15 UTC (rev 9172)
+++ trunk/Products/ZenEvents/Schedule.py 2008-05-05 21:13:57 UTC (rev 9173)
@@ -57,7 +57,7 @@
def getWindows(self):
result = []
catalog = getattr(self.dmd, 'maintenanceWindowSearch', None)
- if catalog:
+ if catalog is not None:
result.extend(x.getObject() for x in catalog())
else: # Should be removed in 2.3.
self.log.warn('Run zenmigrate to index your maintenance windows.')
|
|
From: <sv...@ze...> - 2008-05-05 20:13:07
|
Author: mray
Date: 2008-05-05 16:13:15 -0400 (Mon, 05 May 2008)
New Revision: 9172
Added:
trunk/zenpacks/ZenPacks.zenoss.IRCDMonitor/ZenPacks/zenoss/IRCDMonitor/objects/objects.xml
Modified:
trunk/zenpacks/ZenPacks.zenoss.IRCDMonitor/ZenPacks/zenoss/IRCDMonitor/datasources/IRCDMonitorDataSource.py
Log:
* Fixes #2973 Added missing object.xml and updated event class
Modified: trunk/zenpacks/ZenPacks.zenoss.IRCDMonitor/ZenPacks/zenoss/IRCDMonitor/datasources/IRCDMonitorDataSource.py
===================================================================
--- trunk/zenpacks/ZenPacks.zenoss.IRCDMonitor/ZenPacks/zenoss/IRCDMonitor/datasources/IRCDMonitorDataSource.py 2008-05-05 16:08:48 UTC (rev 9171)
+++ trunk/zenpacks/ZenPacks.zenoss.IRCDMonitor/ZenPacks/zenoss/IRCDMonitor/datasources/IRCDMonitorDataSource.py 2008-05-05 20:13:15 UTC (rev 9172)
@@ -31,7 +31,7 @@
sourcetypes = (IRCD_MONITOR,)
sourcetype = IRCD_MONITOR
- eventClass = '/Cmd/Fail'
+ eventClass = '/Status/IRCD'
hostname = '${dev/id}'
port = 6667
Added: trunk/zenpacks/ZenPacks.zenoss.IRCDMonitor/ZenPacks/zenoss/IRCDMonitor/objects/objects.xml
|
|
From: <sv...@ze...> - 2008-05-05 16:09:04
|
Author: ecn
Date: 2008-05-05 12:08:48 -0400 (Mon, 05 May 2008)
New Revision: 9171
Modified:
branches/zenoss-2.2.x/Products/ZenRRD/zenperfsnmp.py
branches/zenoss-2.2.x/Products/ZenWin/zenwinmodeler.py
Log:
back-patching 9169 and 9170 from trunk
Modified: branches/zenoss-2.2.x/Products/ZenRRD/zenperfsnmp.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenRRD/zenperfsnmp.py 2008-05-05 15:52:26 UTC (rev 9170)
+++ branches/zenoss-2.2.x/Products/ZenRRD/zenperfsnmp.py 2008-05-05 16:08:48 UTC (rev 9171)
@@ -641,10 +641,10 @@
isinstance(update.value, error.TimeoutError):
self.log.debug("Device %s timed out" % deviceName)
else:
- self.log.error('Failed to collect on %s (%s: %s)',
- deviceName,
- update.__class__,
- update)
+ self.log.warning('Failed to collect on %s (%s: %s)',
+ deviceName,
+ update.__class__,
+ update)
successCount = sum(firsts(updates))
oids = []
Modified: branches/zenoss-2.2.x/Products/ZenWin/zenwinmodeler.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWin/zenwinmodeler.py 2008-05-05 15:52:26 UTC (rev 9170)
+++ branches/zenoss-2.2.x/Products/ZenWin/zenwinmodeler.py 2008-05-05 16:08:48 UTC (rev 9171)
@@ -125,6 +125,17 @@
self.log.warn("WMIClient creation failed")
return
except (SystemExit, KeyboardInterrupt): raise
+ except pywintypes.com_error, e:
+ code,txt,info,param = e
+ msg = self.printComErrorMessage(e)
+ if msg:
+ self.log.warning("WMI Com error: %s", msg)
+ if info:
+ wcode, source, descr, hfile, hcont, scode = info
+ if scode == 1326 and device.zWinPassword == '':
+ self.log.warning("You must set the zProperty "
+ "zWinPassword for device %s.", hostname)
+ return
except:
self.log.exception("Error opening WMIClient")
return
|
|
From: <sv...@ze...> - 2008-05-05 15:52:22
|
Author: ecn
Date: 2008-05-05 11:52:26 -0400 (Mon, 05 May 2008)
New Revision: 9170
Modified:
trunk/Products/ZenRRD/zenperfsnmp.py
Log:
* netsnmp Timeout causes some kind of snmp_send error: reduce the log level to warning
Modified: trunk/Products/ZenRRD/zenperfsnmp.py
===================================================================
--- trunk/Products/ZenRRD/zenperfsnmp.py 2008-05-05 14:23:11 UTC (rev 9169)
+++ trunk/Products/ZenRRD/zenperfsnmp.py 2008-05-05 15:52:26 UTC (rev 9170)
@@ -641,10 +641,10 @@
isinstance(update.value, error.TimeoutError):
self.log.debug("Device %s timed out" % deviceName)
else:
- self.log.error('Failed to collect on %s (%s: %s)',
- deviceName,
- update.__class__,
- update)
+ self.log.warning('Failed to collect on %s (%s: %s)',
+ deviceName,
+ update.__class__,
+ update)
successCount = sum(firsts(updates))
oids = []
|
|
From: <sv...@ze...> - 2008-05-05 14:23:26
|
Author: ecn
Date: 2008-05-05 10:23:11 -0400 (Mon, 05 May 2008)
New Revision: 9169
Modified:
trunk/Products/ZenWin/zenwinmodeler.py
Log:
* fixes 3099: try to point the user to the config to fix their windows login
Modified: trunk/Products/ZenWin/zenwinmodeler.py
===================================================================
--- trunk/Products/ZenWin/zenwinmodeler.py 2008-05-02 19:40:30 UTC (rev 9168)
+++ trunk/Products/ZenWin/zenwinmodeler.py 2008-05-05 14:23:11 UTC (rev 9169)
@@ -125,6 +125,17 @@
self.log.warn("WMIClient creation failed")
return
except (SystemExit, KeyboardInterrupt): raise
+ except pywintypes.com_error, e:
+ code,txt,info,param = e
+ msg = self.printComErrorMessage(e)
+ if msg:
+ self.log.warning("WMI Com error: %s", msg)
+ if info:
+ wcode, source, descr, hfile, hcont, scode = info
+ if scode == 1326 and device.zWinPassword == '':
+ self.log.warning("You must set the zProperty "
+ "zWinPassword for device %s.", hostname)
+ return
except:
self.log.exception("Error opening WMIClient")
return
|
|
From: <sv...@ze...> - 2008-05-02 19:40:23
|
Author: marc
Date: 2008-05-02 15:40:30 -0400 (Fri, 02 May 2008)
New Revision: 9168
Modified:
trunk/Products/ZenUITests/tests/selenium/TestDeviceInstance.py
Log:
Fixed TestDeviceInstance, locking test. fixes #3096
Modified: trunk/Products/ZenUITests/tests/selenium/TestDeviceInstance.py
===================================================================
--- trunk/Products/ZenUITests/tests/selenium/TestDeviceInstance.py 2008-05-02 18:43:45 UTC (rev 9167)
+++ trunk/Products/ZenUITests/tests/selenium/TestDeviceInstance.py 2008-05-02 19:40:30 UTC (rev 9168)
@@ -264,46 +264,37 @@
def testLockDevice(self):
"""Test locking a device against deletes and updates"""
-
+
# First, test lock against updates (and deletes).
curtarget = TARGET
+ self.waitForElement("link=Lock...")
self.selenium.click("link=Lock...")
self.waitForElement("dialog_cancel")
self.selenium.click("lockFromUpdates:method")
self.selenium.wait_for_page_to_load(self.WAITTIME)
- self.selenium.click("link=Device List")
- #self.selenium.wait_for_page_to_load(self.WAITTIME)
- self.waitForElement("name=evids:list " + curtarget)
- # Unlocking the device now
- self.goToDevice(curtarget)
self.assert_(self.selenium.is_element_present("//img[@src='locked-update-icon.png']"))
self.assert_(self.selenium.is_element_present("//img[@src='locked-delete-icon.png']"))
self.waitForElement("link=Lock...")
self.selenium.click("link=Lock...")
self.waitForElement("dialog_cancel")
self.selenium.click("unlock:method")
- self.selenium.click("link=Device List")
- self.waitForElement("name=evids:list " + curtarget)
+ self.selenium.wait_for_page_to_load(self.WAITTIME)
self.assert_(not self.selenium.is_element_present("//img[@src='locked-update-icon.png']"))
self.assert_(not self.selenium.is_element_present("//img[@src='locked-delete-icon.png']"))
-
+
# Then, test lock against deletes only.
- self.goToDevice(curtarget)
self.waitForElement("link=Lock...")
self.selenium.click("link=Lock...")
self.waitForElement("dialog_cancel")
self.selenium.click("lockFromDeletion:method")
- self.selenium.click("link=Device List")
- self.waitForElement("name=evids:list " + curtarget)
+ self.selenium.wait_for_page_to_load(self.WAITTIME)
self.assert_(self.selenium.is_element_present("//img[@src='locked-delete-icon.png']"))
# Unlocking the device now
- self.goToDevice(curtarget)
self.waitForElement("link=Lock...")
self.selenium.click("link=Lock...")
self.waitForElement("dialog_cancel")
self.selenium.click("unlock:method")
- self.selenium.click("link=Device List")
- self.waitForElement("name=evids:list " + curtarget)
+ self.selenium.wait_for_page_to_load(self.WAITTIME)
self.assert_(not self.selenium.is_element_present("//img[@src='locked-delete-icon.png']"))
def testClearHeartbeats(self):
|
|
From: <sv...@ze...> - 2008-05-02 18:43:42
|
Author: cgibbons
Date: 2008-05-02 14:43:45 -0400 (Fri, 02 May 2008)
New Revision: 9167
Modified:
branches/zenoss-2.2.x/Products/ZenHub/services/PingConfig.py
branches/zenoss-2.2.x/Products/ZenUtils/ZCmdBase.py
Log:
* refs #3078 : merging changes from mainline into 2.2.x branch
Modified: branches/zenoss-2.2.x/Products/ZenHub/services/PingConfig.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenHub/services/PingConfig.py 2008-05-02 17:49:32 UTC (rev 9166)
+++ branches/zenoss-2.2.x/Products/ZenHub/services/PingConfig.py 2008-05-02 18:43:45 UTC (rev 9167)
@@ -15,6 +15,7 @@
from Products.ZenHub.services.PerformanceConfig import PerformanceConfig
from Products.ZenHub.HubService import threaded
from Products.ZenHub.PBDaemon import translateError
+from Products.ZenUtils.ZCmdBase import login
class PingConfig(PerformanceConfig):
"Support zenping configuration loading"
@@ -25,6 +26,8 @@
conn = self.dmd._p_jar._db.open()
try:
dmd = conn.root()['Application'].zport.dmd
+ user = login(dmd, 'admin')
+ assert user.has_permission('View', dmd)
return self.getPingTree(dmd, root, fallbackIp)
finally:
import transaction
@@ -34,7 +37,7 @@
def getPingTree(self, dmd, root, fallbackIp):
me = dmd.Devices.findDevice(root)
if not me:
- me = self.lookupByIp(fallbackIp)
+ me = self.lookupByIp(dmd, fallbackIp)
if me:
self.log.info("building pingtree from %s", me.id)
tree = pingtree.buildTree(me)
@@ -45,15 +48,16 @@
tree = pingtree.PingTree(fallbackIp)
tree.root = pingtree.RouterNode(fallbackIp, root, 0)
tree.root.addNet(tree, "default", "default")
- devices = self.config.getPingDevices()
+ config = dmd.Monitors.Performance._getOb(self.instance)
+ devices = config.getPingDevices()
self.prepDevices(tree, devices)
return tree.root
- def lookupByIp(self, fallbackIp):
+ def lookupByIp(self, dmd, fallbackIp):
"""Try to find the root device by our IP
"""
- ip = self.dmd.Networks.findIp(fallbackIp)
+ ip = dmd.Networks.findIp(fallbackIp)
if ip and ip.device():
return ip.device()
Modified: branches/zenoss-2.2.x/Products/ZenUtils/ZCmdBase.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenUtils/ZCmdBase.py 2008-05-02 17:49:32 UTC (rev 9166)
+++ branches/zenoss-2.2.x/Products/ZenUtils/ZCmdBase.py 2008-05-02 18:43:45 UTC (rev 9167)
@@ -31,6 +31,17 @@
class DataRootError(Exception):pass
+def login(context, name='admin', userfolder=None):
+ '''Logs in.'''
+ if userfolder is None:
+ userfolder = context.getPhysicalRoot().acl_users
+ user = userfolder.getUserById(name)
+ if user is None: return
+ if not hasattr(user, 'aq_base'):
+ user = user.__of__(userfolder)
+ newSecurityManager(None, user)
+ return user
+
class ZCmdBase(ZenDaemon):
@@ -67,13 +78,7 @@
def login(self, name='admin', userfolder=None):
'''Logs in.'''
- if userfolder is None:
- userfolder = self.app.acl_users
- user = userfolder.getUserById(name)
- if user is None: return
- if not hasattr(user, 'aq_base'):
- user = user.__of__(userfolder)
- newSecurityManager(None, user)
+ login(self.dmd, name, userfolder)
def logout(self):
|
|
From: <sv...@ze...> - 2008-05-02 17:49:27
|
Author: cgibbons
Date: 2008-05-02 13:49:32 -0400 (Fri, 02 May 2008)
New Revision: 9166
Modified:
trunk/Products/ZenHub/services/PingConfig.py
Log:
* Fixes #3078
Modified: trunk/Products/ZenHub/services/PingConfig.py
===================================================================
--- trunk/Products/ZenHub/services/PingConfig.py 2008-05-02 15:57:50 UTC (rev 9165)
+++ trunk/Products/ZenHub/services/PingConfig.py 2008-05-02 17:49:32 UTC (rev 9166)
@@ -57,7 +57,7 @@
def lookupByIp(self, dmd, fallbackIp):
"""Try to find the root device by our IP
"""
- ip = self.dmd.Networks.findIp(fallbackIp)
+ ip = dmd.Networks.findIp(fallbackIp)
if ip and ip.device():
return ip.device()
|
|
From: <sv...@ze...> - 2008-05-02 16:06:19
|
Author: ecn
Date: 2008-05-02 11:57:50 -0400 (Fri, 02 May 2008)
New Revision: 9165
Modified:
trunk/Products/ZenHub/services/PingConfig.py
trunk/Products/ZenUtils/ZCmdBase.py
Log:
* get all our objects from the new connection
Modified: trunk/Products/ZenHub/services/PingConfig.py
===================================================================
--- trunk/Products/ZenHub/services/PingConfig.py 2008-05-02 14:07:25 UTC (rev 9164)
+++ trunk/Products/ZenHub/services/PingConfig.py 2008-05-02 15:57:50 UTC (rev 9165)
@@ -15,6 +15,7 @@
from Products.ZenHub.services.PerformanceConfig import PerformanceConfig
from Products.ZenHub.HubService import threaded
from Products.ZenHub.PBDaemon import translateError
+from Products.ZenUtils.ZCmdBase import login
class PingConfig(PerformanceConfig):
"Support zenping configuration loading"
@@ -25,6 +26,8 @@
conn = self.dmd._p_jar._db.open()
try:
dmd = conn.root()['Application'].zport.dmd
+ user = login(dmd, 'admin')
+ assert user.has_permission('View', dmd)
return self.getPingTree(dmd, root, fallbackIp)
finally:
import transaction
@@ -34,7 +37,7 @@
def getPingTree(self, dmd, root, fallbackIp):
me = dmd.Devices.findDevice(root)
if not me:
- me = self.lookupByIp(fallbackIp)
+ me = self.lookupByIp(dmd, fallbackIp)
if me:
self.log.info("building pingtree from %s", me.id)
tree = pingtree.buildTree(me)
@@ -45,12 +48,13 @@
tree = pingtree.PingTree(fallbackIp)
tree.root = pingtree.RouterNode(fallbackIp, root, 0)
tree.root.addNet(tree, "default", "default")
- devices = self.config.getPingDevices()
+ config = dmd.Monitors.Performance._getOb(self.instance)
+ devices = config.getPingDevices()
self.prepDevices(tree, devices)
return tree.root
- def lookupByIp(self, fallbackIp):
+ def lookupByIp(self, dmd, fallbackIp):
"""Try to find the root device by our IP
"""
ip = self.dmd.Networks.findIp(fallbackIp)
Modified: trunk/Products/ZenUtils/ZCmdBase.py
===================================================================
--- trunk/Products/ZenUtils/ZCmdBase.py 2008-05-02 14:07:25 UTC (rev 9164)
+++ trunk/Products/ZenUtils/ZCmdBase.py 2008-05-02 15:57:50 UTC (rev 9165)
@@ -31,6 +31,17 @@
class DataRootError(Exception):pass
+def login(context, name='admin', userfolder=None):
+ '''Logs in.'''
+ if userfolder is None:
+ userfolder = context.getPhysicalRoot().acl_users
+ user = userfolder.getUserById(name)
+ if user is None: return
+ if not hasattr(user, 'aq_base'):
+ user = user.__of__(userfolder)
+ newSecurityManager(None, user)
+ return user
+
class ZCmdBase(ZenDaemon):
@@ -67,13 +78,7 @@
def login(self, name='admin', userfolder=None):
'''Logs in.'''
- if userfolder is None:
- userfolder = self.app.acl_users
- user = userfolder.getUserById(name)
- if user is None: return
- if not hasattr(user, 'aq_base'):
- user = user.__of__(userfolder)
- newSecurityManager(None, user)
+ login(self.dmd, name, userfolder)
def logout(self):
|
|
From: <sv...@ze...> - 2008-05-02 14:07:17
|
Author: ian Date: 2008-05-02 10:07:25 -0400 (Fri, 02 May 2008) New Revision: 9164 Added: branches/zenoss-2.2.x/ Log: * Creation of the 2.2.x branch Copied: branches/zenoss-2.2.x (from rev 9163, trunk) |
|
From: <sv...@ze...> - 2008-05-02 13:17:08
|
Author: ecn
Date: 2008-05-02 09:17:13 -0400 (Fri, 02 May 2008)
New Revision: 9163
Modified:
trunk/Products/DataCollector/zendisc.py
Log:
* fixes #3056 : rename new auto-allocate option to assign-devclass-script
Modified: trunk/Products/DataCollector/zendisc.py
===================================================================
--- trunk/Products/DataCollector/zendisc.py 2008-05-02 13:17:04 UTC (rev 9162)
+++ trunk/Products/DataCollector/zendisc.py 2008-05-02 13:17:13 UTC (rev 9163)
@@ -434,7 +434,7 @@
dest='useFileDescriptor', default=None,
help="Use the given (priveleged) file descriptor for ping")
- self.parser.add_option('--auto-allocate', dest='autoAllocate',
+ self.parser.add_option('--assign-devclass-script', dest='autoAllocate',
action="store_true", default=False,
help="have zendisc auto allocate devices after discovery")
self.parser.add_option('--walk', dest='walk', action='store_true',
|
