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-05-02 17:52:56
|
Author: jstevens
Date: 2007-05-02 13:52:55 -0400 (Wed, 02 May 2007)
New Revision: 5070
Modified:
trunk/Products/ZenUtils/Utils.py
Log:
refs #450
* better handling of exceptions from Pager and snpplib
Modified: trunk/Products/ZenUtils/Utils.py
===================================================================
--- trunk/Products/ZenUtils/Utils.py 2007-05-02 17:51:41 UTC (rev 5069)
+++ trunk/Products/ZenUtils/Utils.py 2007-05-02 17:52:55 UTC (rev 5070)
@@ -446,9 +446,7 @@
pmsg = Pager.Message(msg)
page = Pager.Pager((rcpt,), pmsg, snppHost, snppPort)
page.send()
- except socket.error:
- # Need to figure out what exceptions might be thrown above
- # and explicitly catch them here.
+ except (Pager.SNPPException, Pager.PagerException, socket.error):
result = (False, '%s - %s' % tuple(sys.exc_info()[:2]))
else:
result = (True, '')
|
|
From: <sv...@ze...> - 2007-05-02 17:51:40
|
Author: ian Date: 2007-05-02 13:51:41 -0400 (Wed, 02 May 2007) New Revision: 5069 Modified: trunk/Products/ZenModel/skins/zenmodel/locked-delete-icon.png trunk/Products/ZenModel/skins/zenmodel/locked-update-icon.png Log: * Updated lock icons Modified: trunk/Products/ZenModel/skins/zenmodel/locked-delete-icon.png =================================================================== (Binary files differ) Modified: trunk/Products/ZenModel/skins/zenmodel/locked-update-icon.png =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2007-05-02 17:50:07
|
Author: jstevens
Date: 2007-05-02 13:50:07 -0400 (Wed, 02 May 2007)
New Revision: 5068
Modified:
trunk/Products/ZenModel/MonitorClass.py
Log:
fixes #982
* user can no longer delete all status or perf monitors
Modified: trunk/Products/ZenModel/MonitorClass.py
===================================================================
--- trunk/Products/ZenModel/MonitorClass.py 2007-05-02 17:40:17 UTC (rev 5067)
+++ trunk/Products/ZenModel/MonitorClass.py 2007-05-02 17:50:07 UTC (rev 5068)
@@ -121,13 +121,24 @@
def manage_removeMonitor(self, ids = None, submon = None, REQUEST=None):
'Add an object of sub_class, from a module of the same name'
+ msg = ''
child = self._getOb(submon) or self
if ids:
- for id in ids:
- if child.hasObject(id):
- child._delObject(id)
+ if len(ids) < len(child._objects):
+ num = 0
+ for id in ids:
+ if child.hasObject(id):
+ child._delObject(id)
+ num += 1
+ msg = 'Deleted %s monitors' % num
+
+ else:
+ msg = 'You must have at least one monitor'
+ else:
+ msg = 'No monitors are selected'
if REQUEST:
- REQUEST['message'] = 'Monitor deleted'
+ if msg:
+ REQUEST['message'] = msg
return self.callZenScreen(REQUEST)
|
|
From: <sv...@ze...> - 2007-05-02 17:40:19
|
Author: edahl
Date: 2007-05-02 13:40:17 -0400 (Wed, 02 May 2007)
New Revision: 5067
Modified:
trunk/Products/ZenModel/Commandable.py
Log:
* allow zenuser to use screens getUserCommands was causing authentication exception
Modified: trunk/Products/ZenModel/Commandable.py
===================================================================
--- trunk/Products/ZenModel/Commandable.py 2007-05-02 17:11:37 UTC (rev 5066)
+++ trunk/Products/ZenModel/Commandable.py 2007-05-02 17:40:17 UTC (rev 5067)
@@ -172,7 +172,7 @@
return res
- security.declareProtected('Change Device', 'getUserCommands')
+ security.declareProtected('View', 'getUserCommands')
def getUserCommands(self, asDict=False):
''' Get the user commands available in this context
'''
|
|
From: <sv...@ze...> - 2007-05-02 17:11:46
|
Author: marc
Date: 2007-05-02 13:11:37 -0400 (Wed, 02 May 2007)
New Revision: 5066
Modified:
trunk/Products/ZenModel/Manufacturer.py
Log:
* Removed the zProp tab from Manufacturers
Modified: trunk/Products/ZenModel/Manufacturer.py
===================================================================
--- trunk/Products/ZenModel/Manufacturer.py 2007-05-02 16:14:52 UTC (rev 5065)
+++ trunk/Products/ZenModel/Manufacturer.py 2007-05-02 17:11:37 UTC (rev 5066)
@@ -91,11 +91,11 @@
, 'action' : 'editManufacturer'
, 'permissions' : ("Manage DMD", )
},
- { 'id' : 'config'
- , 'name' : 'zProperties'
- , 'action' : 'zPropertyEdit'
- , 'permissions' : ("Manage DMD",)
- },
+ #{ 'id' : 'config'
+ #, 'name' : 'zProperties'
+ #, 'action' : 'zPropertyEdit'
+ #, 'permissions' : ("Manage DMD",)
+ #},
{ 'id' : 'viewHistory'
, 'name' : 'Modifications'
, 'action' : 'viewHistory'
|
|
From: <sv...@ze...> - 2007-05-02 16:14:54
|
Author: ian
Date: 2007-05-02 12:14:52 -0400 (Wed, 02 May 2007)
New Revision: 5065
Modified:
trunk/Products/ZenEvents/skins/zenevents/eventClassInstEdit.pt
trunk/Products/ZenEvents/skins/zenevents/viewEvents.pt
trunk/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt
trunk/Products/ZenUtils/js/zenutils.js
Log:
* Fixes #850: Wrote a function that causes textareas to resize with the browser
* Added the function to the event mapping edit template
Modified: trunk/Products/ZenEvents/skins/zenevents/eventClassInstEdit.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/eventClassInstEdit.pt 2007-05-02 15:53:09 UTC (rev 5064)
+++ trunk/Products/ZenEvents/skins/zenevents/eventClassInstEdit.pt 2007-05-02 16:14:52 UTC (rev 5065)
@@ -1,6 +1,8 @@
<tal:block metal:use-macro="here/templates/macros/page2">
<tal:block metal:fill-slot="contentPane">
+<script>addLoadEvent(connectTextareas)</script>
+
<form method=post
tal:attributes="action string:${here/absolute_url_path}">
<input type="hidden" name="zenScreenName"
Modified: trunk/Products/ZenEvents/skins/zenevents/viewEvents.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/viewEvents.pt 2007-05-02 15:53:09 UTC (rev 5064)
+++ trunk/Products/ZenEvents/skins/zenevents/viewEvents.pt 2007-05-02 16:14:52 UTC (rev 5065)
@@ -27,7 +27,7 @@
tal:condition="python:getattr(request, 'notabs', False)"
tal:attributes="value string:1" />
<tal:block metal:define-macro="eventTable">
-<tal:block tal:define="tabletitle string:Event List;menu_id string:Event_list">
+<tal:block tal:define="tabletitle string:;menu_id string:Event_list">
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
<!-- Custom filter widgets -->
Modified: trunk/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt
===================================================================
--- trunk/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt 2007-05-02 15:53:09 UTC (rev 5064)
+++ trunk/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt 2007-05-02 16:14:52 UTC (rev 5065)
@@ -29,7 +29,7 @@
<input type='hidden' name='zenScreenName' tal:attributes="value template/id" />
<tal:block tal:define="
-tabletitle string:Event History;
+tabletitle string:;
menu_id string:HistoryEvent_list;
">
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
Modified: trunk/Products/ZenUtils/js/zenutils.js
===================================================================
--- trunk/Products/ZenUtils/js/zenutils.js 2007-05-02 15:53:09 UTC (rev 5064)
+++ trunk/Products/ZenUtils/js/zenutils.js 2007-05-02 16:14:52 UTC (rev 5065)
@@ -67,3 +67,20 @@
}
});
}
+
+function connectTextareas() {
+ var resizeArea = function(area) {
+ var vDims = getViewportDimensions();
+ var vPos = getViewportPosition();
+ var aDims = getElementDimensions(area);
+ var aPos = getElementPosition(area);
+ var rightedge_area = aDims.w + aPos.x;
+ var rightedge_vp = vDims.w + vPos.x;
+ aDims.w += rightedge_vp-rightedge_area-50;
+ setElementDimensions(area, aDims);
+ }
+ connect(currentWindow(), 'onresize', function(e) {
+ map(resizeArea, $$('textarea'));
+ });
+ map(resizeArea, $$('textarea'));
+}
|
|
From: <sv...@ze...> - 2007-05-02 15:53:09
|
Author: chris
Date: 2007-05-02 11:53:09 -0400 (Wed, 02 May 2007)
New Revision: 5064
Modified:
tags/zenoss-2.0/inst/rpm/zenoss.spec
Log:
* synchronized with tagname by zenpkg
Modified: tags/zenoss-2.0/inst/rpm/zenoss.spec
===================================================================
--- tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 15:50:13 UTC (rev 5063)
+++ tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 15:53:09 UTC (rev 5064)
@@ -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: 2.0
+Release: 0
License: GPL
Vendor: Zenoss, Inc.
Packager: Christopher Blunck <ch...@ze...>
|
|
From: <sv...@ze...> - 2007-05-02 15:50:12
|
Author: chris Date: 2007-05-02 11:50:13 -0400 (Wed, 02 May 2007) New Revision: 5063 Added: tags/zenoss-2.0/ Log: * auto-build of zenoss-2.0 by zenpkg Copied: tags/zenoss-2.0 (from rev 5062, trunk) |
|
From: <sv...@ze...> - 2007-05-02 15:48:02
|
Author: ecn Date: 2007-05-02 11:47:57 -0400 (Wed, 02 May 2007) New Revision: 5062 Modified: trunk/inst/externallibs/wmi-20070502.tar.bz2 Log: updated build to handle DESTDIR better Modified: trunk/inst/externallibs/wmi-20070502.tar.bz2 =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2007-05-02 15:40:57
|
Author: ecn
Date: 2007-05-02 11:40:55 -0400 (Wed, 02 May 2007)
New Revision: 5061
Modified:
trunk/inst/rpm/zenoss.spec
Log:
fix etc/etc problem
Modified: trunk/inst/rpm/zenoss.spec
===================================================================
--- trunk/inst/rpm/zenoss.spec 2007-05-02 15:39:50 UTC (rev 5060)
+++ trunk/inst/rpm/zenoss.spec 2007-05-02 15:40:55 UTC (rev 5061)
@@ -36,8 +36,8 @@
%define snmpd_conf /etc/snmp/snmpd.conf
%define my_cnf /etc/my.cnf
%define sudoers /etc/sudoers
+#%define _unpackaged_files_terminate_build 0
-
# the RPM meta information
Name: zenoss
Summary: The Open Source Network Management System
@@ -179,7 +179,7 @@
cp ${ZEN_BUILD_DIR}/install-functions.sh ${ZEN_INST_DIR}/bin
# copy filesystem scripts to the real filesystem
-cd ${ZEN_BUILD_DIR}/extras
+cd ${ZEN_BUILD_DIR}/extras/etc
for file in \
`find . -type f | grep -v .svn`
do
@@ -214,6 +214,7 @@
/etc
+
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
%pre
export ZENHOME=%{zenhome}
|
|
From: <sv...@ze...> - 2007-05-02 15:39:51
|
Author: chris Date: 2007-05-02 11:39:50 -0400 (Wed, 02 May 2007) New Revision: 5060 Removed: tags/zenoss-2.0/ Log: cleanup |
|
From: <sv...@ze...> - 2007-05-02 15:39:50
|
Author: ecn Date: 2007-05-02 11:39:46 -0400 (Wed, 02 May 2007) New Revision: 5059 Modified: trunk/wmi/GNUmakefile Log: more fun with DESTDIR Modified: trunk/wmi/GNUmakefile =================================================================== --- trunk/wmi/GNUmakefile 2007-05-02 15:35:47 UTC (rev 5058) +++ trunk/wmi/GNUmakefile 2007-05-02 15:39:46 UTC (rev 5059) @@ -6,22 +6,21 @@ PYTHON=python endif -DESTDIR= / -PYLIBDIR= $(DESTDIR)$(ZENHOME)/lib/python -ZENBIN= $(DESTDIR)$(ZENHOME)/bin +PYLIBDIR= $(ZENHOME)/lib/python +ZENBIN= $(ZENHOME)/bin PYINCLUDE= $(shell $(PYTHON) pyinclude.py) DATE=$(shell date +%Y%m%d) -pywmi-installed: $(PYLIBDIR) $(ZENBIN) +pywmi-installed: $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN) cd Samba/source && \ ./autogen.sh && \ CPPFLAGS="-I$(PYINCLUDE)" ./configure --without-readline && \ $(MAKE) proto bin/wmic bin/wmis wmi/_pywmi.so bin/winexe && \ cp bin/winexe $(ZENBIN) && \ - cp wmi/_pywmi.so $(PYLIBDIR) && \ - cp wmi/pywmi.py $(PYLIBDIR) + cp wmi/_pywmi.so $(DESTDIR)$(PYLIBDIR) && \ + cp wmi/pywmi.py $(DESTDIR)$(PYLIBDIR) -$(ZENBIN) $(PYLIBDIR): +$(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR): mkdir -p $@ clean: |
|
From: <sv...@ze...> - 2007-05-02 15:35:47
|
Author: ian
Date: 2007-05-02 11:35:47 -0400 (Wed, 02 May 2007)
New Revision: 5058
Modified:
trunk/Products/ZenEvents/EventManagerBase.py
trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js
Log:
* Another column width fix on the event console
Modified: trunk/Products/ZenEvents/EventManagerBase.py
===================================================================
--- trunk/Products/ZenEvents/EventManagerBase.py 2007-05-02 15:06:07 UTC (rev 5057)
+++ trunk/Products/ZenEvents/EventManagerBase.py 2007-05-02 15:35:47 UTC (rev 5058)
@@ -1017,11 +1017,12 @@
conn = self.connect()
try:
curs = conn.cursor()
- selstatement = ("SELECT AVG(CHAR_LENGTH(mycol))+5 FROM (SELECT %s AS "
- "mycol FROM %s LIMIT 50) AS a;") % (fieldname,
- self.statusTable)
+ selstatement = ("SELECT AVG(CHAR_LENGTH(mycol))+20 FROM (SELECT %s AS "
+ "mycol FROM %s WHERE %s IS NOT NULL LIMIT 500) AS "
+ "a;") % (fieldname, self.statusTable, fieldname)
curs.execute(selstatement)
avglen = curs.fetchone()
+ print fieldname, avglen
finally: self.close(conn)
try: return float(avglen[0])
except TypeError: return 10.
Modified: trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js 2007-05-02 15:06:07 UTC (rev 5057)
+++ trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js 2007-05-02 15:35:47 UTC (rev 5058)
@@ -187,10 +187,10 @@
{};
this.fields = [];
this.fieldMapping = {
- summary: -9,
- component: +6,
+ //summary: -9,
+ //component: +6,
//eventClass: +2,
- count: +3
+ //count: +3
//firstTime: -1,
//lastTime: -1
}
@@ -543,7 +543,6 @@
return false;
},
populateTable: function(data) {
- console.profile();
var tableLength = data.length > this.numRows ?
this.numRows : data.length;
if (tableLength != this.rowEls.length){
@@ -587,7 +586,6 @@
}
this.killLoading();
connectCheckboxListeners();
- console.profileEnd();
},
getTotalRows: function() {
cb = bind(function(r) {
|
|
From: <sv...@ze...> - 2007-05-02 15:06:09
|
Author: chris
Date: 2007-05-02 11:06:07 -0400 (Wed, 02 May 2007)
New Revision: 5057
Modified:
tags/zenoss-2.0/inst/rpm/zenoss.spec
Log:
* synchronized with tagname by zenpkg
Modified: tags/zenoss-2.0/inst/rpm/zenoss.spec
===================================================================
--- tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 15:02:29 UTC (rev 5056)
+++ tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 15:06:07 UTC (rev 5057)
@@ -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: 2.0
+Release: 0
License: GPL
Vendor: Zenoss, Inc.
Packager: Christopher Blunck <ch...@ze...>
|
|
From: <sv...@ze...> - 2007-05-02 15:04:58
|
Author: chris Date: 2007-05-02 11:02:29 -0400 (Wed, 02 May 2007) New Revision: 5056 Added: tags/zenoss-2.0/ Log: * auto-build of zenoss-2.0 by zenpkg Copied: tags/zenoss-2.0 (from rev 5055, trunk) |
|
From: <sv...@ze...> - 2007-05-02 15:04:58
|
Author: ecn
Date: 2007-05-02 11:02:01 -0400 (Wed, 02 May 2007)
New Revision: 5054
Modified:
trunk/inst/GNUmakefile
Log:
try to build the wmi stuff later for rpm build
Modified: trunk/inst/GNUmakefile
===================================================================
--- trunk/inst/GNUmakefile 2007-05-02 14:59:31 UTC (rev 5053)
+++ trunk/inst/GNUmakefile 2007-05-02 15:02:01 UTC (rev 5054)
@@ -144,7 +144,6 @@
EVERYTHING = \
zope-install \
- wmi-install \
twistedsnmp-install \
pynetsnmp-install \
mysql-python-install \
@@ -154,6 +153,7 @@
yapps-install \
nagios-install \
libsmi-install \
+ wmi-install \
simplejson-install
# don't build wmi-install on a mac
|
|
From: <sv...@ze...> - 2007-05-02 15:04:57
|
Author: chris Date: 2007-05-02 11:02:11 -0400 (Wed, 02 May 2007) New Revision: 5055 Removed: tags/zenoss-2.0/ Log: cleanup |
|
From: <sv...@ze...> - 2007-05-02 14:59:32
|
Author: edahl
Date: 2007-05-02 10:59:31 -0400 (Wed, 02 May 2007)
New Revision: 5053
Modified:
trunk/Products/ZenModel/migrate/menus.py
trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt
trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt
Log:
* add Administration menu back to deviceorganizer
* fix funcky tal conditinal when there are no sub-organzers
Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py 2007-05-02 14:48:16 UTC (rev 5052)
+++ trunk/Products/ZenModel/migrate/menus.py 2007-05-02 14:59:31 UTC (rev 5053)
@@ -596,7 +596,7 @@
'ordering': 60.0,
'permissions': ('View',)},
{ 'action': 'deviceManagement',
- 'allowed_classes': ['Device'],
+ 'allowed_classes': ['Device', 'DeviceOrganizer'],
'description': 'Administration',
'id': 'deviceManagement',
'ordering': 50.0,
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt 2007-05-02 14:48:16 UTC (rev 5052)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceManagement.pt 2007-05-02 14:59:31 UTC (rev 5053)
@@ -111,33 +111,5 @@
</form>
-<span metal:use-macro="here/templates/macros/contentSeparator"/>
-
-
-<tal:block metal:define-macro="graphLinks" tal:condition="here/havePydot"
- tal:define="routers string:${here/absolute_url_path}/deviceGraphRouters;
- tabletitle string:Graphs;
- networks string:${here/absolute_url_path}/deviceGraphNets">
-<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
-
-<tal:block metal:fill-slot="zentablecontents">
-
-<!-- BEGIN TABLE CONTENTS -->
- <tr>
- <td class="tableheader">Relative Network Graph</td>
- <td class="tablevalues" colspan="3"><a tal:attributes="href
-routers">Image Link</a> (routers only)</td>
- </tr>
- <tr>
- <td class="tableheader">Detailed Relative Network Graph</td>
- <td class="tablevalues" colspan="3"><a tal:attributes="href
-networks">Image Link</a> (routers and networks)</td>
- </tr>
-<!-- END TABLE CONTENTS -->
-
</tal:block>
</tal:block>
-</tal:block>
-
-</tal:block>
-</tal:block>
Modified: trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt 2007-05-02 14:48:16 UTC (rev 5052)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceOrganizerStatus.pt 2007-05-02 14:59:31 UTC (rev 5053)
@@ -87,7 +87,6 @@
tal:attributes="value template/id"/>
<tal:block metal:use-macro="here/zenuimacros/macros/zentable">
<tal:block metal:fill-slot="zentablecontents">
- <tal:block tal:condition="objects" tal:omit-tag="">
<tr>
<th tal:replace="structure python:here.ZenTableManager.getTableHeader(
tableName,'primarySortKey','Name')">
@@ -141,7 +140,6 @@
<span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
</td>
</tr>
- </tal:block>
</tal:block>
</tal:block>
</tal:block>
|
|
From: <sv...@ze...> - 2007-05-02 14:48:19
|
Author: edahl Date: 2007-05-02 10:48:16 -0400 (Wed, 02 May 2007) New Revision: 5052 Modified: trunk/Products/ZenModel/MaintenanceWindowable.py Log: * add missing import to maintenance window creation Modified: trunk/Products/ZenModel/MaintenanceWindowable.py =================================================================== --- trunk/Products/ZenModel/MaintenanceWindowable.py 2007-05-02 14:47:58 UTC (rev 5051) +++ trunk/Products/ZenModel/MaintenanceWindowable.py 2007-05-02 14:48:16 UTC (rev 5052) @@ -16,6 +16,7 @@ Created by Marc Irlandez on 2007-04-05. """ from AccessControl import ClassSecurityInfo +from MaintenanceWindow import MaintenanceWindow class MaintenanceWindowable: |
|
From: <sv...@ze...> - 2007-05-02 14:47:57
|
Author: ian
Date: 2007-05-02 10:47:58 -0400 (Wed, 02 May 2007)
New Revision: 5051
Modified:
trunk/Products/ZenEvents/EventManagerBase.py
trunk/Products/ZenEvents/ZEvent.py
trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js
Log:
* Made the column width calculation a little less extreme
Modified: trunk/Products/ZenEvents/EventManagerBase.py
===================================================================
--- trunk/Products/ZenEvents/EventManagerBase.py 2007-05-02 14:40:55 UTC (rev 5050)
+++ trunk/Products/ZenEvents/EventManagerBase.py 2007-05-02 14:47:58 UTC (rev 5051)
@@ -1017,7 +1017,7 @@
conn = self.connect()
try:
curs = conn.cursor()
- selstatement = ("SELECT AVG(CHAR_LENGTH(mycol)) FROM (SELECT %s AS "
+ selstatement = ("SELECT AVG(CHAR_LENGTH(mycol))+5 FROM (SELECT %s AS "
"mycol FROM %s LIMIT 50) AS a;") % (fieldname,
self.statusTable)
curs.execute(selstatement)
Modified: trunk/Products/ZenEvents/ZEvent.py
===================================================================
--- trunk/Products/ZenEvents/ZEvent.py 2007-05-02 14:40:55 UTC (rev 5050)
+++ trunk/Products/ZenEvents/ZEvent.py 2007-05-02 14:47:58 UTC (rev 5051)
@@ -57,6 +57,7 @@
' href="/zport/dmd/deviceSearchResults'
'?query=%s">%s</a>' % (value, _shortvalue))
elif field == 'eventClass':
+ _shortvalue = _shortvalue.replace('/','/­')
value = urllib.quote('<a class="%s" ' % (cssClass) +
'href="/zport/dmd/Events%s">%s</a>' % (value,_shortvalue))
else:
Modified: trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js 2007-05-02 14:40:55 UTC (rev 5050)
+++ trunk/Products/ZenWidgets/skins/zenui/javascript/zengrid.js 2007-05-02 14:47:58 UTC (rev 5051)
@@ -187,11 +187,12 @@
{};
this.fields = [];
this.fieldMapping = {
- summary: -4,
- firstTime: 0,
- lastTime: 0,
- component: +1,
+ summary: -9,
+ component: +6,
+ //eventClass: +2,
count: +3
+ //firstTime: -1,
+ //lastTime: -1
}
this.lastOffset = 0;
this.lastPixelOffset = this.lastPixelOffset || 0;
@@ -331,15 +332,16 @@
var d = loadJSONDoc(this.url, qs);
d.addErrback(function(x) { alert('Cannot communicate with the server!') });
d.addCallback(
- bind(function(r) {
- result = r;
- this.buffer.totalRows = result[1];
- this.setScrollHeight(this.rowToPixel(this.buffer.totalRows));
- this.buffer.clear();
- this.buffer.update(result[0], bufOffset);
- this.updateStatusBar(this.lastOffset);
- this.populateTable(this.buffer.getRows(this.lastOffset, this.numRows));
- }, this));
+ bind(function(r) {
+ result = r;
+ this.buffer.totalRows = result[1];
+ this.setScrollHeight(this.rowToPixel(this.buffer.totalRows));
+ this.buffer.clear();
+ this.buffer.update(result[0], bufOffset);
+ this.updateStatusBar(this.lastOffset);
+ this.populateTable(this.buffer.getRows(this.lastOffset, this.numRows));
+ }, this)
+ );
},
query: function(offset) {
var url = this.url || 'getJSONEventsInfo';
@@ -541,6 +543,7 @@
return false;
},
populateTable: function(data) {
+ console.profile();
var tableLength = data.length > this.numRows ?
this.numRows : data.length;
if (tableLength != this.rowEls.length){
@@ -584,6 +587,7 @@
}
this.killLoading();
connectCheckboxListeners();
+ console.profileEnd();
},
getTotalRows: function() {
cb = bind(function(r) {
@@ -791,23 +795,19 @@
var cols = this.colgroup.getElementsByTagName('col');
var hcols = this.headcolgroup.getElementsByTagName('col');
var oldint = parseFloat(cols[index].width);
- var oldfint = parseFloat(cols[fromindex].width);
var parentwidth = getElementDimensions(this.viewport).w;
var old = (oldint/100.00) * parentwidth;
- var fold = (oldfint/100.00) * parentwidth;
var neww = (old + pixeldiff)/parentwidth * 100.00;
- var feww = (pixeldiff - fold)/parentwidth * 100.00;
var tofield = this.fields[index][0];
var toval = this.fieldMapping[tofield];
var fromfield = this.fields[fromindex][0];
var fromval = this.fieldMapping[fromfield];
- if (pixeldiff>0&&(neww<0||feww>0))
- neww=toval;
- if (pixeldiff<0&&(feww<0||neww>0))
- neww=fromval;
+ log(neww, toval, fromval);
neww = oldint-neww;
- this.fieldMapping[tofield] = Math.max(toval-neww, oldint);
- this.fieldMapping[fromfield] = Math.min(fromval+neww, -oldint);
+ if (toval-neww<0) neww=toval;
+ else if (fromval+neww<0) neww=-fromval;
+ this.fieldMapping[tofield] = Math.max(toval-neww, 0);
+ this.fieldMapping[fromfield] = Math.max(fromval+neww, 0);
this.colgroup = swapDOM(this.colgroup, this.getColgroup());
this.headcolgroup = swapDOM(this.headcolgroup, this.getColgroup());
//this.refreshTable(this.lastOffset);
|
|
From: <sv...@ze...> - 2007-05-02 14:40:55
|
Author: marc
Date: 2007-05-02 10:40:55 -0400 (Wed, 02 May 2007)
New Revision: 5050
Modified:
trunk/Products/ZenModel/skins/zenmodel/ipServiceClassEdit.pt
trunk/Products/ZenModel/skins/zenmodel/ipServiceDetail.pt
trunk/Products/ZenModel/skins/zenmodel/osProcessDetail.pt
trunk/Products/ZenModel/skins/zenmodel/serviceClassEdit.pt
trunk/Products/ZenModel/skins/zenmodel/templates.pt
trunk/Products/ZenModel/skins/zenmodel/viewFileSystem.pt
trunk/Products/ZenModel/skins/zenmodel/viewHardDisk.pt
trunk/Products/ZenModel/skins/zenmodel/viewIpInterface.pt
trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt
trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Moved menu ordering
* Made monitoring fields and others editable by all once again
Modified: trunk/Products/ZenModel/skins/zenmodel/ipServiceClassEdit.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/ipServiceClassEdit.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenModel/skins/zenmodel/ipServiceClassEdit.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -27,9 +27,10 @@
<tr>
<td class="tableheader">Monitor</td>
<td class="tablevalues" colspan="3">
- <select class="tablevalues" name="monitor:boolean">
- <option tal:repeat="e python:(True,False)" tal:content="e"
- tal:attributes="value e; selected python:e==here.zMonitor"/>
+ <select class="tablevalues" name="monitor:boolean">
+ <option tal:repeat="e python:(True,False)" tal:content="e"
+ tal:attributes="value e; selected python:e==here.monitored()"/>
+ </select>
</td>
</tr>
<tr>
Modified: trunk/Products/ZenModel/skins/zenmodel/ipServiceDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/ipServiceDetail.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenModel/skins/zenmodel/ipServiceDetail.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -97,13 +97,10 @@
<tr>
<td class="tableheader">Monitor</td>
<td class="tablevalues" tal:condition="not: here/cantMonitor">
- <select class="tablevalues" name="monitor:boolean"
- tal:condition="editable">
+ <select class="tablevalues" name="monitor:boolean">
<option tal:repeat="e python:(True,False)" tal:content="e"
tal:attributes="value e; selected python:e==here.monitored()"/>
</select>
- <tal:block tal:condition="not:editable"
- tal:content="here/monitored"/>
</td>
<td class="tablevalues" tal:condition="here/cantMonitor"
tal:content="here/monitored"/>
@@ -111,12 +108,9 @@
<tr>
<td class="tableheader">Send String</td>
<td class="tablevalues" tal:condition="not: here/cantMonitor">
- <input tal:condition="editable"
- tal:attributes="class string:tablevalues;
+ <input tal:attributes="class string:tablevalues;
name string:sendString;
value here/getSendString"/>
- <tal:block tal:condition="not:editable"
- tal:content="here/getSendString"/>
</td>
<td class="tablevalues" tal:condition="here/cantMonitor"
tal:content="here/getSendString"/>
@@ -125,10 +119,7 @@
<td class="tableheader">Expect Regex</td>
<td class="tablevalues" tal:condition="not: here/cantMonitor">
<input class="tablevalues" type="text" name="expectRegex"
- tal:condition="editable"
tal:attributes="value here/getExpectRegex"/>
- <tal:block tal:condition="not:editable"
- tal:content="here/getExpectRegex"/>
</td>
<td class="tablevalues" tal:condition="here/cantMonitor"
tal:content="here/getExpectRegex"/>
@@ -136,15 +127,12 @@
<tr>
<td class="tableheader">Fail Severity</td>
<td class="tablevalues" tal:condition="not: here/cantMonitor">
- <select class="tableheader" name="severity:int"
- tal:condition="editable">
+ <select class="tableheader" name="severity:int">
<option tal:repeat="sev here/getSeverities"
tal:content="python:sev[0]"
tal:attributes="value python:sev[1];
selected python:sev[1] == here.getFailSeverity()" />
</select>
- <tal:block tal:condition="not:editable"
- tal:content="here/getFailSeverityString"/>
</td>
<td class="tablevalues" tal:condition="here/cantMonitor"
tal:content="here/getFailSeverityString"/>
Modified: trunk/Products/ZenModel/skins/zenmodel/osProcessDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/osProcessDetail.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenModel/skins/zenmodel/osProcessDetail.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -66,15 +66,12 @@
</tr>
<tr>
<td class="tableheader">Monitor</td>
- <td class="tablevalues" tal:condition="editable">
- <select class="tablevalues" name="zMonitor:boolean"
- tal:condition="editable">
+ <td class="tablevalues">
+ <select class="tablevalues" name="zMonitor:boolean">
<option tal:repeat="e python:(True,False)" tal:content="e"
tal:attributes="value e; selected python:e==here.monitored()"/>
</select>
</td>
- <td class="tablevalues" tal:condition="not:editable"
- tal:content="here/monitored"/>
</tr>
<tr>
<td class="tableheader">Alert On Restart</td>
@@ -90,17 +87,14 @@
</tr>
<tr>
<td class="tableheader">Fail Severity</td>
- <td class="tablevalues" tal:condition="editable">
- <select class="tablevalue" name="zFailSeverity:int"
- tal:condition="editable">
+ <td class="tablevalues">
+ <select class="tablevalue" name="zFailSeverity:int">
<option tal:repeat="sev here/getSeverities"
tal:content="python:sev[0]"
tal:attributes="value python:sev[1];
selected python:sev[1] == here.getFailSeverity()" />
</select>
</td>
- <td class="tablevalues" tal:condition="not:editable"
- tal:content="here/getFailSeverityString"/>
</tr>
<tr>
<td class=tableheader align=left>Lock</td>
Modified: trunk/Products/ZenModel/skins/zenmodel/serviceClassEdit.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/serviceClassEdit.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenModel/skins/zenmodel/serviceClassEdit.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -36,9 +36,10 @@
<tr>
<td class="tableheader">Monitor</td>
<td class="tablevalues">
- <select class="tablevalues" name="monitor:boolean">
- <option tal:repeat="e python:(True,False)" tal:content="e"
- tal:attributes="value e; selected python:e==here.zMonitor"/>
+ <select class="tablevalues" name="monitor:boolean">
+ <option tal:repeat="e python:(True,False)" tal:content="e"
+ tal:attributes="value e; selected python:e==here.monitored()"/>
+ </select>
</td>
</tr>
<tr>
Modified: trunk/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenModel/skins/zenmodel/templates.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -297,7 +297,7 @@
<table class="tabtable" cellpadding="0" cellspacing="0"
tal:condition="python:(ztabs and not getattr(request, 'notabs', False))">
<tr tal:define="menu_ids menu_ids |
- python:['Actions','Add','Manage','More']">
+ python:['More','Manage','Actions','Add']">
<tal:block tal:condition="python:hasattr(here, 'getMenus')">
<td class="contextmenutab"
tal:condition="python:here.getMenus(menu_ids, here)" >
Modified: trunk/Products/ZenModel/skins/zenmodel/viewFileSystem.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewFileSystem.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenModel/skins/zenmodel/viewFileSystem.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -27,17 +27,12 @@
value here/mount">
</td>
<td class="tableheader">Monitor</td>
- <td class="tablevalues" tal:condition="editable">
- <select class="tablevalues" name="monitor:boolean"
- tal:condition="editable">
+ <td class="tablevalues">
+ <select class="tablevalues" name="monitor:boolean">
<option tal:repeat="e python:(True,False)" tal:content="e"
tal:attributes="value e; selected python:e==here.monitored()"/>
</select>
- <tal:block tal:condition="not:editable"
- tal:content="here/monitored"/>
</td>
- <td class="tablevalues" tal:condition="not:editable"
- tal:content="here/monitored"/>
</tr>
<tr>
<td class="tableheader" align=left>Storage Device</td>
Modified: trunk/Products/ZenModel/skins/zenmodel/viewHardDisk.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewHardDisk.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenModel/skins/zenmodel/viewHardDisk.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -14,17 +14,12 @@
<td class=tableheader width="16%" align=left>Name</td>
<td class=tablevalues width="16%" tal:content="here/description">sd0</td>
<td class="tableheader">Monitor</td>
- <td class="tablevalues" tal:condition="here/isManager">
- <select class="tablevalues" name="monitor:boolean"
- tal:condition="here/isManager">
+ <td class="tablevalues">
+ <select class="tablevalues" name="monitor:boolean">
<option tal:repeat="e python:(True,False)" tal:content="e"
tal:attributes="value e; selected python:e==here.monitored()"/>
</select>
- <tal:block tal:condition="not:here/isManager"
- tal:content="here/monitored"/>
</td>
- <td class="tablevalues" tal:condition="not:here/isManager"
- tal:content="here/monitored"/>
</tr>
<tr>
<td class=tableheader width="16%" align=left>Snmp Index</td>
Modified: trunk/Products/ZenModel/skins/zenmodel/viewIpInterface.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/viewIpInterface.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenModel/skins/zenmodel/viewIpInterface.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -128,16 +128,11 @@
value here/description">
</td>
<td class="tableheader">Monitor</td>
- <td class="tablevalues" tal:condition="not:editable"
- tal:content="here/monitored"/>
- <td class="tablevalues" tal:condition="editable">
- <select class="tablevalues" name="monitor:boolean"
- tal:condition="editable">
+ <td class="tablevalues">
+ <select class="tablevalues" name="monitor:boolean">
<option tal:repeat="e python:(True,False)" tal:content="e"
tal:attributes="value e; selected python:e==here.monitored()"/>
</select>
- <tal:block tal:condition="not:editable"
- tal:content="here/monitored"/>
</td>
</tr>
<tr>
@@ -149,7 +144,7 @@
<td class="tableheader" align=left>Lock warnings</td>
<td class="tablevalues" tal:content="here/lockWarning">Send event when blocked</td>
</tr>
- <tr tal:condition="editable">
+ <tr>
<td align="left" class="tableheader" colspan="4">
<input class="tableheader" type="submit" value=" Save "
name="zmanage_editProperties:method" />
Modified: trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenModel/skins/zenmodel/winServiceDetail.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -61,13 +61,10 @@
<tr>
<td class="tableheader">Monitor</td>
<td class="tablevalues">
- <select class="tablevalues" name="monitor:boolean"
- tal:condition="editable">
+ <select class="tablevalues" name="monitor:boolean">
<option tal:repeat="e python:(True,False)" tal:content="e"
tal:attributes="value e; selected python:e==here.monitored()"/>
</select>
- <tal:block tal:condition="not:editable"
- tal:content="here/monitored"/>
</td>
<td class="tableheader">Fail Severity</td>
<td class="tablevalues">
Modified: trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-05-02 14:40:46 UTC (rev 5049)
+++ trunk/Products/ZenWidgets/skins/zenui/zenuimacros.pt 2007-05-02 14:40:55 UTC (rev 5050)
@@ -2,7 +2,7 @@
tal:condition="python:hasattr(here, 'getMenus')">
<div class="menu" tal:define="
- menu_ids menu_ids | python:['Actions', 'Add', 'Manage', 'More'];
+ menu_ids menu_ids | python:['More','Manage','Actions','Add'];
basepath here/absolute_url_path"
tal:condition="python:here.getMenus(menu_ids, here)">
<div tal:attributes="id string:contextmenu_btn">
|
|
From: <sv...@ze...> - 2007-05-02 14:40:47
|
Author: ecn
Date: 2007-05-02 10:40:46 -0400 (Wed, 02 May 2007)
New Revision: 5049
Modified:
trunk/Products/ZenWin/zeneventlog.py
Log:
fix /Unknown event keys
Modified: trunk/Products/ZenWin/zeneventlog.py
===================================================================
--- trunk/Products/ZenWin/zeneventlog.py 2007-05-02 14:40:20 UTC (rev 5048)
+++ trunk/Products/ZenWin/zeneventlog.py 2007-05-02 14:40:46 UTC (rev 5049)
@@ -24,7 +24,7 @@
import Globals
from WinCollector import WinCollector as Base, TIMEOUT_CODE, RPC_ERROR_CODE
from Products.ZenHub.services import WmiConfig
-from Products.ZenEvents.ZenEventClasses import Heartbeat, Status_Wmi_Conn
+from Products.ZenEvents.ZenEventClasses import Heartbeat, Status_Wmi_Conn, Status_Wmi
from Products.ZenEvents import Event
class zeneventlog(Base):
@@ -127,6 +127,7 @@
sev = 4 - lrec.EventType #lower severity by one level
if sev < 1: sev = 1
evt = dict(device=name,
+ eventKey=Status_Wmi,
eventClassKey=evtkey,
eventGroup=lrec.LogFile,
component=lrec.SourceName,
|
|
From: <sv...@ze...> - 2007-05-02 14:40:22
|
Author: ecn
Date: 2007-05-02 10:40:20 -0400 (Wed, 02 May 2007)
New Revision: 5048
Modified:
trunk/Products/ZenWin/zenwin.py
Log:
updated constant for timeout
Modified: trunk/Products/ZenWin/zenwin.py
===================================================================
--- trunk/Products/ZenWin/zenwin.py 2007-05-02 14:19:19 UTC (rev 5047)
+++ trunk/Products/ZenWin/zenwin.py 2007-05-02 14:40:20 UTC (rev 5048)
@@ -30,7 +30,7 @@
from WinServiceTest import WinServiceTest
from WinEventlog import WinEventlog
-ERRtimeout = 88
+ERRtimeout = 1726
class StatusTest:
def __init__(self, name, username, password, services):
|
|
From: <sv...@ze...> - 2007-05-02 14:19:20
|
Author: chris
Date: 2007-05-02 10:19:19 -0400 (Wed, 02 May 2007)
New Revision: 5047
Modified:
tags/zenoss-2.0/inst/rpm/zenoss.spec
Log:
* synchronized with tagname by zenpkg
Modified: tags/zenoss-2.0/inst/rpm/zenoss.spec
===================================================================
--- tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 14:16:16 UTC (rev 5046)
+++ tags/zenoss-2.0/inst/rpm/zenoss.spec 2007-05-02 14:19:19 UTC (rev 5047)
@@ -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: 2.0
+Release: 0
License: GPL
Vendor: Zenoss, Inc.
Packager: Christopher Blunck <ch...@ze...>
|
|
From: <sv...@ze...> - 2007-05-02 14:17:10
|
Author: chris Date: 2007-05-02 10:16:16 -0400 (Wed, 02 May 2007) New Revision: 5046 Added: tags/zenoss-2.0/ Log: * auto-build of zenoss-2.0 by zenpkg Copied: tags/zenoss-2.0 (from rev 5045, trunk) |
