X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=9c1c0ca207d8d087377c5bf5363bcb4e4d67781f;hb=588ff7737562c853de2772f90d83237cd035adb2;hp=e80eaccd7b8b40c64f265ae1348b5c8e99e3ac1c;hpb=2e46e046d2e26f3269a54612bbee908c3969adc0;p=monitor.git diff --git a/Monitor.spec b/Monitor.spec index e80eacc..9c1c0ca 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -5,12 +5,12 @@ %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 3.0 +%define taglevel 4 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) -Summary: Monitor account initialization for the root image. Name: %{name} Version: %{version} Release: %{release} @@ -24,37 +24,249 @@ Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} URL: %(echo %{url} | cut -d ' ' -f 2) +Summary: Monitor account initialization for the root image. +Group: Applications/System + +%description +Monitor is a collection of secondary scripts for configuring the node polling +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 Requires: curl Requires: coreutils -%description -Scripts for creating the monitor account in the root filesystem, to enable node access -without using the 'root' account. +%description client +The client scripts handle account creation inside of a node. This will +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 Deps +%package server-deps +Summary: Monitor hooks for the PLC server. +Group: Applications/System + +Requires: python +Requires: python-setuptools-devel + +Requires: openssh-clients +Requires: perl-libwww-perl +Requires: perl-IO-Socket-SSL +Requires: MySQL-python +Requires: nmap +Requires: rt3 + +#Requires: python-sqlalchemy +#Requires: python-elixir +#Requires: zabbix-client +#Requires: zabbix-gui +#Requires: zabbix-server + +%description server-deps +The server side include all python modules and scripts needed to fully + +######################################## Server +%package server +Summary: Monitor hooks for the PLC server. +Group: Applications/System + +Requires: python + +Requires: monitor-server-deps +Requires: monitor-pcucontrol +Requires: PLCWWW >= 4.2 +Requires: bootcd-planetlab-i386 >= 4.2 + +%description server +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 -echo "There is no build stage. Simply copy files." +# NOTE: the build uses g++ cmdamt/ +# NOTE: TMPDIR is needed here b/c the tmpfs of the build vserver is too small. +cd pcucontrol/models/intelamt +export TMPDIR=$PWD/tmp +make +cd .. %install rm -rf $RPM_BUILD_ROOT -install -D -m 755 monitor.init $RPM_BUILD_ROOT/%{_initrddir}/monitor -install -D -m 755 monitor.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor +#################### CLIENT +install -D -m 755 monitor-client.init $RPM_BUILD_ROOT/%{_initrddir}/monitor +install -D -m 644 monitor.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor + +#################### SERVER +install -d $RPM_BUILD_ROOT/usr/share/%{name} +install -d $RPM_BUILD_ROOT/data/var/lib/%{name} +install -d $RPM_BUILD_ROOT/data/var/lib/%{name}/archive-pdb +install -d $RPM_BUILD_ROOT/var/lib/%{name} +install -d $RPM_BUILD_ROOT/var/lib/%{name}/archive-pdb +install -d $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/ + +install -D -m 755 monitor-server.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor + +echo " * Installing core scripts" +rsync -a --exclude www --exclude archive-pdb --exclude .svn --exclude CVS \ + ./ $RPM_BUILD_ROOT/usr/share/%{name}/ + +echo " * Installing web pages" +rsync -a www/ $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/ + +echo " * Installing cron job for automated polling" +install -D -m 644 monitor-server.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor-server.cron +echo " * TODO: Setting up Monitor account in local MyPLC" +# TODO: + +install -d $RPM_BUILD_ROOT/%{python_sitearch}/monitor +install -d -D -m 755 monitor $RPM_BUILD_ROOT/%{python_sitearch}/monitor +# TODO: need a much better way to do this. +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 +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 + +mkdir -p $RPM_BUILD_ROOT/var/log +touch $RPM_BUILD_ROOT/var/log/server-deps.log + %clean rm -rf $RPM_BUILD_ROOT -%files +%files server-deps +/var/log/server-deps.log + +%files server +%defattr(-,root,root) +#%config /usr/share/%{name}/monitorconfig.py +#%config /etc/monitor.conf +/usr/share/%{name} +/var/lib/%{name} +/var/www/cgi-bin/monitor +%{_sysconfdir}/cron.d/monitor-server.cron +%{python_sitearch}/threadpool.py +%{python_sitearch}/threadpool.pyc +%{python_sitearch}/threadpool.pyo +%{python_sitearch}/monitor +%{_sysconfdir}/plc.d/monitor + +%files client %defattr(-,root,root) %{_initrddir}/monitor %{_sysconfdir}/cron.d/monitor -%post +%files pcucontrol +%{python_sitearch}/pcucontrol + +%files runlevelagent +/usr/bin/RunlevelAgent.py +/usr/bin/RunlevelAgent.pyo +/usr/bin/RunlevelAgent.pyc +/%{_initrddir}/monitor-runlevelagent + +%post server-deps +easy_install -UZ Elixir +easy_install -UZ ElementTree +easy_install -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz +easy_install -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg + +# NOTE: add the default xml stuff if it's not already in the default xml config. +if ! grep '' /etc/planetlab/default_config.xml ; then + sed -i 's|| \n Monitor Service Configuration\n Monitor\n \n \n Enabled\n true\n Enable on this machine.\n \n \n \n \n \n \n \n \n Hostname\n pl-virtual-06.cs.princeton.edu\n The fully qualified hostname.\n \n \n IP Address\n \n The IP address of the monitor server.\n \n \n \n |' /etc/planetlab/default_config.xml +fi + + +%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 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 + +%post client chkconfig --add monitor chkconfig monitor on +%post runlevelagent +chkconfig --add monitor-runlevelagent +chkconfig monitor-runlevelagent on + %changelog +* Fri May 01 2009 Stephen Soltesz - Monitor-3.0-4 +- Rough pass over monitor-3.0 to allow it to work with 4.3 API. +- replaced GetNodeNetworks, nodeinterface_ids and using new bootstates +- 'safeboot', 'failboot', 'reinstall', etc. + +* Tue Apr 28 2009 Stephen Soltesz - Monitor-3.0-3 +- same as 2.0-12 tag. + +* Mon Apr 27 2009 Stephen Soltesz - Monitor-3.0-2 +- merge from 2.0, remove more zabbix code, simplify install, etc. + +* Thu Apr 16 2009 Stephen Soltesz - Monitor-3.0-1 +- major merge from 2.0 branch. +- ready to be updated with 4.3 and web changes. + +* 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. @@ -86,4 +298,4 @@ chkconfig monitor on * Mon Apr 07 2008 Stephen Soltesz - monitor-1.0-0 - initial addition. -%define module_current_branch 1.0 +%define module_current_branch 2.0