X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=Monitor.spec;h=64a921104d67a751bee083c06f01a8f99600b4c3;hp=85ba2ebf4393a8a097c6986cfd0d4883aa6c4823;hb=HEAD;hpb=12caba68661a8bc1c36d99850e4938ac02dfa0b2 diff --git a/Monitor.spec b/Monitor.spec index 85ba2eb..64a9211 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 -%define version 3.0 -%define taglevel 18 +# keep this version in sync with monitor/monitor_version.py +%define version 3.1 +%define taglevel 6 %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,7 @@ Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} URL: %(echo %{url} | cut -d ' ' -f 2) + Summary: Monitor account initialization for the root image. Group: Applications/System @@ -33,6 +35,40 @@ system, syncing the PLC db with the monitoring database, notifying users, interacting with PCU hardware, applying penalties to sites that violate acceptable use. +######################################## NAGIOS + +%package nagios +Summary: Monitor integration with Nagios +Group: Applications/System + +Requires: coreutils +Requires: passwd +Requires: gd +Requires: gd-devel +Requires: mysql +Requires: mysql-server +Requires: mysql-devel +Requires: mysql-libs +Requires: mailx +Requires: sendmail +Requires: php +Requires: httpd + +Requires: cronie +Requires: nagios +Requires: nagios-common +Requires: nagios-devel +Requires: nagios-plugins-all +Requires: ndoutils +Requires: ndoutils-mysql + +Requires: rt3 + + +%description nagios +Scripts and setup necessary to integrate and monitor PLC with Nagios. +Best suited to F12 or above. + ######################################## CLIENT %package client @@ -54,17 +90,25 @@ Group: Applications/System Requires: python 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: perl-DBD-mysql Requires: nmap +Requires: mailx +Requires: nc Requires: rt3 +Requires: traceroute +Requires: sendmail +# 5.0-18 is when the extra monitor plc-config values were added to myplc default_config.xml +Requires: myplc >= 5.0-18 Requires: plewww-plekit +Requires: pcucontrol +Requires: TurboGears #Requires: zabbix-client #Requires: zabbix-gui @@ -79,31 +123,17 @@ 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 + +# NOTE: removed b/c 'distroname' gets corrupted during build process. +# Requires: bootcd-%{pldistro}-%{distroname}-%{_arch} >= 5.0 %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 -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 -supported models. - -####################################### RunlevelAgent +######################################## RunlevelAgent %package runlevelagent summary: the RunlevelAgent that reports node runlevels group: applications/system @@ -117,20 +147,12 @@ mode to actively report the observed runlevel to PLC and update the %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 pcucontrol/models/intelamt -export TMPDIR=$PWD/tmp -make -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 timeout.pl $RPM_BUILD_ROOT/usr/bin/timeout.pl +#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 @@ -139,38 +161,44 @@ 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 +# 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 +#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}/ +install -D -m 755 nagios/monitor-nagios.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor-nagios +install -D -m 644 nagios/monitor-nagios.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor-nagios.cron -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" +# 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/ +# apache configuration +install -D -m 644 web/monitorweb.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/ + +# we'll install monitor in site-packages install rest to +# /usr/share/monitor +rsync -a --exclude archive-pdb --exclude .cvsignore --exclude .svn --exclude CVS \ + --exclude monitor/ \ + ./ $RPM_BUILD_ROOT/usr/share/%{name}/ + +#rm -f $RPM_BUILD_ROOT/usr/share/%{name}/zabbix.spec + +# install monitor python package +rsync -a --exclude .svn ./monitor/ $RPM_BUILD_ROOT/%{python_sitearch}/monitor/ + +install -D -m 644 monitor/wrapper/plc.py $RPM_BUILD_ROOT/usr/share/%{name}/nagios/ +install -D -m 644 monitor/generic.py $RPM_BUILD_ROOT/usr/share/%{name}/nagios/ + +# 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: +#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 @@ -189,46 +217,80 @@ rm -rf $RPM_BUILD_ROOT %files server-deps /var/log/server-deps.log +%files nagios +%defattr(-,root,root) +%{_sysconfdir}/plc.d/monitor-nagios +/usr/share/%{name}/nagios +%{_sysconfdir}/cron.d/monitor-nagios.cron + %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 +/usr/share/%{name}/MANIFEST.in +/usr/share/%{name}/Makefile +/usr/share/%{name}/Monitor.spec +/usr/share/%{name}/README.txt +/usr/share/%{name}/RunlevelAgent.py* +/usr/share/%{name}/automate-default.sh +/usr/share/%{name}/monitor-default.conf +/usr/share/%{name}/monitor-runlevelagent.init +/usr/share/%{name}/monitor-server.cron +/usr/share/%{name}/monitor-server.init +/usr/share/%{name}/monitor.functions +/usr/share/%{name}/setup.py* +/usr/share/%{name}/threadpool.py* +/usr/share/%{name}/zabbix.spec + +/usr/share/%{name}/bootcd +/usr/share/%{name}/commands +/usr/share/%{name}/config.d +#/usr/share/%{name}/cron.d +/usr/share/%{name}/docs +/usr/share/%{name}/histlog +/usr/share/%{name}/keys +#/usr/share/%{name}/log +/usr/share/%{name}/statistics +/usr/share/%{name}/tests +/usr/share/%{name}/tools +/usr/share/%{name}/upgrade +/usr/share/%{name}/web +/usr/share/%{name}/zabbix + +#/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 %{_sysconfdir}/plc.d/monitor.functions -%{_sysconfdir}/plc.d/zabbix +#%{_sysconfdir}/plc.d/zabbix +%{_sysconfdir}/httpd/conf.d +%{python_sitearch} + %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 - %files runlevelagent -/usr/bin/RunlevelAgent.py -/usr/bin/RunlevelAgent.pyo -/usr/bin/RunlevelAgent.pyc +/usr/bin/RunlevelAgent.py* /%{_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 +# +# TODO: depend on distribution packages where feasible. +# +# it would be better to be able to depend on the distribution's +# packages for these additional python modules, but packages provided +# by fedora 8 (our current deployment) doesn't match the version +# requirements. +export TMPDIR=/var/tmp/ +#easy_install -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg +#easy_install -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz +#easy_install -UZ Elixir +chkconfig sendmail on +chkconfig crond on # crazy openssl libs for racadm binary ln -s /lib/libssl.so.0.9.8b /usr/lib/libssl.so.2 @@ -257,25 +319,16 @@ if ! plc-config --category plc_monitor --variable rt_queue ; then --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 nagios +# TODO: do as much as possible to get the host setup and running. +#chkconfig --add monitor-nagios +#chkconfig monitor-nagios on +chkconfig mysqld on %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). @@ -294,14 +347,122 @@ 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 +if [ -f /etc/planetlab/node_id ] ; then + chkconfig --add monitor-runlevelagent + chkconfig monitor-runlevelagent on + if [ "$PL_BOOTCD" != "1" ] ; then + service monitor-runlevelagent restart + fi fi %changelog +* Wed Aug 31 2011 Stephen Soltesz - monitor-3.1-6 +- Minor updates to work with pcucontrol. +- Added action for some fprobe no-space errors. + +* Wed Aug 31 2011 Stephen Soltesz - monitor-3.1-5 +- account for new ok status type in PCUs +- include a percentage of nodes up as well as raw node-count + +* Fri May 27 2011 s s - monitor-3.1-4 +- Fixes to spec file for monitor building + +* Fri May 27 2011 s s - monitor-3.1-3 +- fixing syntax errors + +* Fri May 27 2011 s s - monitor-3.1-2 +- Add better requirements list, work with TurboGears packaged by fedora, +- Remove some zabbix files +- Add a controllers_local.py for custom extensions + +* Fri May 06 2011 s s - monitor-3.1-1 +- last tag before some more major changes + +* Thu May 20 2010 Stephen Soltesz - Monitor-3.0-35 +- Add CSV link on Advanced query +- Preparing to branch + +* Wed May 12 2010 Talip Baris Metin - Monitor-3.0-34 +- * copy selections to clipbord on Advanced Query page +- * RPM Pattern as regexp +- * scan ipmi port + +* Tue Apr 27 2010 Talip Baris Metin - Monitor-3.0-33 +- handle hostname changes + +* Tue Apr 20 2010 Thierry Parmentelat - Monitor-3.0-32 +- from this version, suitable for 5.0 +- requires bootcd with the new 5.0 naming style 3-part nodefamily + +* Mon Apr 12 2010 Stephen Soltesz - Monitor-3.0-31 +- added fix for node delete/add causing conflicts in MyOps db. +- added statistics scripts + +* Thu Jan 21 2010 Talip Baris Metin - Monitor-3.0-30 +- * fix paths for automate script + +* Tue Dec 22 2009 Baris Metin - Monitor-3.0-29 +- - separate pcucontrol as an svn module +- - restore easy_instal back into post install stage of server-deps +- - template imporovements for web interface + +* Thu Dec 17 2009 Baris Metin - Monitor-3.0-28 +- do not need buildrequires. a new tag to fix centos builds + +* Thu Dec 17 2009 Baris Metin - Monitor-3.0-27 +- fix rpm build issues + +* 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 @@ -417,4 +578,4 @@ fi * Mon Apr 07 2008 Stephen Soltesz - monitor-1.0-0 - initial addition. -%define module_current_branch 2.0 +%define module_current_branch 3.0