%define name monitor
# keep this version in sync with monitor/monitor_version.py
%define version 3.1
-%define taglevel 3
+%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)" )
--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}/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}/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/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