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-09 14:42:58
|
Author: chris Date: 2007-04-09 10:42:59 -0400 (Mon, 09 Apr 2007) New Revision: 4595 Added: tags/zenoss-1.1.2/ Log: * auto-build of zenoss-1.1.2 by zenpkg Copied: tags/zenoss-1.1.2 (from rev 4594, branches/zenoss-1.1.x) |
|
From: <sv...@ze...> - 2007-04-09 14:42:31
|
Author: chris Date: 2007-04-09 10:42:33 -0400 (Mon, 09 Apr 2007) New Revision: 4594 Removed: tags/zenoss-1.1.2/ Log: sliding in order to backport the change to zenoss.spec that allows us to build without needing any perl nonsense |
|
From: <sv...@ze...> - 2007-04-09 14:41:46
|
Author: chris
Date: 2007-04-09 10:41:47 -0400 (Mon, 09 Apr 2007)
New Revision: 4593
Modified:
branches/zenoss-1.1.x/inst/rpm/zenoss.spec
Log:
backported the removal of perl modules that nagios installs
Modified: branches/zenoss-1.1.x/inst/rpm/zenoss.spec
===================================================================
--- branches/zenoss-1.1.x/inst/rpm/zenoss.spec 2007-04-09 14:20:24 UTC (rev 4592)
+++ branches/zenoss-1.1.x/inst/rpm/zenoss.spec 2007-04-09 14:41:47 UTC (rev 4593)
@@ -116,6 +116,17 @@
# compile external libs and pull down zenoss
compile
+# remove the nagios-plugins perl scripts that force ugly deps
+DIR=${RPM_BUILD_ROOT}/${ZENHOME}/libexec
+DIRNAME=${RPM_BUILD_ROOT}/${ZENHOME}/libexec
+
+for file in \
+ `ls $DIRNAME | awk '{print $1}' | cut -d: -f1 | sort -u`
+do
+ rm $DIRNAME/$file
+done
+
+
# remove the CM artifacts
ZEN_INST_DIR=${RPM_BUILD_ROOT}/${ZENHOME}
find ${ZEN_INST_DIR} -name .svn | xargs rm -rf
|
|
From: <sv...@ze...> - 2007-04-09 14:20:51
|
Author: chris Date: 2007-04-09 10:20:24 -0400 (Mon, 09 Apr 2007) New Revision: 4592 Modified: trunk/inst/GNUmakefile Log: added DESTDIR prefix. otherwise this doesn't build via zenpkg Modified: trunk/inst/GNUmakefile =================================================================== --- trunk/inst/GNUmakefile 2007-04-09 13:17:59 UTC (rev 4591) +++ trunk/inst/GNUmakefile 2007-04-09 14:20:24 UTC (rev 4592) @@ -228,7 +228,7 @@ zc.queue-install: build/$(QUEUE)/.unpacked $(PYINSTALL) - @touch $(ZENHOME)/lib/python/zc/__init__.py + @touch $(DESTDIR)$(ZENHOME)/lib/python/zc/__init__.py PYTHONVERSION=$(shell $(PYTHON) -c 'import sys; print "python%d.%d"%sys.version_info[:2]') BB=$(INSTDIR)/build/$(ZOPE)/build-base/$(PYTHONVERSION) @@ -266,7 +266,8 @@ rrdtool-install : build/$(RRDTOOL)/Makefile $(MSG) ; cd $(<D) ; $(MAKE) install $(LOG) @cd build/$(RRDTOOL)/bindings/python ; LIBDIR=$(DESTDIR)/$(ZENHOME)/lib $(PYINSTALLCMD) - @rm -rf $(DESTDIR)$(ZENHOME)/share/rrdtool/examples + rm -rf $(DESTDIR)$(ZENHOME)/share/rrdtool/examples + rm -rf $(DESTDIR)$(ZENHOME)/lib/perl winexe-install: build/$(WINEXE)/.unpacked @cd $(<D)/source ; $(CONFIGURE) --without-readline $(LOG) |
|
From: <sv...@ze...> - 2007-04-09 13:18:26
|
Author: ecn
Date: 2007-04-09 09:17:59 -0400 (Mon, 09 Apr 2007)
New Revision: 4591
Modified:
trunk/Products/ZenModel/DeviceClass.py
Log:
* windows services are being stored as unicode... but xmlrpc requires them to be strings
Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py 2007-04-07 23:43:30 UTC (rev 4590)
+++ trunk/Products/ZenModel/DeviceClass.py 2007-04-09 13:17:59 UTC (rev 4591)
@@ -272,7 +272,10 @@
allsvcs = {}
for s in self.getSubComponents("WinService"):
svcs=allsvcs.setdefault(s.hostname(),{})
- svcs[s.name()] = (s.getStatus(), s.getAqProperty('zFailSeverity'))
+ name = s.name()
+ if type(name) == type(u''):
+ name = name.encode(s.zCollectorDecoding)
+ svcs[name] = (s.getStatus(), s.getAqProperty('zFailSeverity'))
for dev in self.getSubDevices():
if not dev.monitorDevice(): continue
if getattr(dev, 'zWmiMonitorIgnore', False): continue
|
|
From: <sv...@ze...> - 2007-04-07 23:43:31
|
Author: ecn
Date: 2007-04-07 19:43:30 -0400 (Sat, 07 Apr 2007)
New Revision: 4590
Modified:
trunk/Products/ZenModel/IpInterface.py
Log:
#1086 get a default template if none is defined for this interface type
Modified: trunk/Products/ZenModel/IpInterface.py
===================================================================
--- trunk/Products/ZenModel/IpInterface.py 2007-04-07 23:26:11 UTC (rev 4589)
+++ trunk/Products/ZenModel/IpInterface.py 2007-04-07 23:43:30 UTC (rev 4590)
@@ -369,6 +369,13 @@
return self.prepId(self.type or "Unknown")
+ def getRRDTemplates(self):
+ default = self.getRRDTemplateByName(self.getRRDTemplateName())
+ if default:
+ return [default]
+ return [self.getRRDTemplateByName('ethernetCsmacd')]
+
+
def snmpIgnore(self):
"""Ignore interface that are operationally down.
"""
|
|
From: <sv...@ze...> - 2007-04-07 23:26:11
|
Author: ecn
Date: 2007-04-07 19:26:11 -0400 (Sat, 07 Apr 2007)
New Revision: 4589
Modified:
trunk/Products/ZenRRD/zenprocess.py
Log:
#1068 fixed in trunk
Modified: trunk/Products/ZenRRD/zenprocess.py
===================================================================
--- trunk/Products/ZenRRD/zenprocess.py 2007-04-07 21:21:06 UTC (rev 4588)
+++ trunk/Products/ZenRRD/zenprocess.py 2007-04-07 23:26:11 UTC (rev 4589)
@@ -35,6 +35,7 @@
import Globals
from Products.ZenUtils.Driver import drive, driveLater
from Products.ZenUtils.NJobs import NJobs
+from Products.ZenUtils.Chain import Chain
from Products.ZenModel.PerformanceConf import performancePath
from Products.ZenEvents import Event
from Products.ZenEvents.ZenEventClasses import Status_Snmp, Status_OSProcess
@@ -72,6 +73,10 @@
result.setdefault(v, []).append(a)
return result
+def chunk(lst, n):
+ 'break lst into n-sized chunks'
+ return [lst[i:i+n] for i in range(0, len(lst), n)]
+
def closer(value, device):
device.close()
return value
@@ -483,7 +488,7 @@
if not oids:
return defer.succeed(([], device))
- d = device.get(oids)
+ d = Chain(device.get, iter(chunk(oids, MAX_OIDS_PER_REQUEST))).run()
d.addBoth(self.storePerfStats, device)
return d
|
|
From: <sv...@ze...> - 2007-04-07 21:21:05
|
Author: ecn Date: 2007-04-07 17:21:06 -0400 (Sat, 07 Apr 2007) New Revision: 4588 Added: trunk/Products/ZenHub/services/ZenRender.py trunk/Products/ZenRRD/zenrender.py Log: * initial version of the RRD render server Added: trunk/Products/ZenHub/services/ZenRender.py Added: trunk/Products/ZenRRD/zenrender.py |
|
From: <sv...@ze...> - 2007-04-07 21:20:28
|
Author: ecn Date: 2007-04-07 17:20:29 -0400 (Sat, 07 Apr 2007) New Revision: 4587 Added: trunk/bin/zenrender Log: * adding the RRD render server Added: trunk/bin/zenrender Property changes on: trunk/bin/zenrender ___________________________________________________________________ Name: svn:executable + * |
|
From: <sv...@ze...> - 2007-04-07 21:20:04
|
Author: ecn Date: 2007-04-07 17:20:04 -0400 (Sat, 07 Apr 2007) New Revision: 4586 Modified: trunk/bin/zenhub Log: * remove trailing garbage Modified: trunk/bin/zenhub =================================================================== --- trunk/bin/zenhub 2007-04-07 19:22:45 UTC (rev 4585) +++ trunk/bin/zenhub 2007-04-07 21:20:04 UTC (rev 4586) @@ -8,4 +8,3 @@ PIDFILE=$VARDIR/$PRGNAME.pid generic "$@" -g |
|
From: <sv...@ze...> - 2007-04-07 19:22:44
|
Author: ecn
Date: 2007-04-07 15:22:45 -0400 (Sat, 07 Apr 2007)
New Revision: 4585
Modified:
trunk/Products/ZenRRD/zencommand.py
Log:
#1167 fixed
* count all the running jobs before starting any more
Modified: trunk/Products/ZenRRD/zencommand.py
===================================================================
--- trunk/Products/ZenRRD/zencommand.py 2007-04-07 19:21:43 UTC (rev 4584)
+++ trunk/Products/ZenRRD/zencommand.py 2007-04-07 19:22:45 UTC (rev 4585)
@@ -424,17 +424,18 @@
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,
+ self.timeout = reactor.callLater(max(1, earliest),
self.processSchedule)
except Exception, ex:
log.exception(ex)
|
|
From: <sv...@ze...> - 2007-04-07 19:21:44
|
Author: ecn
Date: 2007-04-07 15:21:43 -0400 (Sat, 07 Apr 2007)
New Revision: 4584
Modified:
trunk/Products/ZenRRD/zenperfsnmp.py
Log:
setErrorback? where did that come from?
Modified: trunk/Products/ZenRRD/zenperfsnmp.py
===================================================================
--- trunk/Products/ZenRRD/zenperfsnmp.py 2007-04-07 19:15:07 UTC (rev 4583)
+++ trunk/Products/ZenRRD/zenperfsnmp.py 2007-04-07 19:21:43 UTC (rev 4584)
@@ -446,7 +446,7 @@
out = StringIO()
reason.printTraceback(out)
self.log.error(reason)
- d.setErrback(d)
+ d.addErrback(printError)
def reportRate(self, *unused):
|
|
From: <sv...@ze...> - 2007-04-07 19:15:10
|
Author: ecn Date: 2007-04-07 15:15:07 -0400 (Sat, 07 Apr 2007) New Revision: 4583 Modified: trunk/inst/externallibs/pynetsnmp-0.1.tar.gz Log: added COPYRIGHT, etc Modified: trunk/inst/externallibs/pynetsnmp-0.1.tar.gz =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2007-04-07 19:14:06
|
Author: ecn Date: 2007-04-07 15:14:07 -0400 (Sat, 07 Apr 2007) New Revision: 4582 Added: tags/pynetsnmp-0.1/ Log: making release 0.1 Copied: tags/pynetsnmp-0.1 (from rev 4581, trunk/pynetsnmp) |
|
From: <sv...@ze...> - 2007-04-07 19:13:43
|
Author: ecn Date: 2007-04-07 15:13:44 -0400 (Sat, 07 Apr 2007) New Revision: 4581 Added: trunk/pynetsnmp/COPYRIGHT.txt trunk/pynetsnmp/LICENSE.txt Log: add copyright notice Added: trunk/pynetsnmp/COPYRIGHT.txt Added: trunk/pynetsnmp/LICENSE.txt |
|
From: <sv...@ze...> - 2007-04-07 19:12:58
|
Author: ecn Date: 2007-04-07 15:12:57 -0400 (Sat, 07 Apr 2007) New Revision: 4580 Removed: tags/pynetsnmp-0.1/ Log: cleanup |
|
From: <sv...@ze...> - 2007-04-07 19:11:07
|
Author: ecn Date: 2007-04-07 15:11:06 -0400 (Sat, 07 Apr 2007) New Revision: 4579 Added: trunk/inst/externallibs/pynetsnmp-0.1.tar.gz Log: pynetsnmp goes public Added: trunk/inst/externallibs/pynetsnmp-0.1.tar.gz Property changes on: trunk/inst/externallibs/pynetsnmp-0.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <sv...@ze...> - 2007-04-07 19:10:23
|
Author: ecn Date: 2007-04-07 15:10:22 -0400 (Sat, 07 Apr 2007) New Revision: 4578 Added: trunk/pynetsnmp/pkg Log: little tagging script Added: trunk/pynetsnmp/pkg Property changes on: trunk/pynetsnmp/pkg ___________________________________________________________________ Name: svn:executable + * |
|
From: <sv...@ze...> - 2007-04-07 19:07:47
|
Author: ecn Date: 2007-04-07 15:07:47 -0400 (Sat, 07 Apr 2007) New Revision: 4577 Added: tags/pynetsnmp-0.1/ Log: making release 0.1 Copied: tags/pynetsnmp-0.1 (from rev 4576, trunk/pynetsnmp) |
|
From: <sv...@ze...> - 2007-04-07 19:07:32
|
Author: ecn Date: 2007-04-07 15:07:27 -0400 (Sat, 07 Apr 2007) New Revision: 4576 Removed: tags/pynetsnmp-0.1/ Log: cleanup |
|
From: <sv...@ze...> - 2007-04-07 19:06:19
|
Author: ecn Date: 2007-04-07 15:06:18 -0400 (Sat, 07 Apr 2007) New Revision: 4575 Added: tags/pynetsnmp-0.1/ Log: making release 0.1 Copied: tags/pynetsnmp-0.1 (from rev 4574, trunk/pynetsnmp) |
|
From: <sv...@ze...> - 2007-04-07 19:06:11
|
Author: ecn Date: 2007-04-07 15:06:09 -0400 (Sat, 07 Apr 2007) New Revision: 4574 Removed: tags/pynetsnmp-0.1/ Log: cleanup |
|
From: <sv...@ze...> - 2007-04-07 19:05:27
|
Author: ecn Date: 2007-04-07 15:05:27 -0400 (Sat, 07 Apr 2007) New Revision: 4573 Added: tags/pynetsnmp-0.1/pynetsnmp/ Log: making release 0.1 Copied: tags/pynetsnmp-0.1/pynetsnmp (from rev 4572, trunk/pynetsnmp) |
|
From: <sv...@ze...> - 2007-04-07 18:55:53
|
Author: ecn Date: 2007-04-07 14:55:53 -0400 (Sat, 07 Apr 2007) New Revision: 4572 Added: tags/pynetsnmp-0.1/ Log: first internal release Copied: tags/pynetsnmp-0.1 (from rev 4571, trunk/pynetsnmp) |
|
From: <sv...@ze...> - 2007-04-07 18:55:52
|
Author: ecn Date: 2007-04-07 14:55:27 -0400 (Sat, 07 Apr 2007) New Revision: 4571 Removed: tags/pynetsnmp-0.1/ Log: cleanup |
