X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=f9068c424c6e94827e053404494dff069e894f50;hb=4db453d97b96ddd3c08e6123d4efe368a58851b8;hp=5f08b254ef57652e9697e7a04b0145ebc8348faf;hpb=6a452e8ece2ca8a47105c128eaebc38507bc76c5;p=monitor.git diff --git a/Monitor.spec b/Monitor.spec index 5f08b25..f9068c4 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -5,8 +5,9 @@ %define url $URL: svn+ssh://svn.planet-lab.org/svn/monitor/trunk/monitor.spec $ %define name monitor +# keep this version in sync with monitor/monitor_version.py %define version 3.0 -%define taglevel 0 +%define taglevel 26 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -24,6 +25,9 @@ Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} URL: %(echo %{url} | cut -d ' ' -f 2) +BuildRequires: python-setuptools-devel + + Summary: Monitor account initialization for the root image. Group: Applications/System @@ -46,29 +50,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-peak-util-extremes +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: nc +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: 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 operation, track, and interact with any third-party monitoring software, such @@ -80,6 +99,7 @@ as Zabbix DB. 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 @@ -111,8 +131,10 @@ cd .. %install 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 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 tools/timeout.pl $RPM_BUILD_ROOT/usr/bin/timeout.pl + #################### SERVER install -d $RPM_BUILD_ROOT/usr/share/%{name} @@ -120,34 +142,50 @@ 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 $RPM_BUILD_ROOT/var/www/html/monitorlog/ +install -d $RPM_BUILD_ROOT/etc/httpd/conf.d/ +install -d $RPM_BUILD_ROOT/%{python_sitearch}/monitor + +# pack monitor's dependencies in RPM to make it easier to deploy. +export TMPDIR=/var/tmp/ +export PYTHONPATH=$PYTHONPATH:$RPM_BUILD_ROOT/%{python_sitearch}/ +easy_install -d $RPM_BUILD_ROOT/%{python_sitearch}/ -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg +easy_install -d $RPM_BUILD_ROOT/%{python_sitearch}/ -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz +easy_install -d $RPM_BUILD_ROOT/%{python_sitearch}/ -UZ Elixir +rm -rf $RPM_BUILD_ROOT/%{python_sitearch}/site.py* +# plc.d scripts +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 \ - ./ $RPM_BUILD_ROOT/usr/share/%{name}/ +# cron job for automated polling +install -D -m 644 monitor-server.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor-server.cron -echo " * Installing web pages" -rsync -a www/ $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/ +# apache configuration +install -D -m 644 web/monitorweb-httpd.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/ -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: +# we'll install monitor and pcucontrol in site-packages +# install rest to /usr/share/monitor +rsync -a --exclude archive-pdb --exclude .svn --exclude CVS \ + --exclude monitor/ \ + --exclude pcucontol/ \ + ./ $RPM_BUILD_ROOT/usr/share/%{name}/ -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 monitor python package +rsync -a --exclude .svn ./monitor/ $RPM_BUILD_ROOT/%{python_sitearch}/monitor/ + +# and pcucontrol +rsync -a --exclude .svn ./pcucontrol/ $RPM_BUILD_ROOT/%{python_sitearch}/pcucontrol/ + +# install third-party module to site-packages 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 +# TODO: +echo " * TODO: Setting up Monitor account in local MyPLC" + +#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 @@ -156,10 +194,15 @@ chmod 777 $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/monitorconfig.php 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) @@ -167,18 +210,23 @@ rm -rf $RPM_BUILD_ROOT #%config /etc/monitor.conf /usr/share/%{name} /var/lib/%{name} -/var/www/cgi-bin/monitor +#/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}/threadpool.py* %{python_sitearch}/monitor +%{python_sitearch}/*.egg/ +%{python_sitearch}/easy-install.pth +%{python_sitearch}/tg-admin %{_sysconfdir}/plc.d/monitor +%{_sysconfdir}/plc.d/monitor.functions +%{_sysconfdir}/plc.d/zabbix +%{_sysconfdir}/httpd/conf.d %files client %defattr(-,root,root) -%{_initrddir}/monitor -%{_sysconfdir}/cron.d/monitor +#%{_initrddir}/monitor +#%{_sysconfdir}/cron.d/monitor +/usr/bin/timeout.pl %files pcucontrol %{python_sitearch}/pcucontrol @@ -189,17 +237,59 @@ rm -rf $RPM_BUILD_ROOT /usr/bin/RunlevelAgent.pyc /%{_initrddir}/monitor-runlevelagent +%post server-deps + +# 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. # 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 +#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 @@ -214,8 +304,140 @@ chkconfig monitor on %post runlevelagent chkconfig --add monitor-runlevelagent chkconfig monitor-runlevelagent on +if [ "$PL_BOOTCD" != "1" ] ; then + service monitor-runlevelagent restart +fi + %changelog +* Wed Dec 16 2009 Baris Metin - Monitor-3.0-26 +- to many changes, but mostly moved stuff around. there are some small fixes here and there. + +* Fri Nov 20 2009 Stephen Soltesz - Monitor-3.0-25 +- add option for site status to include both node & pcu status +- improve ticket handling +- template gadget.xml for a site-specific google-gadget summary + +* Thu Oct 22 2009 Baris Metin - Monitor-3.0-24 +- - add install_date + +* Mon Oct 19 2009 Baris Metin - Monitor-3.0-23 +- - remove monitor-client.cron +- - remove unused monitor-client init script +- - fix UP/DOWN summary on nodes page. +- - make node page display all nodes by default +- - add boot_server field +- - add myops_ssh_key to the keychain +- - use ext_consortium_id to distinguish pending sites. + +* Fri Oct 09 2009 Baris Metin - Monitor-3.0-22 +- show/hide advance query form. + +* Thu Sep 24 2009 Stephen Soltesz - Monitor-3.0-21 +- fixed pause_penalty bug. +- fixed IPAL pcucontrol bug +- fixed bootman tunnel setup bug (occurred in rare cases) +- deprecated pcuview +- added BootmanSequenceRecords to separate config data from source code +- added get/setBootmanSequence(s) to xmlrpc API + +* Fri Sep 04 2009 Stephen Soltesz - Monitor-3.0-20 +- Major Features: +- added bm log collection and optional integration with BootManager's log Upload() +- added iptables_status +- expanded advanced query +- added differentiated bootmanager_restore actions so that actionsummary displays +- counts for each kind of bootmanager action +- added pcuerror notices (for mis-configurations) in addition to pcufailed notices +- added plain-text options for query page by adding tg_format=plain to URL +- fixed cross-module reference that prevented pcucontrol for working with RebootNodeWithPCU() api call. +- fixed a bug in determining whether comon's dir was running on a node + +* Mon Aug 17 2009 Stephen Soltesz - Monitor-3.0-19 +- Major increment - +- adds multiple features and web changes +- adds new fields to db +- improved layout +- general improvements otherwise + +* 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.