X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=3c2a2d6469df828c50ef511c26851ee2cc0b074c;hb=152fe04e5cf508fa5718ce0a4acaa434a543df73;hp=c48facfa0306b3f86e3f1f38c08ef5309c157cff;hpb=19ba97634589f5cce3719dbe0f96d94e3e148e1d;p=monitor.git diff --git a/Monitor.spec b/Monitor.spec index c48facf..3c2a2d6 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -5,8 +5,8 @@ %define url $URL: svn+ssh://svn.planet-lab.org/svn/monitor/trunk/monitor.spec $ %define name monitor -%define version 1.1 -%define taglevel 0 +%define version 2.0 +%define taglevel 8 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -33,6 +33,8 @@ system, syncing the PLC db with the monitoring database, notifying users, interacting with PCU hardware, applying penalties to sites that violate acceptable use. +######################################## CLIENT + %package client Summary: Monitor hooks for a PLC node Group: Applications/System @@ -45,6 +47,7 @@ include configuration setup for the monitoring agent running on the node. It will also include any cron or init scripts needed to perform this kind of maintenance. +######################################## Server %package server Summary: Monitor hooks for the PLC server. Group: Applications/System @@ -71,13 +74,36 @@ The server side include all python modules and scripts needed to fully operation, track, and interact with any third-party monitoring software, such as Zabbix DB. +######################################## PCU Control + +%package pcucontrol +summary: pcu controls for monitor and plcapi +group: applications/system +requires: python + +%description pcucontrol +both monitor and the plcapi use a set of common commands to reboot machines +using their external or internal pcus. this package is a library of several +supported models. + +####################################### RunlevelAgent +%package runlevelagent +summary: the RunlevelAgent that reports node runlevels +group: applications/system +requires: python + +%description runlevelagent +The RunlevelAgent starts as early as possible during boot-up and production +mode to actively report the observed runlevel to PLC and update the +'last_contact' field. + %prep %setup -q %build # NOTE: the build uses g++ cmdamt/ # NOTE: TMPDIR is needed here b/c the tmpfs of the build vserver is too small. -cd cmdamt +cd pcucontrol/models/intelamt export TMPDIR=$PWD/tmp make cd .. @@ -117,6 +143,7 @@ rsync -a monitor/ $RPM_BUILD_ROOT/%{python_sitearch}/monitor/ #for file in __init__.py database.py config.py ; do # install -D -m 644 monitor/$file $RPM_BUILD_ROOT/%{python_sitearch}/monitor/$file #done +rsync -a pcucontrol/ $RPM_BUILD_ROOT/%{python_sitearch}/pcucontrol/ install -D -m 755 threadpool.py $RPM_BUILD_ROOT/%{python_sitearch}/threadpool.py touch $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/monitorconfig.php @@ -125,13 +152,19 @@ chmod 777 $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/monitorconfig.php #install -D -m 755 monitor-default.conf $RPM_BUILD_ROOT/etc/monitor.conf #cp $RPM_BUILD_ROOT/usr/share/%{name}/monitorconfig-default.py $RPM_BUILD_ROOT/usr/share/%{name}/monitorconfig.py +#################### RunlevelAgent +install -D -m 755 RunlevelAgent.py $RPM_BUILD_ROOT/usr/bin/RunlevelAgent.py +install -D -m 755 monitor-runlevelagent.init $RPM_BUILD_ROOT/%{_initrddir}/monitor-runlevelagent + + %clean rm -rf $RPM_BUILD_ROOT + %files server %defattr(-,root,root) -%config /usr/share/%{name}/monitorconfig.py -%config /etc/monitor.conf +#%config /usr/share/%{name}/monitorconfig.py +#%config /etc/monitor.conf /usr/share/%{name} /var/lib/%{name} /var/www/cgi-bin/monitor @@ -147,18 +180,30 @@ rm -rf $RPM_BUILD_ROOT %{_initrddir}/monitor %{_sysconfdir}/cron.d/monitor +%files pcucontrol +%{python_sitearch}/pcucontrol + +%files runlevelagent +/usr/bin/RunlevelAgent.py +/usr/bin/RunlevelAgent.pyo +/usr/bin/RunlevelAgent.pyc +/%{_initrddir}/monitor-runlevelagent + %post server # TODO: this will be nice when we have a web-based service running., such as # an API server or so on. # TODO: create real monitorconfig.py from monitorconfig-default.py # TODO: create monitorconfig.php using phpconfig.py -# TODO: create symlink in /var/lib/monitor-server for chroot environments +# TODO: create symlink in /var/lib/monitor for chroot environments # TODO: update the content of automate_pl03.sh # TODO: Use the installed version of bootcd to create custom boot images. ( or, use the api now). # NOTE: generate the python defines from zabbix include files. php /usr/share/%{name}/zabbix/getdefines.php > %{python_sitearch}/monitor/database/zabbixapi/defines.py +# apply patches to zabbix +patch -d /var/www/html/zabbix/ -p0 < /usr/share/%{name}/zabbix/zabbix-auto-login.diff + #chkconfig --add monitor-server #chkconfig monitor-server on @@ -166,7 +211,49 @@ php /usr/share/%{name}/zabbix/getdefines.php > %{python_sitearch}/monitor/databa chkconfig --add monitor chkconfig monitor on +%post runlevelagent +chkconfig --add monitor-runlevelagent +chkconfig monitor-runlevelagent on + %changelog +* Wed Apr 01 2009 Stephen Soltesz - Monitor-2.0-8 +- removed old pkl database references. +- added blacklist to db model +- added fix to IntelAMT remoteControl to start an power-down node +- added policy.py +- added global error count before bailing entirely. + +* Fri Mar 27 2009 Stephen Soltesz - Monitor-2.0-7 +- improved db model +- updated files that use db model +- updated web view based on node, site, and pcu states. +- added local mirror to zabbix Make file. + +* Tue Mar 24 2009 Stephen Soltesz - Monitor-2.0-6 +- added action view to gui +- added penalty_applied bit to db model. + +* Fri Mar 20 2009 Stephen Soltesz - Monitor-2.0-5 +- tag for updates to 2.0 db model + +* Fri Mar 13 2009 Stephen Soltesz - Monitor-2.0-4 +- splits reboot.py across pcucontrol and monitor modules +- moves command.py from monitor/util to pcucontrol/util + +* Tue Mar 10 2009 Stephen Soltesz - Monitor-2.0-3 +- add email exceptions +- other bug fixes. + +* Tue Mar 10 2009 Stephen Soltesz - Monitor-2.0-2 +- getting the pcucontrol and findall.py scripts to work in an integrated +- fashion. + +* Fri Feb 27 2009 Stephen Soltesz - Monitor-2.0-1 +- preparing to make a 2.0 branch for monitor. + +* Mon Jan 05 2009 Stephen Soltesz - Monitor-2.0-0 +- new changes are significantly different, that I'm upping the number for clarity. + * Wed Sep 24 2008 Stephen Soltesz - Monitor-1.0-8 - These are all changes in the latest Monitor code. I will branch this version - next, before making additional large changes.