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...> - 2007-04-16 15:59:16
|
Author: chris Date: 2007-04-16 11:59:15 -0400 (Mon, 16 Apr 2007) New Revision: 4695 Removed: tags/zenoss-1.1.2/ Log: removed and about to retag to include the latest changes from everyone |
|
From: <sv...@ze...> - 2007-04-16 15:56:40
|
Author: chris
Date: 2007-04-16 11:56:40 -0400 (Mon, 16 Apr 2007)
New Revision: 4694
Modified:
branches/zenoss-1.1.x/inst/GNUmakefile
Log:
reversed parameters
Modified: branches/zenoss-1.1.x/inst/GNUmakefile
===================================================================
--- branches/zenoss-1.1.x/inst/GNUmakefile 2007-04-16 15:56:07 UTC (rev 4693)
+++ branches/zenoss-1.1.x/inst/GNUmakefile 2007-04-16 15:56:40 UTC (rev 4694)
@@ -147,7 +147,7 @@
endif
ifeq ($(DARWIN),1)
- products-install: $(filter-out $(EVERYTHING), winexe-install)
+ products-install: $(filter-out winexe-install, $(EVERYTHING))
else
products-install: $(EVERYTHING)
endif
|
|
From: <sv...@ze...> - 2007-04-16 15:56:08
|
Author: chris
Date: 2007-04-16 11:56:07 -0400 (Mon, 16 Apr 2007)
New Revision: 4693
Modified:
trunk/inst/GNUmakefile
Log:
reversed the args
Modified: trunk/inst/GNUmakefile
===================================================================
--- trunk/inst/GNUmakefile 2007-04-16 15:06:54 UTC (rev 4692)
+++ trunk/inst/GNUmakefile 2007-04-16 15:56:07 UTC (rev 4693)
@@ -151,7 +151,7 @@
winexe-install
ifeq ($(DARWIN),1)
- products-install: $(filter-out $(EVERYTHING) winexe-install)
+ products-install: $(filter-out winexe-install, $(EVERYTHING))
else
products-install: $(EVERYTHING)
endif
|
|
From: <sv...@ze...> - 2007-04-16 15:06:54
|
Author: jstevens
Date: 2007-04-16 11:06:54 -0400 (Mon, 16 Apr 2007)
New Revision: 4692
Modified:
branches/zenoss-1.1.x/inst/GNUmakefile
Log:
Forgot to add definition of DARWIN in last commit.
Modified: branches/zenoss-1.1.x/inst/GNUmakefile
===================================================================
--- branches/zenoss-1.1.x/inst/GNUmakefile 2007-04-16 14:18:46 UTC (rev 4691)
+++ branches/zenoss-1.1.x/inst/GNUmakefile 2007-04-16 15:06:54 UTC (rev 4692)
@@ -141,6 +141,11 @@
simplejson-install \
winexe-install
+DARWIN=0
+ifeq ($(shell python -c 'import sys; print sys.platform'),darwin)
+ DARWIN=1
+endif
+
ifeq ($(DARWIN),1)
products-install: $(filter-out $(EVERYTHING), winexe-install)
else
@@ -274,6 +279,7 @@
REPLACE=1
endif
+
build/$(RRDTOOL)/Makefile: build/$(RRDTOOL)/.unpacked $(NEEDLIBART) $(NEEDFREETYPE) $(NEEDLIBPNG)
@cd $(<D) ; \
LDFLAGS="$(LDFLAGS) -L$(DESTDIR)/$(ZENHOME)/lib" \
|
|
From: <sv...@ze...> - 2007-04-16 14:18:49
|
Author: chris
Date: 2007-04-16 10:18:46 -0400 (Mon, 16 Apr 2007)
New Revision: 4691
Modified:
tags/zenoss-1.1.2/inst/rpm/zenoss.spec
Log:
* synchronized with tagname by zenpkg
Modified: tags/zenoss-1.1.2/inst/rpm/zenoss.spec
===================================================================
--- tags/zenoss-1.1.2/inst/rpm/zenoss.spec 2007-04-16 14:15:24 UTC (rev 4690)
+++ tags/zenoss-1.1.2/inst/rpm/zenoss.spec 2007-04-16 14:18:46 UTC (rev 4691)
@@ -27,7 +27,7 @@
# set to 1 if the version of the software to be built is the trunk
# if trunk is set to 0 the version will be extrapolated from the
# rpm information contained in the %{version} and %{release} vars
-%define trunk 1
+%define trunk 0
# the name of the ctl file for zenoss (in /etc/rc.d/rc#.d)
%define S_zenoss S99zenoss
@@ -41,8 +41,8 @@
# the RPM meta information
Name: zenoss
Summary: The Open Source Network Management System
-Version: 1.1.0
-Release: 0
+Version: 1.1.2
+Release: 0
License: GPL
Vendor: Zenoss, Inc.
Packager: Christopher Blunck <ch...@ze...>
|
|
From: <sv...@ze...> - 2007-04-16 14:15:52
|
Author: chris Date: 2007-04-16 10:15:24 -0400 (Mon, 16 Apr 2007) New Revision: 4690 Added: tags/zenoss-1.1.2/ Log: * auto-build of zenoss-1.1.2 by zenpkg Copied: tags/zenoss-1.1.2 (from rev 4689, branches/zenoss-1.1.x) |
|
From: <sv...@ze...> - 2007-04-16 14:14:33
|
Author: chris Date: 2007-04-16 10:14:30 -0400 (Mon, 16 Apr 2007) New Revision: 4689 Removed: tags/zenoss-1.1.2/ Log: removed and about to retag to include the latest changes from everyone |
|
From: <sv...@ze...> - 2007-04-16 13:07:45
|
Author: jstevens
Date: 2007-04-16 09:07:44 -0400 (Mon, 16 Apr 2007)
New Revision: 4688
Modified:
branches/zenoss-1.1.x/bin/zenbackup.py
Log:
Removed check for running zenoss daemons. This can screw up badly on RH because other non-zenoss python procs will usually be running too.
Modified: branches/zenoss-1.1.x/bin/zenbackup.py
===================================================================
--- branches/zenoss-1.1.x/bin/zenbackup.py 2007-04-16 13:04:27 UTC (rev 4687)
+++ branches/zenoss-1.1.x/bin/zenbackup.py 2007-04-16 13:07:44 UTC (rev 4688)
@@ -175,23 +175,7 @@
# way it would be clear what was restored and what wasn't. As it
# is, if a restore fails the installation might be left with a mix
# of restored and unrestored state.
-
- # Check for running processes
- i, o = os.popen2('ps -Ao pid,command '
- '| grep python '
- '| grep -v "zenbackup" '
- '| grep -v "do not match self" '
- '| egrep "zope|zeo"'
- )
- try:
- if len(o.readlines()):
- print ('It looks like one or more zenoss processes are running.'
- ' Please quit zenoss before attempting to restore.')
- sys.exit(-1)
- finally:
- i.close()
- o.close()
-
+
# Create temp dir and untar backup into it
rootTempDir = tempfile.mkdtemp()
cmd = 'tar xzfC %s %s' % (self.options.file, rootTempDir)
|
|
From: <sv...@ze...> - 2007-04-16 13:04:53
|
Author: jstevens
Date: 2007-04-16 09:04:27 -0400 (Mon, 16 Apr 2007)
New Revision: 4687
Modified:
branches/zenoss-1.1.x/inst/GNUmakefile
Log:
Porting changes from trunk. Don't build win-exe on a mac.
Modified: branches/zenoss-1.1.x/inst/GNUmakefile
===================================================================
--- branches/zenoss-1.1.x/inst/GNUmakefile 2007-04-15 02:12:03 UTC (rev 4686)
+++ branches/zenoss-1.1.x/inst/GNUmakefile 2007-04-16 13:04:27 UTC (rev 4687)
@@ -127,19 +127,26 @@
fi
-products-install: \
- zope-install \
- twistedsnmp-install \
- mysql-python-install \
- rrdtool-install \
- epydoc-install \
- snpp-install \
- yapps-install \
- nagios-install \
- libsmi-install \
- simplejson-install \
- winexe-install
+# don't build winexe-install on a mac
+EVERYTHING = \
+ zope-install \
+ twistedsnmp-install \
+ mysql-python-install \
+ rrdtool-install \
+ epydoc-install \
+ snpp-install \
+ yapps-install \
+ nagios-install \
+ libsmi-install \
+ simplejson-install \
+ winexe-install
+ifeq ($(DARWIN),1)
+ products-install: $(filter-out $(EVERYTHING), winexe-install)
+else
+ products-install: $(EVERYTHING)
+endif
+
# twill provides pyparsing
pydot-install: graphviz-install twill-install
|
|
From: <sv...@ze...> - 2007-04-15 02:12:39
|
Author: edahl Date: 2007-04-14 22:12:03 -0400 (Sat, 14 Apr 2007) New Revision: 4686 Removed: trunk/Products/DataCollector/dtml/.addDataCollector.dtml.swp Log: * take out swap file Deleted: trunk/Products/DataCollector/dtml/.addDataCollector.dtml.swp |
|
From: <sv...@ze...> - 2007-04-13 22:12:10
|
Author: chris Date: 2007-04-13 18:12:10 -0400 (Fri, 13 Apr 2007) New Revision: 4685 Added: trunk/bin/zenmail Log: added. this is the entry point to the new zenmail daemon Added: trunk/bin/zenmail Property changes on: trunk/bin/zenmail ___________________________________________________________________ Name: svn:executable + * |
|
From: <sv...@ze...> - 2007-04-13 22:03:57
|
Author: ecn
Date: 2007-04-13 18:03:57 -0400 (Fri, 13 Apr 2007)
New Revision: 4684
Modified:
branches/zenoss-1.1.x/Products/ZenRRD/zencommand.py
Log:
back-port fix to #1167 to 1.1.X
Modified: branches/zenoss-1.1.x/Products/ZenRRD/zencommand.py
===================================================================
--- branches/zenoss-1.1.x/Products/ZenRRD/zencommand.py 2007-04-13 21:53:56 UTC (rev 4683)
+++ branches/zenoss-1.1.x/Products/ZenRRD/zencommand.py 2007-04-13 22:03:57 UTC (rev 4684)
@@ -422,14 +422,15 @@
for c in self.schedule:
if c.running():
running += 1
- elif c.nextRun() <= now:
+ for c in self.schedule:
+ if running >= self.options.parallel:
+ break
+ if c.nextRun() <= now:
c.start(self.pool).addBoth(self.finished)
running += 1
else:
earliest = c.nextRun() - now
break
- if running >= self.options.parallel:
- break
if earliest is not None:
log.debug("Next command in %f seconds", earliest)
self.timeout = reactor.callLater(earliest,
|
|
From: <sv...@ze...> - 2007-04-13 21:53:59
|
Author: ecn
Date: 2007-04-13 17:53:56 -0400 (Fri, 13 Apr 2007)
New Revision: 4683
Modified:
branches/zenoss-1.1.x/Products/ZenModel/Device.py
branches/zenoss-1.1.x/Products/ZenModel/ZDeviceLoader.py
Log:
back port r4379 to 1.1.X for #1123
Modified: branches/zenoss-1.1.x/Products/ZenModel/Device.py
===================================================================
--- branches/zenoss-1.1.x/Products/ZenModel/Device.py 2007-04-13 21:41:57 UTC (rev 4682)
+++ branches/zenoss-1.1.x/Products/ZenModel/Device.py 2007-04-13 21:53:56 UTC (rev 4683)
@@ -92,7 +92,8 @@
raise NoIPAddress("No IP found for name %s" % deviceName)
if discoverProto == "snmp":
zSnmpCommunity, zSnmpPort, zSnmpVer, snmpname = \
- findCommunity(context, ip, devicePath, zSnmpCommunity, zSnmpPort)
+ findCommunity(context, ip, devicePath,
+ zSnmpCommunity, zSnmpPort, zSnmpVer)
log.debug("device community = %s", zSnmpCommunity)
log.debug("device name = %s", snmpname)
if not deviceName:
@@ -130,7 +131,7 @@
return device
-def findCommunity(context, ip, devicePath, community="", port=161):
+def findCommunity(context, ip, devicePath, community="", port=161, version='v1'):
"""Find the snmp community for an ip address using zSnmpCommunities.
"""
devroot = context.getDmdRoot('Devices').createOrganizer(devicePath)
@@ -144,7 +145,6 @@
oid = '.1.3.6.1.2.1.1.5.0'
goodcommunity = ""
devname = ""
- snmpver = "v1"
for community in communities:
session.community = community
try:
@@ -163,7 +163,7 @@
except: pass #keep trying until we run out
else:
raise NoSnmp("no snmp found for ip = %s" % ip)
- return (goodcommunity, port, snmpver, devname)
+ return (goodcommunity, port, version, devname)
@@ -721,7 +721,7 @@
try:
zSnmpCommunity, zSnmpPort, zSnmpVer, snmpname = \
findCommunity(self, self.manageIp, self.getDeviceClassPath(),
- port=self.zSnmpPort)
+ port=self.zSnmpPort, version=zSnmpVer)
except NoSnmp:
pass
else:
Modified: branches/zenoss-1.1.x/Products/ZenModel/ZDeviceLoader.py
===================================================================
--- branches/zenoss-1.1.x/Products/ZenModel/ZDeviceLoader.py 2007-04-13 21:41:57 UTC (rev 4682)
+++ branches/zenoss-1.1.x/Products/ZenModel/ZDeviceLoader.py 2007-04-13 21:53:56 UTC (rev 4683)
@@ -72,7 +72,7 @@
def loadDevice(self, deviceName, devicePath="/Discovered",
tag="", serialNumber="",
- zSnmpCommunity="", zSnmpPort=161, zSnmpVer="v1",
+ zSnmpCommunity="", zSnmpPort=161, zSnmpVer=None,
rackSlot=0, productionState=1000, comments="",
hwManufacturer="", hwProductName="",
osManufacturer="", osProductName="",
@@ -83,6 +83,11 @@
Load a device into the database connecting its major relations
and collecting its configuration.
"""
+ if zSnmpVer is None:
+ try:
+ zSnmpVer = str(self.Devices.getOrganizer(devicePath).zSnmpVer)
+ except AttributeError:
+ zSnmpVer = 'v1'
if not deviceName: return self.callZenScreen(REQUEST)
device = None
if REQUEST:
|
|
From: <sv...@ze...> - 2007-04-13 21:41:55
|
Author: ecn Date: 2007-04-13 17:41:57 -0400 (Fri, 13 Apr 2007) New Revision: 4682 Removed: trunk/bin/zenxevent Log: * zenxevent is dead, long live zenxevent (aka ZenHub) Deleted: trunk/bin/zenxevent |
|
From: <sv...@ze...> - 2007-04-13 21:41:40
|
Author: ecn Date: 2007-04-13 17:41:39 -0400 (Fri, 13 Apr 2007) New Revision: 4681 Removed: trunk/Products/ZenEvents/zenxevent.py Log: * zenxevent is dead, long live zenxevent (aka ZenHub) Deleted: trunk/Products/ZenEvents/zenxevent.py |
|
From: <sv...@ze...> - 2007-04-13 21:23:50
|
Author: ecn
Date: 2007-04-13 17:23:50 -0400 (Fri, 13 Apr 2007)
New Revision: 4680
Modified:
trunk/Products/ZenHub/XmlRpcService.py
Log:
* another missing method
Modified: trunk/Products/ZenHub/XmlRpcService.py
===================================================================
--- trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 21:23:47 UTC (rev 4679)
+++ trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 21:23:50 UTC (rev 4680)
@@ -23,6 +23,9 @@
def xmlrpc_getDeviceWinInfo(self, *args):
return self.dmd.Devices.Server.Windows.getDeviceWinInfo(*args)
+ def xmlrpc_getWinServices(self, *args):
+ return self.dmd.Devices.Server.Windows.getWinServices(*args)
+
def xmlrpc_applyDataMap(self, devName, datamap,
relname="", compname="", modname=""):
"""Apply a datamap passed as a list of dicts through XML-RPC.
|
|
From: <sv...@ze...> - 2007-04-13 21:23:48
|
Author: marc
Date: 2007-04-13 17:23:47 -0400 (Fri, 13 Apr 2007)
New Revision: 4679
Added:
trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt
trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt
Modified:
trunk/Products/ZenModel/migrate/menus.py
trunk/Products/ZenModel/skins/zenmodel/viewReportClass.pt
Log:
#1212
* Added menu item for adding custom report
* Added menu item for adding device organizer
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-04-13 21:22:24 UTC (rev 4678)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-04-13 21:23:47 UTC (rev 4679)
@@ -909,6 +909,22 @@
permissions=('Change Device',),
allowed_classes = ('OperatingSystem',),
),
+ dict(
+ id= 'addReportOrganizer',
+ description='Add Report Organizer...',
+ action= 'dialog_addReportClass',
+ isdialog=True,
+ permissions=('Change Device',),
+ allowed_classes = ('ReportClass',),
+ ),
+ dict(
+ id= 'addReport',
+ description='Add Report...',
+ action= 'dialog_addReport',
+ isdialog=True,
+ permissions=('Change Device',),
+ allowed_classes = ('ReportClass',),
+ ),
]
})
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_addReport.pt
Added: trunk/Products/ZenModel/skins/zenmodel/dialog_addReportClass.pt
Modified: trunk/Products/ZenModel/skins/zenmodel/viewReportClass.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewReportClass.pt 2007-04-13 21:22:24 UTC (rev 4678)
+++ trunk/Products/ZenModel/skins/zenmodel/viewReportClass.pt 2007-04-13 21:23:47 UTC (rev 4679)
@@ -1,4 +1,4 @@
-<tal:block metal:use-macro="here/templates/macros/page3">
+<tal:block metal:use-macro="here/templates/macros/page2">
<tal:block metal:fill-slot="contentPane">
<form method="post" tal:attributes="action here/absolute_url_path">
|
|
From: <sv...@ze...> - 2007-04-13 21:22:26
|
Author: ecn
Date: 2007-04-13 17:22:24 -0400 (Fri, 13 Apr 2007)
New Revision: 4678
Modified:
trunk/Products/ZenHub/XmlRpcService.py
Log:
* need to go home... update again
Modified: trunk/Products/ZenHub/XmlRpcService.py
===================================================================
--- trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 21:22:07 UTC (rev 4677)
+++ trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 21:22:24 UTC (rev 4678)
@@ -21,7 +21,7 @@
return self.zem.getWmiConnIssues(*args)
def xmlrpc_getDeviceWinInfo(self, *args):
- return self.dmd.Devices.Servers.Windows.getDeviceWinInfo(*args)
+ return self.dmd.Devices.Server.Windows.getDeviceWinInfo(*args)
def xmlrpc_applyDataMap(self, devName, datamap,
relname="", compname="", modname=""):
|
|
From: <sv...@ze...> - 2007-04-13 21:22:07
|
Author: marc
Date: 2007-04-13 17:22:07 -0400 (Fri, 13 Apr 2007)
New Revision: 4677
Modified:
trunk/Products/ZenModel/skins/zenmodel/ipServiceClassStatus.pt
trunk/Products/ZenModel/skins/zenmodel/osProcessClassStatus.pt
trunk/Products/ZenModel/skins/zenmodel/serviceClassStatus.pt
trunk/Products/ZenReports/reports/Device_Reports/All_Monitored_Components.rpt
trunk/Products/ZenReports/reports/Performance_Reports/Filesystem_Util_Report.rpt
Log:
#1220
* Fixed bad links to deviceOsDetail
Modified: trunk/Products/ZenModel/skins/zenmodel/ipServiceClassStatus.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/ipServiceClassStatus.pt 2007-04-13 21:21:40 UTC (rev 4676)
+++ trunk/Products/ZenModel/skins/zenmodel/ipServiceClassStatus.pt 2007-04-13 21:22:07 UTC (rev 4677)
@@ -84,7 +84,7 @@
</tr>
<tr tal:repeat="srv batch">
<td class="tablevalues"
- tal:content="structure python:srv.getDeviceLink('deviceOsDetail')"/>
+ tal:content="structure python:srv.getDeviceLink('os/deviceOsDetail')"/>
<td class="tablevalues">
<a tal:attributes="href srv/getPrimaryUrlPath"
tal:content="srv/id">tcp-00514</a>
Modified: trunk/Products/ZenModel/skins/zenmodel/osProcessClassStatus.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/osProcessClassStatus.pt 2007-04-13 21:21:40 UTC (rev 4676)
+++ trunk/Products/ZenModel/skins/zenmodel/osProcessClassStatus.pt 2007-04-13 21:22:07 UTC (rev 4677)
@@ -79,7 +79,7 @@
</tr>
<tr tal:repeat="proccl batch">
<td class="tablevalues"
- tal:content="structure python:proccl.getDeviceLink('deviceOsDetail')"/>
+ tal:content="structure python:proccl.getDeviceLink('os/deviceOsDetail')"/>
<td class="tablevalues">
<a tal:attributes="href proccl/getPrimaryUrlPath"
tal:content="proccl/name">tcp-00514</a>
Modified: trunk/Products/ZenModel/skins/zenmodel/serviceClassStatus.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/serviceClassStatus.pt 2007-04-13 21:21:40 UTC (rev 4676)
+++ trunk/Products/ZenModel/skins/zenmodel/serviceClassStatus.pt 2007-04-13 21:22:07 UTC (rev 4677)
@@ -79,7 +79,7 @@
<tr tal:define="odd repeat/srv/odd"
tal:attributes="class python:test(odd, 'odd', 'even')">
<td class="tablevalues"
- tal:content="structure python:srv.getDeviceLink('deviceOsDetail')"/>
+ tal:content="structure python:srv.getDeviceLink('os/deviceOsDetail')"/>
<td class="tablevalues">
<a tal:attributes="href srv/getPrimaryUrlPath"
tal:content="srv/id">tcp-00514</a>
Modified: trunk/Products/ZenReports/reports/Device_Reports/All_Monitored_Components.rpt
===================================================================
--- trunk/Products/ZenReports/reports/Device_Reports/All_Monitored_Components.rpt 2007-04-13 21:21:40 UTC (rev 4676)
+++ trunk/Products/ZenReports/reports/Device_Reports/All_Monitored_Components.rpt 2007-04-13 21:22:07 UTC (rev 4677)
@@ -28,7 +28,7 @@
</tr>
<tr tal:repeat="comp batch">
<td class="tablevalues"
- tal:content="structure python:comp.getDeviceLink('deviceOsDetail')"/>
+ tal:content="structure python:comp.getDeviceLink('os/deviceOsDetail')"/>
<td class="tablevalues">
<a class="tablevalues" tal:attributes="href comp/getPrimaryUrlPath"
tal:content="comp/name">smtp</a>
Modified: trunk/Products/ZenReports/reports/Performance_Reports/Filesystem_Util_Report.rpt
===================================================================
--- trunk/Products/ZenReports/reports/Performance_Reports/Filesystem_Util_Report.rpt 2007-04-13 21:21:40 UTC (rev 4676)
+++ trunk/Products/ZenReports/reports/Performance_Reports/Filesystem_Util_Report.rpt 2007-04-13 21:22:07 UTC (rev 4677)
@@ -36,7 +36,7 @@
<tal:block tal:repeat="obj batch">
<tr>
<td class="tablevalues"
- tal:content="structure python:obj.filesystem.getDeviceLink('deviceOsDetail')"/>
+ tal:content="structure python:obj.filesystem.getDeviceLink('os/deviceOsDetail')"/>
<td class="tablevalues">
<a class=tablevalues tal:content="obj/filesystem/mount"
tal:attributes="href obj/filesystem/getPrimaryUrlPath"/>
|
|
From: <sv...@ze...> - 2007-04-13 21:21:40
|
Author: ecn
Date: 2007-04-13 17:21:40 -0400 (Fri, 13 Apr 2007)
New Revision: 4676
Modified:
trunk/Products/ZenHub/XmlRpcService.py
Log:
* more zenwin functions (done correctly, not!)
Modified: trunk/Products/ZenHub/XmlRpcService.py
===================================================================
--- trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 21:17:05 UTC (rev 4675)
+++ trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 21:21:40 UTC (rev 4676)
@@ -21,7 +21,7 @@
return self.zem.getWmiConnIssues(*args)
def xmlrpc_getDeviceWinInfo(self, *args):
- return self.dmd.Device.Servers.Windows.getDeviceWinInfo(*args)
+ return self.dmd.Devices.Servers.Windows.getDeviceWinInfo(*args)
def xmlrpc_applyDataMap(self, devName, datamap,
relname="", compname="", modname=""):
|
|
From: <sv...@ze...> - 2007-04-13 21:17:08
|
Author: ecn
Date: 2007-04-13 17:17:05 -0400 (Fri, 13 Apr 2007)
New Revision: 4675
Modified:
trunk/Products/ZenHub/XmlRpcService.py
Log:
* more zenwin functions (done correctly)
Modified: trunk/Products/ZenHub/XmlRpcService.py
===================================================================
--- trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 21:04:21 UTC (rev 4674)
+++ trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 21:17:05 UTC (rev 4675)
@@ -21,7 +21,7 @@
return self.zem.getWmiConnIssues(*args)
def xmlrpc_getDeviceWinInfo(self, *args):
- return self.dmd.Servers.Windows.getDeviceWinInfo(*args)
+ return self.dmd.Device.Servers.Windows.getDeviceWinInfo(*args)
def xmlrpc_applyDataMap(self, devName, datamap,
relname="", compname="", modname=""):
|
|
From: <sv...@ze...> - 2007-04-13 21:04:21
|
Author: ecn
Date: 2007-04-13 17:04:21 -0400 (Fri, 13 Apr 2007)
New Revision: 4674
Modified:
trunk/Products/ZenHub/XmlRpcService.py
Log:
* more zenwin functions
Modified: trunk/Products/ZenHub/XmlRpcService.py
===================================================================
--- trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 20:38:30 UTC (rev 4673)
+++ trunk/Products/ZenHub/XmlRpcService.py 2007-04-13 21:04:21 UTC (rev 4674)
@@ -20,6 +20,8 @@
def xmlrpc_getWmiConnIssues(self, *args):
return self.zem.getWmiConnIssues(*args)
+ def xmlrpc_getDeviceWinInfo(self, *args):
+ return self.dmd.Servers.Windows.getDeviceWinInfo(*args)
def xmlrpc_applyDataMap(self, devName, datamap,
relname="", compname="", modname=""):
|
|
From: <sv...@ze...> - 2007-04-13 20:38:29
|
Author: ecn
Date: 2007-04-13 16:38:30 -0400 (Fri, 13 Apr 2007)
New Revision: 4673
Modified:
trunk/Products/ZenEvents/zentrap.py
Log:
fixed #921 add sender's community to zentrap events
Modified: trunk/Products/ZenEvents/zentrap.py
===================================================================
--- trunk/Products/ZenEvents/zentrap.py 2007-04-13 20:34:48 UTC (rev 4672)
+++ trunk/Products/ZenEvents/zentrap.py 2007-04-13 20:38:30 UTC (rev 4673)
@@ -153,6 +153,7 @@
device = self._findDevice(addr)
summary = 'snmp trap %s from %s' % (eventType, device)
self.log.debug(summary)
+ community = data['community'].get()
result.setdefault('agent', 'zentrap')
result.setdefault('component', '')
result.setdefault('device', device)
@@ -161,6 +162,7 @@
result.setdefault('rcvtime', ts)
result.setdefault('severity', 3)
result.setdefault('summary', summary)
+ result.setdefault('community', community)
result['ipAddress'] = addr[0]
self.sendEvent(result)
|
|
From: <sv...@ze...> - 2007-04-13 20:34:52
|
Author: ecn
Date: 2007-04-13 16:34:48 -0400 (Fri, 13 Apr 2007)
New Revision: 4672
Modified:
trunk/Products/ZenModel/IpRouteEntry.py
Log:
* add patch from Chet Luther for allowing broken netmasks
(and always test your checkins)
Modified: trunk/Products/ZenModel/IpRouteEntry.py
===================================================================
--- trunk/Products/ZenModel/IpRouteEntry.py 2007-04-13 20:25:28 UTC (rev 4671)
+++ trunk/Products/ZenModel/IpRouteEntry.py 2007-04-13 20:34:48 UTC (rev 4672)
@@ -176,7 +176,7 @@
"""Set this route target netip in the form 10.0.0.0/24.
"""
netid, netmask = netip.split('/')
- if localIpCheck(self, netip) or netmask = '0':
+ if localIpCheck(self, netip) or netmask == '0':
self._target = netip
else:
net = self.getDmdRoot("Networks").createNet(netip)
|
|
From: <sv...@ze...> - 2007-04-13 20:25:34
|
Author: ecn
Date: 2007-04-13 16:25:28 -0400 (Fri, 13 Apr 2007)
New Revision: 4671
Modified:
trunk/Products/ZenModel/IpRouteEntry.py
Log:
* add patch from Chet Luther for allowing broken netmasks
Modified: trunk/Products/ZenModel/IpRouteEntry.py
===================================================================
--- trunk/Products/ZenModel/IpRouteEntry.py 2007-04-13 20:15:04 UTC (rev 4670)
+++ trunk/Products/ZenModel/IpRouteEntry.py 2007-04-13 20:25:28 UTC (rev 4671)
@@ -175,7 +175,8 @@
def setTarget(self, netip):
"""Set this route target netip in the form 10.0.0.0/24.
"""
- if localIpCheck(self, netip):
+ netid, netmask = netip.split('/')
+ if localIpCheck(self, netip) or netmask = '0':
self._target = netip
else:
net = self.getDmdRoot("Networks").createNet(netip)
|
