X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pl_mom.spec;h=5672770070d2a7ca145945ef1df8d1355b008b8a;hb=7aca3983cb46f3e88d2873cd1935622e61c10223;hp=085cd3f1b96d2e0882a3efc3aee2150b5d612863;hpb=e3596f867e7b4500ac42dacb6d08beb6b2b4a9e8;p=mom.git

diff --git a/pl_mom.spec b/pl_mom.spec
index 085cd3f..5672770 100644
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,6 +1,6 @@
 %define name pl_mom
-%define version 0.4
-%define release 5%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 2.0
+%define release 02%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
 Summary: PlanetLab node monitoring tools
 Name: %{name}
@@ -28,9 +28,6 @@ process memory usage. At 90% utilization, resets the slice that is
 consuming the most physical memory. At 95% utilization, it reboots the
 machine to avoid a crash.
 
-bwmon is a cron job that monitors the average bandwidth usage of each
-slice and enforces a daily byte limit for each slice.
-
 pl_mop is a cron job that "fixes" various common problems with nodes
 (dead services, ext3 corruption, zombie SSH sessions, etc.).
 
@@ -46,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 install -D -m 644 pl_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/pl_mom.py
 
 # Bandwidth monitor (bwmon), run periodically
-install -D -m 755 bwmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/bwmon.py
+#install -D -m 755 bwmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/bwmon.py
 
 # Swap monitoring daemon (swapmon)
 install -D -m 755 swapmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/swapmon.py
@@ -96,16 +93,26 @@ exit 0
 
 %files
 %defattr(-, root, root, -)
-%{_datadir}/%{name}/pl_mom.py
-%{_datadir}/%{name}/bwmon.py
-%{_datadir}/%{name}/swapmon.py
+%{_datadir}/%{name}/pl_mom.py*
+%{_datadir}/%{name}/swapmon.py*
 %{_initrddir}/swapmon
 /usr/local/planetlab/bin/pl_mop.sh
 %{_sysconfdir}/cron.d/pl_mom
 
 %changelog
+* 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
+  before trying to kill again.
+
+* Mon Jul 17 2006 Faiyaz Ahmed <faiyaza@cs.princeton.edu> 0.4-6.planetlab
+- swapmon: Added state information per slice.  Slices are now killed
+  after consuming more memory than the threshold more than twice.
+  Also fixed the slice restart issue where slices would be restarted
+  and repeated restart emails would be sent.
+
 * Mon Jul 10 2006 Faiyaz Ahmed <faiyaza@cs.princeton.edu> 0.4-5.planetlab
-- bwlimit: Initialize default limits
+- bwmon: Initialize default limits
 
 * Mon Jul 10 2006 Faiyaz Ahmed <faiyaza@cs.princeton.edu> 0.4-4.planetlab
-- bwlimit: Use cached values if NM stops responding
+- bwmon: Use cached values if NM stops responding