X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=85ba2ebf4393a8a097c6986cfd0d4883aa6c4823;hb=12caba68661a8bc1c36d99850e4938ac02dfa0b2;hp=117b469af1d8c0d19be9ad1c53e678bca4891a14;hpb=4cfa907a0876318060bc6b26bdbc25f5a7791913;p=monitor.git diff --git a/Monitor.spec b/Monitor.spec index 117b469..85ba2eb 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 2.0 -%define taglevel 0 +%define version 3.0 +%define taglevel 18 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -46,28 +46,44 @@ 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 -%package server +######################################## Server Deps +%package server-deps Summary: Monitor hooks for the PLC server. Group: Applications/System Requires: python -Requires: python-sqlalchemy -Requires: python-elixir +Requires: python-setuptools-devel +Requires: python-peak-util-extremes +Requires: TurboGears +Requires: compat-libstdc++-296 Requires: openssh-clients Requires: perl-libwww-perl Requires: perl-IO-Socket-SSL Requires: MySQL-python -Requires: rt3 == 3.4.1 Requires: nmap -Requires: PLCWWW >= 4.2 -Requires: bootcd-planetlab-i386 >= 4.2 +Requires: rt3 + +Requires: plewww-plekit + +#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: zabbix-client -Requires: zabbix-gui -Requires: zabbix-server +Requires: monitor-server-deps +Requires: monitor-pcucontrol +Requires: PLCWWW >= 4.2 +Requires: bootcd-%{pldistro}-%{_arch} >= 4.2 %description server The server side include all python modules and scripts needed to fully @@ -77,15 +93,27 @@ as Zabbix DB. ######################################## PCU Control %package pcucontrol -Summary: PCU Controls for Monitor and PLCAPI -Group: Applications/System -Requires: python +summary: pcu controls for monitor and plcapi +group: applications/system +requires: python +requires: OpenIPMI-tools %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 +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 @@ -102,6 +130,8 @@ rm -rf $RPM_BUILD_ROOT #################### 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 +install -D -m 755 timeout.pl $RPM_BUILD_ROOT/usr/bin/timeout.pl + #################### SERVER install -d $RPM_BUILD_ROOT/usr/share/%{name} @@ -110,8 +140,11 @@ 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 $RPM_BUILD_ROOT/var/www/html/monitorlog/ +install -D -m 644 monitor.functions $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor.functions install -D -m 755 monitor-server.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor +install -D -m 755 zabbix/monitor-zabbix.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/zabbix echo " * Installing core scripts" rsync -a --exclude www --exclude archive-pdb --exclude .svn --exclude CVS \ @@ -119,6 +152,7 @@ rsync -a --exclude www --exclude archive-pdb --exclude .svn --exclude CVS \ echo " * Installing web pages" rsync -a www/ $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/ +rsync -a log/ $RPM_BUILD_ROOT/var/www/html/monitorlog/ echo " * Installing cron job for automated polling" install -D -m 644 monitor-server.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor-server.cron @@ -141,9 +175,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 + +mkdir -p $RPM_BUILD_ROOT/var/log +touch $RPM_BUILD_ROOT/var/log/server-deps.log + + %clean rm -rf $RPM_BUILD_ROOT +%files server-deps +/var/log/server-deps.log %files server %defattr(-,root,root) @@ -158,15 +202,75 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/threadpool.pyo %{python_sitearch}/monitor %{_sysconfdir}/plc.d/monitor +%{_sysconfdir}/plc.d/monitor.functions +%{_sysconfdir}/plc.d/zabbix %files client %defattr(-,root,root) %{_initrddir}/monitor %{_sysconfdir}/cron.d/monitor +/usr/bin/timeout.pl %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 --build-directory /var/tmp -UZ ElementTree +##easy_install --build-directory /var/tmp -UZ http://pypi.python.org/packages/2.5/E/Extremes/Extremes-1.1-py2.5.egg + + +## TODO: something is bad wrong with this approach. +easy_install --build-directory /var/tmp -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg +easy_install --build-directory /var/tmp -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz +easy_install --build-directory /var/tmp -UZ Elixir + +# crazy openssl libs for racadm binary +ln -s /lib/libssl.so.0.9.8b /usr/lib/libssl.so.2 +mkdir %{_datadir}/%{name}/.ssh +chmod 700 %{_datadir}/%{name}/.ssh + +if grep 'pam_loginuid.so' /etc/pam.d/crond ; then + sed -i -e 's/^session required pam_loginuid.so/#session required pam_loginuid.so/g' /etc/pam.d/crond +fi + +# NOTE: enable monitor by default, since we're installing it. +if ! plc-config --category plc_monitor --variable enabled ; then + plc-config --category plc_monitor --variable enabled --value true \ + --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml +fi +if ! plc-config --category plc_monitor --variable from_email ; then + plc-config --category plc_monitor --variable from_email --value monitor@localhost.localdomain \ + --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml +fi +if ! plc-config --category plc_monitor --variable cc_email ; then + plc-config --category plc_monitor --variable cc_email --value monitor@localhost.localdomain \ + --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml +fi +if ! plc-config --category plc_monitor --variable rt_queue ; then + plc-config --category plc_monitor --variable rt_queue --value support \ + --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml +fi + +# zabbix: +if ! plc-config --category plc_zabbix --variable enabled ; then + plc-config --category plc_zabbix --variable enabled --value false \ + --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml +fi +if ! plc-config --category plc_zabbix --variable host ; then + plc-config --category plc_zabbix --variable host --value localhost.localdomain \ + --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml +fi +if ! plc-config --category plc_zabbix --variable ip ; then + plc-config --category plc_zabbix --variable ip --value "" \ + --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.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. @@ -177,10 +281,10 @@ rm -rf $RPM_BUILD_ROOT # 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 +#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/zabbix-auto-login.diff +#patch -d /var/www/html/zabbix/ -p0 < /usr/share/%{name}/zabbix/zabbix-auto-login.diff #chkconfig --add monitor-server #chkconfig monitor-server on @@ -189,7 +293,96 @@ patch -d /var/www/html/zabbix/ -p0 < /usr/share/%{name}/zabbix/zabbix/zabbix-aut chkconfig --add monitor chkconfig monitor on +%post runlevelagent +chkconfig --add monitor-runlevelagent +chkconfig monitor-runlevelagent on +if [ "$PL_BOOTCD" != "1" ] ; then + service monitor-runlevelagent restart +fi + + %changelog +* Sun Jun 28 2009 Stephen Soltesz - Monitor-3.0-18 +- bug fixes. +- improved templates and views +- cleaned controller code for web +- added IPMI requirement to pcucontrol package. + +* Thu Jun 18 2009 Stephen Soltesz - Monitor-3.0-17 +- added bootmanager log links +- addressed root cause of IntegrityErrors ; big deal +- adjusted templates to accomodate fix for IntegrityErrors +- added session.flush() to bootman.py to write out ActionsRecords +- fixed policy to either pause penalties or apply them ; not both. + +-* Wed Jun 17 2009 Stephen Soltesz - Monitor-3.0-16 +-- Added Rpyc from 1.0 branch. +-- add pcuhistory +-- add setup-agent for password protected keys. +-- other minor improvements. + +* Wed Jun 17 2009 Stephen Soltesz - Monitor-3.0-15 +- automate install +- auto-close tickets + +* Fri Jun 12 2009 Stephen Soltesz - Monitor-3.0-14 +- update web +- update policy +- added statistics dir + +* Mon Jun 08 2009 Stephen Soltesz - Monitor-3.0-13 +- remove plccache from controllers, all lookups from db. +- reformat emailTxt messags +- updated bootstates in bootman.py + +* Tue Jun 02 2009 Stephen Soltesz - Monitor-3.0-12 +- tag of latest changes. +- need to test end to end. + +* Sat May 30 2009 Thierry Parmentelat - Monitor-3.0-11 +- big merge from the 2.0 branch + +* Tue May 26 2009 Thierry Parmentelat - Monitor-3.0-10 +- minor improvements in rendering with sortable tables + +* Tue May 19 2009 Baris Metin - Monitor-3.0-9 + +* Fri May 15 2009 Thierry Parmentelat - Monitor-3.0-8 +- first draft with sortable tables + checkpoint + +* Fri May 15 2009 Baris Metin +- use plekit tables from plewww. +- depend on plewww-plekit + +* Tue May 12 2009 Stephen Soltesz - Monitor-3.0-7 +- make docs a noop +- fix for package name dependency +- correct docs + +* Mon May 04 2009 Stephen Soltesz - Monitor-3.0-6 +- add improved docs to the latest build and tag. + +* Mon May 04 2009 Stephen Soltesz - Monitor-3.0-5 +- add documentation hooks for adding in-line docs like NM and PLCAPI + +* 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. @@ -224,4 +417,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