X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=85ba2ebf4393a8a097c6986cfd0d4883aa6c4823;hb=12caba68661a8bc1c36d99850e4938ac02dfa0b2;hp=8f1ea0e103b47a20bd6c69df7742942f62ed0037;hpb=45c45cc6ae12eb7863612ab833b0facbfb2c37bb;p=monitor.git diff --git a/Monitor.spec b/Monitor.spec index 8f1ea0e..85ba2eb 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -6,7 +6,7 @@ %define name monitor %define version 3.0 -%define taglevel 17 +%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)" ) @@ -90,25 +90,13 @@ 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. -######################################## RT setup - -%package rt -summary: Dependencies and default configuration for RT3 -group: applications/system -Requires: monitor-server -Requires: rt3 -Requires: rt3-mailgate - -%description rt -RT3 is a ticket tracking system. This RPM integrates RT into the MyOps -framework, and MyPLC in general. - ######################################## 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 @@ -142,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} @@ -155,7 +145,6 @@ 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 -install -D -m 755 rt3/monitor-rt3.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/rt3 echo " * Installing core scripts" rsync -a --exclude www --exclude archive-pdb --exclude .svn --exclude CVS \ @@ -183,7 +172,6 @@ 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 644 rt3/rt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/rt.cron #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 @@ -221,12 +209,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_initrddir}/monitor %{_sysconfdir}/cron.d/monitor - -%files rt -%defattr(-,root,root) -/usr/share/%{name}/rt3 -%{_sysconfdir}/plc.d/rt3 -%{_sysconfdir}/cron.d/rt.cron +/usr/bin/timeout.pl %files pcucontrol %{python_sitearch}/pcucontrol @@ -249,30 +232,44 @@ 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 /usr/share/monitor/.ssh -chmod 700 /usr/share/monitor/.ssh +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: 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 + +# 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 ! grep '' /etc/planetlab/default_config.xml ; then - sed -i 's|| \n RT Configuration\n RT\n \n \n Enabled\n false\n Enable on this machine.\n \n \n Hostname\n localhost.localdomain\n The fully qualified hostname.\n \n \n IP Address\n \n The IP address of the RT server.\n \n \n \n |' /etc/planetlab/default_config.xml +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 ! grep '' /etc/planetlab/default_config.xml ; then - sed -i 's|| \n Zabbix Configuration\n Zabbix\n \n \n Enabled\n false\n Enable on this machine.\n \n \n Hostname\n localhost.localdomain\n The fully qualified hostname.\n \n \n IP Address\n \n The IP address of the Zabbix server.\n \n \n \n |' /etc/planetlab/default_config.xml +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 -# NOTE: enable monitor by default, since we're installing it. -plc-config --save /etc/planetlab/default_config.xml \ - --category plc_monitor --variable enabled --value true - -%post rt -plc-config --save /etc/planetlab/default_config.xml \ - --category plc_rt --variable enabled --value true +# 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 @@ -299,8 +296,18 @@ 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