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-03 00:39:32
|
Author: chris
Date: 2007-04-02 20:39:31 -0400 (Mon, 02 Apr 2007)
New Revision: 4470
Modified:
trunk/Products/ZenHub/zenhub.py
Log:
fixed import error. too bad we don't have compile time checking ;-)
Modified: trunk/Products/ZenHub/zenhub.py
===================================================================
--- trunk/Products/ZenHub/zenhub.py 2007-04-02 23:45:28 UTC (rev 4469)
+++ trunk/Products/ZenHub/zenhub.py 2007-04-03 00:39:31 UTC (rev 4470)
@@ -34,8 +34,8 @@
from XmlRpcService import XmlRpcService
-from Event import EventService
-from PerformanceConfig import PerformanceConfig
+from services.EventService import EventService
+from services.PerformanceConfig import PerformanceConfig
import logging
log = logging.getLogger('zenhub')
|
|
From: <sv...@ze...> - 2007-04-02 23:45:28
|
Author: chris Date: 2007-04-02 19:45:28 -0400 (Mon, 02 Apr 2007) New Revision: 4469 Modified: trunk/bin/zenoss_init_post trunk/bin/zenoss_init_pre trunk/bin/zenoss_upgrade_post trunk/bin/zenoss_upgrade_pre Log: forgot the root username and password Modified: trunk/bin/zenoss_init_post =================================================================== --- trunk/bin/zenoss_init_post 2007-04-02 23:44:47 UTC (rev 4468) +++ trunk/bin/zenoss_init_post 2007-04-02 23:45:28 UTC (rev 4469) @@ -11,6 +11,8 @@ export OS_USERNAME="**OS_USERNAME**" export ZENHOME="**ZENHOME**" export MYSQLHOST="**MYSQL_HOST**" +export MYSQLROOTUSER="**MYSQL_ROOT_USERNAME**" +export MYSQLROOTPASSWD="**MYSQL_ROOT_PASSWD**" export MYSQLUSER="**MYSQL_USERNAME**" export MYSQLPASS="**MYSQL_PASSWD**" export MYSQLEVENTDB="**MYSQL_DATABASE**" Modified: trunk/bin/zenoss_init_pre =================================================================== --- trunk/bin/zenoss_init_pre 2007-04-02 23:44:47 UTC (rev 4468) +++ trunk/bin/zenoss_init_pre 2007-04-02 23:45:28 UTC (rev 4469) @@ -11,6 +11,8 @@ export OS_USERNAME="**OS_USERNAME**" export ZENHOME="**ZENHOME**" export MYSQLHOST="**MYSQL_HOST**" +export MYSQLROOTUSER="**MYSQL_ROOT_USERNAME**" +export MYSQLROOTPASSWD="**MYSQL_ROOT_PASSWD**" export MYSQLUSER="**MYSQL_USERNAME**" export MYSQLPASS="**MYSQL_PASSWD**" export MYSQLEVENTDB="**MYSQL_DATABASE**" Modified: trunk/bin/zenoss_upgrade_post =================================================================== --- trunk/bin/zenoss_upgrade_post 2007-04-02 23:44:47 UTC (rev 4468) +++ trunk/bin/zenoss_upgrade_post 2007-04-02 23:45:28 UTC (rev 4469) @@ -11,6 +11,8 @@ export OS_USERNAME="**OS_USERNAME**" export ZENHOME="**ZENHOME**" export MYSQLHOST="**MYSQL_HOST**" +export MYSQLROOTUSER="**MYSQL_ROOT_USERNAME**" +export MYSQLROOTPASSWD="**MYSQL_ROOT_PASSWD**" export MYSQLUSER="**MYSQL_USERNAME**" export MYSQLPASS="**MYSQL_PASSWD**" export MYSQLEVENTDB="**MYSQL_DATABASE**" Modified: trunk/bin/zenoss_upgrade_pre =================================================================== --- trunk/bin/zenoss_upgrade_pre 2007-04-02 23:44:47 UTC (rev 4468) +++ trunk/bin/zenoss_upgrade_pre 2007-04-02 23:45:28 UTC (rev 4469) @@ -11,6 +11,8 @@ export OS_USERNAME="**OS_USERNAME**" export ZENHOME="**ZENHOME**" export MYSQLHOST="**MYSQL_HOST**" +export MYSQLROOTUSER="**MYSQL_ROOT_USERNAME**" +export MYSQLROOTPASSWD="**MYSQL_ROOT_PASSWD**" export MYSQLUSER="**MYSQL_USERNAME**" export MYSQLPASS="**MYSQL_PASSWD**" export MYSQLEVENTDB="**MYSQL_DATABASE**" |
|
From: <sv...@ze...> - 2007-04-02 23:44:47
|
Author: chris
Date: 2007-04-02 19:44:47 -0400 (Mon, 02 Apr 2007)
New Revision: 4468
Modified:
trunk/inst/rpm/zenoss.spec
Log:
forgot the mysql root information and host
Modified: trunk/inst/rpm/zenoss.spec
===================================================================
--- trunk/inst/rpm/zenoss.spec 2007-04-02 23:14:01 UTC (rev 4467)
+++ trunk/inst/rpm/zenoss.spec 2007-04-02 23:44:47 UTC (rev 4468)
@@ -151,6 +151,9 @@
replace "**OS_USERNAME**" "%{os_username}" -- ${file}
replace "**ZENHOME**" "%{zenhome}" -- ${file}
replace "**MYSQL_HOST**" "localhost" -- ${file}
+ replace "**MYSQL_ROOT_USERNAME**" "root" -- ${file}
+ replace "**MYSQL_ROOT_PASSWD**" "" -- ${file}
+ replace "**MYSQL_HOST**" "localhost" -- ${file}
replace "**MYSQL_USERNAME**" "%{mysql_username}" -- ${file}
replace "**MYSQL_PASSWD**" "%{mysql_passwd}" -- ${file}
replace "**MYSQL_DATABASE**" "%{mysql_database}" -- ${file}
|
|
From: <sv...@ze...> - 2007-04-02 23:14:07
|
Author: chris
Date: 2007-04-02 19:14:01 -0400 (Mon, 02 Apr 2007)
New Revision: 4467
Modified:
trunk/inst/rpm/zenoss.spec
Log:
fs -> extras
Modified: trunk/inst/rpm/zenoss.spec
===================================================================
--- trunk/inst/rpm/zenoss.spec 2007-04-02 22:46:14 UTC (rev 4466)
+++ trunk/inst/rpm/zenoss.spec 2007-04-02 23:14:01 UTC (rev 4467)
@@ -165,7 +165,7 @@
cp ${ZEN_BUILD_DIR}/install-functions.sh ${ZEN_INST_DIR}/bin
# copy filesystem scripts to the real filesystem
-cd ${ZEN_BUILD_DIR}/fs
+cd ${ZEN_BUILD_DIR}/extras
for file in \
`find . -type f | grep -v .svn`
do
|
|
From: <sv...@ze...> - 2007-04-02 22:46:13
|
Author: chris Date: 2007-04-02 18:46:14 -0400 (Mon, 02 Apr 2007) New Revision: 4466 Modified: trunk/bin/zenoss_init_post trunk/bin/zenoss_init_pre trunk/bin/zenoss_upgrade_post trunk/bin/zenoss_upgrade_pre Log: include MYSQL_HOST as a variable that is replaced Modified: trunk/bin/zenoss_init_post =================================================================== --- trunk/bin/zenoss_init_post 2007-04-02 22:43:07 UTC (rev 4465) +++ trunk/bin/zenoss_init_post 2007-04-02 22:46:14 UTC (rev 4466) @@ -10,6 +10,7 @@ # environment variables export OS_USERNAME="**OS_USERNAME**" export ZENHOME="**ZENHOME**" +export MYSQLHOST="**MYSQL_HOST**" export MYSQLUSER="**MYSQL_USERNAME**" export MYSQLPASS="**MYSQL_PASSWD**" export MYSQLEVENTDB="**MYSQL_DATABASE**" Modified: trunk/bin/zenoss_init_pre =================================================================== --- trunk/bin/zenoss_init_pre 2007-04-02 22:43:07 UTC (rev 4465) +++ trunk/bin/zenoss_init_pre 2007-04-02 22:46:14 UTC (rev 4466) @@ -10,6 +10,7 @@ # environment variables export OS_USERNAME="**OS_USERNAME**" export ZENHOME="**ZENHOME**" +export MYSQLHOST="**MYSQL_HOST**" export MYSQLUSER="**MYSQL_USERNAME**" export MYSQLPASS="**MYSQL_PASSWD**" export MYSQLEVENTDB="**MYSQL_DATABASE**" Modified: trunk/bin/zenoss_upgrade_post =================================================================== --- trunk/bin/zenoss_upgrade_post 2007-04-02 22:43:07 UTC (rev 4465) +++ trunk/bin/zenoss_upgrade_post 2007-04-02 22:46:14 UTC (rev 4466) @@ -10,6 +10,7 @@ # environment variables export OS_USERNAME="**OS_USERNAME**" export ZENHOME="**ZENHOME**" +export MYSQLHOST="**MYSQL_HOST**" export MYSQLUSER="**MYSQL_USERNAME**" export MYSQLPASS="**MYSQL_PASSWD**" export MYSQLEVENTDB="**MYSQL_DATABASE**" Modified: trunk/bin/zenoss_upgrade_pre =================================================================== --- trunk/bin/zenoss_upgrade_pre 2007-04-02 22:43:07 UTC (rev 4465) +++ trunk/bin/zenoss_upgrade_pre 2007-04-02 22:46:14 UTC (rev 4466) @@ -10,6 +10,7 @@ # environment variables export OS_USERNAME="**OS_USERNAME**" export ZENHOME="**ZENHOME**" +export MYSQLHOST="**MYSQL_HOST**" export MYSQLUSER="**MYSQL_USERNAME**" export MYSQLPASS="**MYSQL_PASSWD**" export MYSQLEVENTDB="**MYSQL_DATABASE**" |
|
From: <sv...@ze...> - 2007-04-02 22:43:06
|
Author: chris
Date: 2007-04-02 18:43:07 -0400 (Mon, 02 Apr 2007)
New Revision: 4465
Modified:
trunk/inst/rpm/zenoss.spec
Log:
include MYSQL_HOST as localhost
Modified: trunk/inst/rpm/zenoss.spec
===================================================================
--- trunk/inst/rpm/zenoss.spec 2007-04-02 22:42:51 UTC (rev 4464)
+++ trunk/inst/rpm/zenoss.spec 2007-04-02 22:43:07 UTC (rev 4465)
@@ -150,6 +150,7 @@
do
replace "**OS_USERNAME**" "%{os_username}" -- ${file}
replace "**ZENHOME**" "%{zenhome}" -- ${file}
+ replace "**MYSQL_HOST**" "localhost" -- ${file}
replace "**MYSQL_USERNAME**" "%{mysql_username}" -- ${file}
replace "**MYSQL_PASSWD**" "%{mysql_passwd}" -- ${file}
replace "**MYSQL_DATABASE**" "%{mysql_database}" -- ${file}
|
|
From: <sv...@ze...> - 2007-04-02 22:42:50
|
Author: chris
Date: 2007-04-02 18:42:51 -0400 (Mon, 02 Apr 2007)
New Revision: 4464
Modified:
trunk/inst/install-functions.sh
Log:
look for mysqld and mysql...
Modified: trunk/inst/install-functions.sh
===================================================================
--- trunk/inst/install-functions.sh 2007-04-02 22:42:30 UTC (rev 4463)
+++ trunk/inst/install-functions.sh 2007-04-02 22:42:51 UTC (rev 4464)
@@ -179,7 +179,15 @@
# restart the mysql process
restart_mysql()
{
- /etc/init.d/mysql restart
+ for script in \
+ /etc/init.d/mysql \
+ /etc/init.d/mysqld
+ do
+ if [ -x ${script} ]; then
+ ${script} restart
+ break
+ fi
+ done
}
# adds localhost as a device via the web UI
|
|
From: <sv...@ze...> - 2007-04-02 22:42:29
|
Author: chris
Date: 2007-04-02 18:42:30 -0400 (Mon, 02 Apr 2007)
New Revision: 4463
Modified:
trunk/scripts/zenpkg
Log:
copy the fs directory to dest/extras so that it can be included in the tarball
Modified: trunk/scripts/zenpkg
===================================================================
--- trunk/scripts/zenpkg 2007-04-02 22:41:32 UTC (rev 4462)
+++ trunk/scripts/zenpkg 2007-04-02 22:42:30 UTC (rev 4463)
@@ -154,7 +154,8 @@
os.chdir(tagname)
dest = "%s/%s" % (TEMP_DIR, tagname)
run("mkdir -p %s" % dest)
- run("cp -r fs conf externallibs %s" % dest)
+ run("cp -r conf externallibs %s" % dest)
+ run("cp -r fs %s/extras" % dest)
run("cp *-functions.sh %s" % dest)
run("cp GNUmakefile %s" % dest)
run("cp -r %s %s" % (opts.LIBZENOSS_ROOT, dest))
|
|
From: <sv...@ze...> - 2007-04-02 22:41:31
|
Author: chris
Date: 2007-04-02 18:41:32 -0400 (Mon, 02 Apr 2007)
New Revision: 4462
Modified:
trunk/inst/GNUmakefile
Log:
include extras in the libzenoss extractions. also include it in svn ups
Modified: trunk/inst/GNUmakefile
===================================================================
--- trunk/inst/GNUmakefile 2007-04-02 21:59:57 UTC (rev 4461)
+++ trunk/inst/GNUmakefile 2007-04-02 22:41:32 UTC (rev 4462)
@@ -370,6 +370,7 @@
echo updating Zenoss from svn ; \
$(SVNCMD) update Products $(LOG) ; \
$(SVNCMD) update bin $(LOG) ; \
+ $(SVNCMD) update extras $(LOG) ; \
else \
echo checking out Zenoss from svn: branch $(SVNTAG) ; \
$(SVNGET) $(SVNURL)/$(SVNTAG)/Products Products $(LOG) ; \
@@ -381,7 +382,7 @@
libzenoss-install: always
@mkdir -p $(DESTDIR)$(ZENHOME) ; \
cd $(DESTDIR)$(ZENHOME) ; \
- for i in Products bin ; do \
+ for i in Products bin extras ; do \
echo installing libzenos/$$i.tar.gz ; \
tar -xzf $(INSTDIR)/libzenoss/$$i.tar.gz ; \
done
|
|
From: <sv...@ze...> - 2007-04-02 21:59:56
|
Author: ecn
Date: 2007-04-02 17:59:57 -0400 (Mon, 02 Apr 2007)
New Revision: 4461
Added:
trunk/Products/ZenHub/services/__init__.py
Modified:
trunk/Products/ZenHub/services/
trunk/Products/ZenHub/services/EventService.py
trunk/Products/ZenHub/services/PerformanceConfig.py
Log:
* plugin services
Property changes on: trunk/Products/ZenHub/services
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Modified: trunk/Products/ZenHub/services/EventService.py
===================================================================
--- trunk/Products/ZenHub/services/EventService.py 2007-04-02 21:54:51 UTC (rev 4460)
+++ trunk/Products/ZenHub/services/EventService.py 2007-04-02 21:59:57 UTC (rev 4461)
@@ -9,12 +9,11 @@
def remote_sendEvent(self, evt):
'XMLRPC requests are processed asynchronously in a thread'
- if type(evt) == dict:
- evt = Event(**data)
return self.zem.sendEvent(evt)
def remote_sendEvents(self, evts):
- if len(evts) and type(evts[0]) == dict:
- evts = [Event(**e) for e in data]
return self.zem.sendEvents(evts)
+ def remote_getDevicePingIssues(self, *args, **kwargs):
+ return self.zem.getDevicePingIssues(*args, **kwargs)
+
Modified: trunk/Products/ZenHub/services/PerformanceConfig.py
===================================================================
--- trunk/Products/ZenHub/services/PerformanceConfig.py 2007-04-02 21:54:51 UTC (rev 4460)
+++ trunk/Products/ZenHub/services/PerformanceConfig.py 2007-04-02 21:59:57 UTC (rev 4461)
@@ -17,3 +17,6 @@
def remote_getSnmpStatus(self, *args, **kwargs):
return self._getOb().getSnmpStatus(*args, **kwargs)
+ def remote_getDefaultRRDCreateCommand(self, *args, **kwargs):
+ return self._getOb().getDefaultRRDCreateCommand(*args, **kwargs)
+
Added: trunk/Products/ZenHub/services/__init__.py
|
|
From: <sv...@ze...> - 2007-04-02 21:54:52
|
Author: chris Date: 2007-04-02 17:54:51 -0400 (Mon, 02 Apr 2007) New Revision: 4460 Modified: trunk/inst/rpm/centos43.deps trunk/inst/rpm/centos492.deps trunk/inst/rpm/fc6.deps trunk/inst/rpm/rhel5.deps Log: forgot those dang blasted slashies Modified: trunk/inst/rpm/centos43.deps =================================================================== --- trunk/inst/rpm/centos43.deps 2007-04-02 21:46:38 UTC (rev 4459) +++ trunk/inst/rpm/centos43.deps 2007-04-02 21:54:51 UTC (rev 4460) @@ -1,6 +1,6 @@ -BuildRequires: MySQL-devel-standard >= 5.0.22 -BuildRequires: MySQL-shared-standard >= 5.0.22 -BuildRequires: MySQL-server-standard >= 5.0.22 +BuildRequires: MySQL-devel-standard >= 5.0.22 \ +BuildRequires: MySQL-shared-standard >= 5.0.22 \ +BuildRequires: MySQL-server-standard >= 5.0.22 \ Requires: MySQL-server-standard >= 5.0.22 \ Requires: MySQL-client-standard >= 5.0.22 \ Requires: python >= 2.3.4 \ Modified: trunk/inst/rpm/centos492.deps =================================================================== --- trunk/inst/rpm/centos492.deps 2007-04-02 21:46:38 UTC (rev 4459) +++ trunk/inst/rpm/centos492.deps 2007-04-02 21:54:51 UTC (rev 4460) @@ -1,5 +1,5 @@ -BuildRequires: mysql-devel >= 5.0.22 -BuildRequires: mysql >= 5.0.22 +BuildRequires: mysql-devel >= 5.0.22 \ +BuildRequires: mysql >= 5.0.22 \ Requires: mysql-server >= 5.0.22 \ Requires: mysql >= 5.0.22 \ Requires: python >= 2.3.4 \ Modified: trunk/inst/rpm/fc6.deps =================================================================== --- trunk/inst/rpm/fc6.deps 2007-04-02 21:46:38 UTC (rev 4459) +++ trunk/inst/rpm/fc6.deps 2007-04-02 21:54:51 UTC (rev 4460) @@ -1,5 +1,5 @@ -BuildRequires: mysql-devel >= 5.0.22 -BuildRequires: mysql >= 5.0.22 +BuildRequires: mysql-devel >= 5.0.22 \ +BuildRequires: mysql >= 5.0.22 \ Requires: mysql-server >= 5.0.22 \ Requires: mysql >= 5.0.22 \ Requires: python >= 2.3.4 \ Modified: trunk/inst/rpm/rhel5.deps =================================================================== --- trunk/inst/rpm/rhel5.deps 2007-04-02 21:46:38 UTC (rev 4459) +++ trunk/inst/rpm/rhel5.deps 2007-04-02 21:54:51 UTC (rev 4460) @@ -1,5 +1,5 @@ -BuildRequires: mysql-devel >= 5.0.22 -BuildRequires: mysql >= 5.0.22 +BuildRequires: mysql-devel >= 5.0.22 \ +BuildRequires: mysql >= 5.0.22 \ Requires: mysql-server >= 5.0.22 \ Requires: mysql >= 5.0.22 \ Requires: python >= 2.3.4 \ |
|
From: <sv...@ze...> - 2007-04-02 21:46:40
|
Author: chris
Date: 2007-04-02 17:46:38 -0400 (Mon, 02 Apr 2007)
New Revision: 4459
Modified:
trunk/inst/rpm/centos43.deps
trunk/inst/rpm/centos492.deps
trunk/inst/rpm/fc6.deps
trunk/inst/rpm/rhel5.deps
trunk/inst/rpm/zenoss.spec
Log:
moved additional build requirements into distro specific deps files
Modified: trunk/inst/rpm/centos43.deps
===================================================================
--- trunk/inst/rpm/centos43.deps 2007-04-02 20:56:53 UTC (rev 4458)
+++ trunk/inst/rpm/centos43.deps 2007-04-02 21:46:38 UTC (rev 4459)
@@ -1,3 +1,6 @@
+BuildRequires: MySQL-devel-standard >= 5.0.22
+BuildRequires: MySQL-shared-standard >= 5.0.22
+BuildRequires: MySQL-server-standard >= 5.0.22
Requires: MySQL-server-standard >= 5.0.22 \
Requires: MySQL-client-standard >= 5.0.22 \
Requires: python >= 2.3.4 \
Modified: trunk/inst/rpm/centos492.deps
===================================================================
--- trunk/inst/rpm/centos492.deps 2007-04-02 20:56:53 UTC (rev 4458)
+++ trunk/inst/rpm/centos492.deps 2007-04-02 21:46:38 UTC (rev 4459)
@@ -1,3 +1,5 @@
+BuildRequires: mysql-devel >= 5.0.22
+BuildRequires: mysql >= 5.0.22
Requires: mysql-server >= 5.0.22 \
Requires: mysql >= 5.0.22 \
Requires: python >= 2.3.4 \
Modified: trunk/inst/rpm/fc6.deps
===================================================================
--- trunk/inst/rpm/fc6.deps 2007-04-02 20:56:53 UTC (rev 4458)
+++ trunk/inst/rpm/fc6.deps 2007-04-02 21:46:38 UTC (rev 4459)
@@ -1,3 +1,5 @@
+BuildRequires: mysql-devel >= 5.0.22
+BuildRequires: mysql >= 5.0.22
Requires: mysql-server >= 5.0.22 \
Requires: mysql >= 5.0.22 \
Requires: python >= 2.3.4 \
Modified: trunk/inst/rpm/rhel5.deps
===================================================================
--- trunk/inst/rpm/rhel5.deps 2007-04-02 20:56:53 UTC (rev 4458)
+++ trunk/inst/rpm/rhel5.deps 2007-04-02 21:46:38 UTC (rev 4459)
@@ -1,3 +1,5 @@
+BuildRequires: mysql-devel >= 5.0.22
+BuildRequires: mysql >= 5.0.22
Requires: mysql-server >= 5.0.22 \
Requires: mysql >= 5.0.22 \
Requires: python >= 2.3.4 \
Modified: trunk/inst/rpm/zenoss.spec
===================================================================
--- trunk/inst/rpm/zenoss.spec 2007-04-02 20:56:53 UTC (rev 4458)
+++ trunk/inst/rpm/zenoss.spec 2007-04-02 21:46:38 UTC (rev 4459)
@@ -50,9 +50,6 @@
Source0: %{name}-%{version}-%{release}.tar.bz2
Prereq: /usr/sbin/useradd
Prereq: /usr/sbin/userdel
-BuildRequires: MySQL-devel-standard >= 5.0.22
-BuildRequires: MySQL-shared-standard >= 5.0.22
-BuildRequires: MySQL-server-standard >= 5.0.22
BuildRequires: python-devel >= 2.3.4
BuildRequires: python >= 2.3.4
BuildRequires: sudo
|
|
From: <sv...@ze...> - 2007-04-02 20:56:53
|
Author: ecn Date: 2007-04-02 16:56:53 -0400 (Mon, 02 Apr 2007) New Revision: 4458 Added: trunk/Products/ZenHub/services/EventService.py Removed: trunk/Products/ZenHub/services/Event.py Log: * rename EventService for consistency Deleted: trunk/Products/ZenHub/services/Event.py Copied: trunk/Products/ZenHub/services/EventService.py (from rev 4457, trunk/Products/ZenHub/services/Event.py) |
|
From: <sv...@ze...> - 2007-04-02 20:56:04
|
Author: ecn Date: 2007-04-02 16:56:05 -0400 (Mon, 02 Apr 2007) New Revision: 4457 Added: trunk/Products/ZenHub/services/Event.py trunk/Products/ZenHub/services/PerformanceConfig.py Log: * move services to their own directory Copied: trunk/Products/ZenHub/services/Event.py (from rev 4455, trunk/Products/ZenHub/Event.py) Copied: trunk/Products/ZenHub/services/PerformanceConfig.py (from rev 4455, trunk/Products/ZenHub/PerformanceConfig.py) |
|
From: <sv...@ze...> - 2007-04-02 20:55:58
|
Author: ecn Date: 2007-04-02 16:55:49 -0400 (Mon, 02 Apr 2007) New Revision: 4456 Removed: trunk/Products/ZenHub/Event.py trunk/Products/ZenHub/PerformanceConfig.py Log: * move services to their own directory Deleted: trunk/Products/ZenHub/Event.py Deleted: trunk/Products/ZenHub/PerformanceConfig.py |
|
From: <sv...@ze...> - 2007-04-02 20:54:39
|
Author: ecn
Date: 2007-04-02 16:54:39 -0400 (Mon, 02 Apr 2007)
New Revision: 4455
Added:
trunk/Products/ZenHub/Event.py
trunk/Products/ZenHub/PerformanceConfig.py
trunk/Products/ZenHub/services/
Removed:
trunk/Products/ZenHub/EventService.py
Modified:
trunk/Products/ZenHub/HubService.py
trunk/Products/ZenHub/zenhub.py
Log:
* enough hubbarry to get zenperfsnmp limping along
Copied: trunk/Products/ZenHub/Event.py (from rev 4443, trunk/Products/ZenHub/EventService.py)
Deleted: trunk/Products/ZenHub/EventService.py
Modified: trunk/Products/ZenHub/HubService.py
===================================================================
--- trunk/Products/ZenHub/HubService.py 2007-04-02 20:51:36 UTC (rev 4454)
+++ trunk/Products/ZenHub/HubService.py 2007-04-02 20:54:39 UTC (rev 4455)
@@ -3,12 +3,8 @@
class HubService(pb.Referenceable):
- def __init__(self, dmd):
+ def __init__(self, dmd, instance = None):
self.dmd = dmd
self.zem = dmd.ZenEventManager
+ self.instance = instance
-
- def getName(self):
- """Return the service name
- """
- return self.__class__.__name__
Added: trunk/Products/ZenHub/PerformanceConfig.py
Modified: trunk/Products/ZenHub/zenhub.py
===================================================================
--- trunk/Products/ZenHub/zenhub.py 2007-04-02 20:51:36 UTC (rev 4454)
+++ trunk/Products/ZenHub/zenhub.py 2007-04-02 20:54:39 UTC (rev 4455)
@@ -33,12 +33,14 @@
from Products.ZenEvents.ZenEventClasses import App_Start, App_Stop
from XmlRpcService import XmlRpcService
-from EventService import EventService
+from Event import EventService
+from PerformanceConfig import PerformanceConfig
+
import logging
log = logging.getLogger('zenhub')
-SERVICE_CLASSES = (EventService,)
+SERVICE_CLASSES = (EventService, PerformanceConfig)
XML_RPC_PORT = 8081
PB_PORT = 8789
@@ -49,12 +51,8 @@
def __init__(self, hub):
self.hub = hub
- def perspective_getService(self, serviceName, collector):
- if not self.hub.services.has_key(serviceName):
- return None
- svc = self.hub.services[serviceName]
- # svc.addCollector[collector.getName()] = collector
- return svc
+ def perspective_getService(self, serviceName, instance):
+ return self.hub.getService(serviceName, instance)
@@ -83,7 +81,6 @@
ZCmdBase.__init__(self)
self.zem = self.dmd.ZenEventManager
self.services = {}
- self.buildServices()
er = HubRealm(self)
pt = portal.Portal(er, self.loadCheckers())
@@ -111,10 +108,15 @@
return []
- def buildServices(self):
- for svcClass in SERVICE_CLASSES:
- svc = svcClass(self.dmd)
- self.services[svc.getName()] = svc
+ def getService(self, name, instance):
+ try:
+ return self.services[name, instance]
+ except KeyError:
+ for ctor in SERVICE_CLASSES:
+ if ctor.__name__ == name:
+ svc = ctor(self.dmd, instance)
+ self.services[name, instance] = svc
+ return svc
def heartbeat(self):
|
|
From: <sv...@ze...> - 2007-04-02 20:51:39
|
Author: ecn
Date: 2007-04-02 16:51:36 -0400 (Mon, 02 Apr 2007)
New Revision: 4454
Modified:
trunk/Products/ZenModel/skins/zenmodel/zPropertyEdit.pt
Log:
* get rid of duplicate entry for lines
Modified: trunk/Products/ZenModel/skins/zenmodel/zPropertyEdit.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/zPropertyEdit.pt 2007-04-02 20:11:51 UTC (rev 4453)
+++ trunk/Products/ZenModel/skins/zenmodel/zPropertyEdit.pt 2007-04-02 20:51:36 UTC (rev 4454)
@@ -78,12 +78,6 @@
<!-- =========== swoopy sortable selector =============== -->
</tal:block>
</span>
- <span tal:condition="python: ptype=='text'">
- <textarea class="tablevalues" rows='5' cols="33"
- tal:attributes="name python:prop+':'+ptype"
- tal:content="pvalue">
- </textarea>
- </span>
<span tal:condition="python: prop=='zEventSeverity'">
<select class="tablevalues"
tal:attributes="name python:prop+':'+ptype">
|
|
From: <sv...@ze...> - 2007-04-02 20:11:57
|
Author: ecn Date: 2007-04-02 16:11:51 -0400 (Mon, 02 Apr 2007) New Revision: 4453 Removed: trunk/Products/ZenHub/pbserver.py Log: * remove example server Deleted: trunk/Products/ZenHub/pbserver.py |
|
From: <sv...@ze...> - 2007-04-02 20:08:11
|
Author: ecn Date: 2007-04-02 16:08:11 -0400 (Mon, 02 Apr 2007) New Revision: 4452 Added: trunk/Products/ZenHub/pbClient.py trunk/Products/ZenHub/xmlClient.py Removed: trunk/Products/ZenHub/client1.py trunk/Products/ZenHub/client2.py Log: * name clients better Deleted: trunk/Products/ZenHub/client1.py Deleted: trunk/Products/ZenHub/client2.py Copied: trunk/Products/ZenHub/pbClient.py (from rev 4447, trunk/Products/ZenHub/client1.py) Copied: trunk/Products/ZenHub/xmlClient.py (from rev 4447, trunk/Products/ZenHub/client2.py) |
|
From: <sv...@ze...> - 2007-04-02 20:06:51
|
Author: ecn Date: 2007-04-02 16:06:51 -0400 (Mon, 02 Apr 2007) New Revision: 4451 Added: trunk/bin/zenhub Modified: trunk/bin/zenoss Log: * add zenhubificator Added: trunk/bin/zenhub Property changes on: trunk/bin/zenhub ___________________________________________________________________ Name: svn:executable + * Modified: trunk/bin/zenoss =================================================================== --- trunk/bin/zenoss 2007-04-02 19:55:04 UTC (rev 4450) +++ trunk/bin/zenoss 2007-04-02 20:06:51 UTC (rev 4451) @@ -32,7 +32,7 @@ C= C="$C zeoctl" C="$C zopectl" -C="$C zenxevent" +C="$C zenhub" C="$C zenmodeler" C="$C zenperfsnmp" C="$C zenperfxmlrpc" |
|
From: <sv...@ze...> - 2007-04-02 19:55:13
|
Author: chris
Date: 2007-04-02 15:55:04 -0400 (Mon, 02 Apr 2007)
New Revision: 4450
Modified:
trunk/scripts/zenpkg
Log:
added the distro= option, which allows you to explicitly control the deps that are embedded within the RPM
Modified: trunk/scripts/zenpkg
===================================================================
--- trunk/scripts/zenpkg 2007-04-02 19:21:53 UTC (rev 4449)
+++ trunk/scripts/zenpkg 2007-04-02 19:55:04 UTC (rev 4450)
@@ -20,6 +20,7 @@
--src-branch: The source to create the tag from
--infer: Infer version from trunk (no tagname required)
--release: The release (e.g. 1.1.0-N) used when building the RPM
+ --distro: The targetted Linux distribution (used for deps calculation)
Aliases:
--pretend: Equates to: --no-tag --no-commit
@@ -54,6 +55,7 @@
CREATE_RPM=TRUE,
INFER=FALSE,
RELEASE=0,
+ DISTRO="centos43",
COMMIT_SPEC_CHANGES=TRUE)
@@ -106,12 +108,12 @@
return parts[1]
-def update_specfile(tagname, release):
+def update_specfile(tagname, release, distro):
'''updates the zenoss.spec in the tag provided and sets the trunk flag
to false and sets the version and revision information.'''
# location of the rpmbuild spec file to update
- SPECFILE = "zenoss.spec"
+ SPECFILE = "rpm/zenoss.spec"
# set the trunk flag to false
replace("^%define trunk.*", "%define trunk 0", SPECFILE)
@@ -127,8 +129,24 @@
if opts.COMMIT_SPEC_CHANGES:
run("svn commit -m ' * synchronized with tagname by zenpkg' %s" % SPECFILE)
+ # replace the Requires section. do this after the commit!
+ filename = 'rpm/%s.deps' % distro
+ if not os.path.exists(filename):
+ print "warning: deps for platform '%s' don't exist" % distro
+ print 'file not found: %s/%s' % (os.path.abspath('.'), filename)
+ else:
+ # do the Requires: replace
+ requires = open(filename).read()
+ replace("^# distro-specific requires", requires, SPECFILE)
-def create_rpm(tagname, release):
+ # also update the Release to include the distro so that we get the distro
+ # information in the generated RPM filename
+ replace("^Release:.*", "Release: %s.%s" % (release, distro), SPECFILE)
+
+
+
+
+def create_rpm(tagname, release, distro):
TEMP_DIR = "rpmtarball-root"
cur = os.getcwd()
@@ -143,11 +161,11 @@
# tar up the temporary location into a tarball in ~redhat/SOURCES
os.chdir(TEMP_DIR)
- run("tar cjf ~/redhat/SOURCES/%s-%s.tar.bz2 %s" % (tagname, release, tagname))
+ run("tar cjf ~/redhat/SOURCES/%s-%s.%s.tar.bz2 %s" % (tagname, release, distro, tagname))
# copy the spec file
os.chdir(os.path.join(cur, tagname))
- run("cp zenoss.spec ~/redhat/SPECS")
+ run("cp rpm/zenoss.spec ~/redhat/SPECS")
shutil.rmtree(TEMP_DIR)
# build the RPM
@@ -174,6 +192,7 @@
"no-commit",
"src-branch=",
"release=",
+ "distro=",
"pretend",
"infer",
"nightly"])
@@ -211,6 +230,9 @@
if o in ('--release'):
opts.RELEASE = a
+ if o in ('--distro'):
+ opts.DISTRO = a
+
if o in ('--nightly'):
opts.INFER = TRUE
opts.CREATE_TAG = FALSE
@@ -331,7 +353,7 @@
# update the zenoss.spec in the tag to reflect the new version
os.chdir("%s/%s" % (root,tagname))
- update_specfile(tagname, opts.RELEASE)
+ update_specfile(tagname, opts.RELEASE, opts.DISTRO)
# remove the .svn directories
run("find . -name .svn | xargs rm -rf")
@@ -342,7 +364,7 @@
# create the rpm
if opts.CREATE_RPM:
- create_rpm(tagname, opts.RELEASE)
+ create_rpm(tagname, opts.RELEASE, opts.DISTRO)
# package up the zenplugins
os.chdir(root)
|
|
From: <sv...@ze...> - 2007-04-02 19:21:52
|
Author: edahl
Date: 2007-04-02 15:21:53 -0400 (Mon, 02 Apr 2007)
New Revision: 4449
Modified:
trunk/inst/docs/INSTALL_FC6.txt
Log:
* updates for non-generic mysql install
Modified: trunk/inst/docs/INSTALL_FC6.txt
===================================================================
--- trunk/inst/docs/INSTALL_FC6.txt 2007-04-02 19:19:06 UTC (rev 4448)
+++ trunk/inst/docs/INSTALL_FC6.txt 2007-04-02 19:21:53 UTC (rev 4449)
@@ -20,6 +20,8 @@
run yum, issue the following command:
# yum -y install net-snmp net-snmp-utils perl-Digest-HMAC perl-DBI
+ # yum -y install mysql mysql-server
+ # yum -y install net-snmp net-snmp-utils perl-Net-SNMP
2. Zenoss also depends on some RPMs that are not included in YUM
|
|
From: <sv...@ze...> - 2007-04-02 19:19:06
|
Author: chris Date: 2007-04-02 15:19:06 -0400 (Mon, 02 Apr 2007) New Revision: 4448 Added: trunk/inst/rpm/rhel5.deps Log: added Added: trunk/inst/rpm/rhel5.deps |
|
From: <sv...@ze...> - 2007-04-02 18:43:17
|
Author: ecn
Date: 2007-04-02 14:43:18 -0400 (Mon, 02 Apr 2007)
New Revision: 4447
Modified:
trunk/Products/ZenHub/client1.py
trunk/Products/ZenHub/client2.py
trunk/Products/ZenHub/zenhub.py
Log:
* synching code
Modified: trunk/Products/ZenHub/client1.py
===================================================================
--- trunk/Products/ZenHub/client1.py 2007-04-02 18:19:28 UTC (rev 4446)
+++ trunk/Products/ZenHub/client1.py 2007-04-02 18:43:18 UTC (rev 4447)
@@ -3,25 +3,29 @@
from twisted.spread import pb
from twisted.internet import reactor
from twisted.cred import credentials
+from socket import getfqdn
import Globals
from Products.ZenUtils.Driver import drive
+from Products.ZenEvents.Event import Event
-import zenhub
+from zenhub import PB_PORT
def main():
def go(driver):
factory = pb.PBClientFactory()
- reactor.connectTCP("localhost", zenhub.PB_PORT, factory)
-
+ reactor.connectTCP("localhost", PB_PORT, factory)
+
yield factory.login(credentials.UsernamePassword("zenoss", "zenoss"))
perspective = driver.next()
- print 'got perspective', perspective
yield perspective.callRemote('getService', 'EventService', 'client1')
service = driver.next()
- print 'got service', service
+ service.sendEvent(Event(device=getfqdn(),
+ summary="This is a test",
+ severity=5))
+
drive(go).addBoth(lambda x: reactor.stop())
reactor.run()
Modified: trunk/Products/ZenHub/client2.py
===================================================================
--- trunk/Products/ZenHub/client2.py 2007-04-02 18:19:28 UTC (rev 4446)
+++ trunk/Products/ZenHub/client2.py 2007-04-02 18:43:18 UTC (rev 4447)
@@ -6,8 +6,11 @@
def main():
proxy = ServerProxy('http://localhost:%d' % XML_RPC_PORT)
- proxy.sendEvent(summary='This is an event',
- device=getfqdn(),
- component='test',
- severity=5)
+ proxy.sendEvent(dict(summary='This is an event',
+ device=getfqdn(),
+ Class='/Status/Ping',
+ component='test',
+ severity=5))
print proxy.getDevicePingIssues()
+
+main()
Modified: trunk/Products/ZenHub/zenhub.py
===================================================================
--- trunk/Products/ZenHub/zenhub.py 2007-04-02 18:19:28 UTC (rev 4446)
+++ trunk/Products/ZenHub/zenhub.py 2007-04-02 18:43:18 UTC (rev 4447)
@@ -35,6 +35,9 @@
from XmlRpcService import XmlRpcService
from EventService import EventService
+import logging
+log = logging.getLogger('zenhub')
+
SERVICE_CLASSES = (EventService,)
XML_RPC_PORT = 8081
@@ -62,6 +65,7 @@
self.hubAvitar = HubAvitar(hub)
def requestAvatar(self, collName, mind, *interfaces):
+ log.debug('collName %s' % collName)
if pb.IPerspective not in interfaces:
raise NotImplementedError
return pb.IPerspective, self.hubAvitar, lambda:None
@@ -103,7 +107,7 @@
try:
return [checkers.FilePasswordDB(self.options.passwordfile)]
except Exception, ex:
- self.log.exception("Unable to load %s", self.options.passwordfile)
+ log.exception("Unable to load %s", self.options.passwordfile)
return []
|
|
From: <sv...@ze...> - 2007-04-02 18:19:28
|
Author: chris Date: 2007-04-02 14:19:28 -0400 (Mon, 02 Apr 2007) New Revision: 4446 Added: trunk/inst/rpm/centos492.deps trunk/inst/rpm/fc6.deps Log: added. Added: trunk/inst/rpm/centos492.deps Added: trunk/inst/rpm/fc6.deps |
