%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)" )
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
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 \
%{_initrddir}/monitor
%{_sysconfdir}/cron.d/monitor
-%files rt
-%defattr(-,root,root)
-/usr/share/%{name}/rt3
-%{_sysconfdir}/plc.d/rt3
-
%files pcucontrol
%{python_sitearch}/pcucontrol
if ! grep '<category id="plc_monitor">' /etc/planetlab/default_config.xml ; then
sed -i 's|<category id="plc_net">| <category id="plc_monitor">\n <name>Monitor Service Configuration</name>\n <description>Monitor</description>\n <variablelist>\n <variable id="enabled" type="boolean">\n <name>Enabled</name>\n <value>true</value>\n <description>Enable on this machine.</description>\n </variable>\n <variable id="email">\n <value></value>\n </variable>\n <variable id="dbpassword">\n <value></value>\n </variable>\n <variable id="host" type="hostname">\n <name>Hostname</name>\n <value>pl-virtual-06.cs.princeton.edu</value>\n <description>The fully qualified hostname.</description>\n </variable>\n <variable id="ip" type="ip">\n <name>IP Address</name>\n <value/>\n <description>The IP address of the monitor server.</description>\n </variable>\n </variablelist>\n </category>\n <category id="plc_net">|' /etc/planetlab/default_config.xml
fi
-if ! grep '<category id="plc_rt">' /etc/planetlab/default_config.xml ; then
- sed -i 's|<category id="plc_net">| <category id="plc_rt">\n <name>RT Configuration</name>\n <description>RT</description>\n <variablelist>\n <variable id="enabled" type="boolean">\n <name>Enabled</name>\n <value>false</value>\n <description>Enable on this machine.</description>\n </variable>\n <variable id="host" type="hostname">\n <name>Hostname</name>\n <value>localhost.localdomain</value>\n <description>The fully qualified hostname.</description>\n </variable>\n <variable id="ip" type="ip">\n <name>IP Address</name>\n <value/>\n <description>The IP address of the RT server.</description>\n </variable>\n </variablelist>\n </category>\n <category id="plc_net">|' /etc/planetlab/default_config.xml
-fi
if ! grep '<category id="plc_zabbix">' /etc/planetlab/default_config.xml ; then
sed -i 's|<category id="plc_net">| <category id="plc_zabbix">\n <name>Zabbix Configuration</name>\n <description>Zabbix</description>\n <variablelist>\n <variable id="enabled" type="boolean">\n <name>Enabled</name>\n <value>false</value>\n <description>Enable on this machine.</description>\n </variable>\n <variable id="host" type="hostname">\n <name>Hostname</name>\n <value>localhost.localdomain</value>\n <description>The fully qualified hostname.</description>\n </variable>\n <variable id="ip" type="ip">\n <name>IP Address</name>\n <value/>\n <description>The IP address of the Zabbix server.</description>\n </variable>\n </variablelist>\n </category>\n <category id="plc_net">|' /etc/planetlab/default_config.xml
fi
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
-
%post server
# TODO: this will be nice when we have a web-based service running., such as
# an API server or so 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 <soltesz@cs.princeton.edu> - 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 <soltesz@cs.princeton.edu> - Monitor-3.0-17
- added bootmanager log links
- addressed root cause of IntegrityErrors ; big deal