%define name pl_mom
-%define version 1.0
-%define release 01%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 2.3
+%define taglevel 4
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Summary: PlanetLab node monitoring tools
Name: %{name}
Source: %{name}-%{version}.tgz
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
-URL: http://cvs.planet-lab.org/cvs/pl_mom
+Distribution: PlanetLab %{plrelease}
+URL: %{SCMURL}
+#URL: http://cvs.planet-lab.org/cvs/pl_mom
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: expect
-# swapmon requires vps and bwlimit.py
+# swapmon requires vps and vkill
Requires: util-vserver, util-vserver-python
+# for bwlimit used in swapmon
+Requires: plnode-utils
# bwmon requires tc
Requires: iproute
install -D -m 755 swapmon.init $RPM_BUILD_ROOT/%{_initrddir}/swapmon
# Cleanup script
-install -D -m 755 pl_mop.sh $RPM_BUILD_ROOT/usr/local/planetlab/bin/pl_mop.sh
-
-# Tests and restarts NM
-#install -D -m 755 nm_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/nm_mom.py
+install -D -m 755 pl_mop.sh $RPM_BUILD_ROOT/usr/bin/pl_mop.sh
# Runs pl_mop and bwmon periodically
install -D -m 644 pl_mom.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/pl_mom
%files
%defattr(-, root, root, -)
%{_datadir}/%{name}/pl_mom.py*
-#%{_datadir}/%{name}/nm_mom.py*
-#%{_datadir}/%{name}/bwmon.py*
%{_datadir}/%{name}/swapmon.py*
%{_initrddir}/swapmon
-/usr/local/planetlab/bin/pl_mop.sh
+/usr/bin/pl_mop.sh
%{_sysconfdir}/cron.d/pl_mom
%changelog
+* Tue May 10 2011 Scott Baker <smbaker@gmail.com> - Mom-2.3-4
+- Avoid writing error messages to stdout that are due to errors
+- reported from vps.
+
+* Wed Apr 20 2011 Scott Baker <smbaker@gmail.com> - Mom-2.3-3
+- Fix parsing of vps in swapmon, add swapmon error messages when unparseable
+- lines encountered, add stuck rpm checking to pl_mop
+
+* Sun Dec 13 2009 Daniel Hokka Zakrisson <daniel@hozac.com> - Mom-2.3-2
+- Don't restart disabled services.
+
+* Tue Apr 07 2009 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - Mom-2.3-1
+- Merge from trunk.
+
* Wed Jul 19 2006 Faiyaz Ahmed <faiyaza@cs.princeton.edu> 0.4-7.planetlab
- swapmon: Added state info so same reset email does not keep getting
sent. If slice is already being killed, will wait for a timeout