%define name monitor
# keep this version in sync with monitor/monitor_version.py
%define version 3.1
-%define taglevel 1
+%define taglevel 5
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
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
Group: Applications/System
Requires: python
-
Requires: monitor-server-deps
-Requires: PLCWWW >= 4.2
+
# NOTE: removed b/c 'distroname' gets corrupted during build process.
# Requires: bootcd-%{pldistro}-%{distroname}-%{_arch} >= 5.0
operation, track, and interact with any third-party monitoring software, such
as Zabbix DB.
-####################################### RunlevelAgent
+######################################## RunlevelAgent
%package runlevelagent
summary: the RunlevelAgent that reports node runlevels
group: applications/system
# 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
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
--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/
/usr/share/%{name}/bootcd
/usr/share/%{name}/commands
/usr/share/%{name}/config.d
-/usr/share/%{name}/cron.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}/log
/usr/share/%{name}/statistics
/usr/share/%{name}/tests
/usr/share/%{name}/tools
%{_sysconfdir}/cron.d/monitor-server.cron
%{_sysconfdir}/plc.d/monitor
%{_sysconfdir}/plc.d/monitor.functions
-%{_sysconfdir}/plc.d/zabbix
+#%{_sysconfdir}/plc.d/zabbix
%{_sysconfdir}/httpd/conf.d
%{python_sitearch}
/usr/bin/RunlevelAgent.py*
/%{_initrddir}/monitor-runlevelagent
-
%post server-deps
#
# TODO: depend on distribution packages where feasible.
%changelog
+* Wed Aug 31 2011 Stephen Soltesz <soltesz@cs.princeton.edu> - 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 <soltesz@cs.princeton.edu> - monitor-3.1-4
+- Fixes to spec file for monitor building
+
+* Fri May 27 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-3
+- fixing syntax errors
+
+* Fri May 27 2011 s s <soltesz@cs.princeton.edu> - 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 <soltesz@cs.princeton.edu> - monitor-3.1-1
- last tag before some more major changes