X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=658c07abedfe1306444b1fc208c5f538e3e4dd5e;hb=5cd0f6fd287d0bc80c22b53b655b51ab7019d205;hp=ac97879d0cff2bbbae7284b3fd1eef84d62e7f03;hpb=47471d23830c6020a87513dd89cda6572b7b26bf;p=monitor.git diff --git a/Monitor.spec b/Monitor.spec index ac97879..658c07a 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -7,7 +7,7 @@ %define name monitor # keep this version in sync with monitor/monitor_version.py %define version 3.1 -%define taglevel 0 +%define taglevel 1 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -50,7 +50,11 @@ 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 @@ -58,6 +62,8 @@ Requires: nagios-plugins-all Requires: ndoutils Requires: ndoutils-mysql +Requires: rt3 + %description nagios Scripts and setup necessary to integrate and monitor PLC with Nagios. @@ -90,11 +96,19 @@ 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 @@ -109,11 +123,10 @@ Summary: Monitor hooks for the PLC server. Group: Applications/System Requires: python - Requires: monitor-server-deps -Requires: PLCWWW >= 4.2 -Requires: bootcd-%{pldistro}-%{distroname}-%{_arch} >= 5.0 -Requires: pcucontrol + +# 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 @@ -156,13 +169,15 @@ install -d $RPM_BUILD_ROOT/%{python_sitearch}/monitor 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 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 # cron job for automated polling install -D -m 644 monitor-server.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor-server.cron # apache configuration -install -D -m 644 web/monitorweb-httpd.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/ +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 @@ -173,12 +188,13 @@ rsync -a --exclude archive-pdb --exclude .cvsignore --exclude .svn --exclude CVS # 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 # 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 @@ -203,6 +219,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_sysconfdir}/plc.d/monitor-nagios /usr/share/%{name}/nagios +%{_sysconfdir}/cron.d/monitor-nagios.cron %files server %defattr(-,root,root) @@ -267,9 +284,11 @@ rm -rf $RPM_BUILD_ROOT # 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 +#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 @@ -298,24 +317,10 @@ 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 --add monitor-nagios +#chkconfig monitor-nagios on chkconfig mysqld on %post server @@ -340,14 +345,19 @@ 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 +* 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