X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fscanapi.py;h=119f7fd7e7c34075c059c64a830dba24c2401738;hb=2d1c0c5c0bf2fb15651dcfd813ae68bff4b80535;hp=d0ed72beb1da56227d163edc6b5bf6f0fdd908b2;hpb=40884a302bf204a7f42044b72d87f9431ad6dd35;p=monitor.git

diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index d0ed72b..119f7fd 100644
--- a/monitor/scanapi.py
+++ b/monitor/scanapi.py
@@ -239,6 +239,7 @@ class ScanNodeInternal(ScanInterface):
 					echo '  "bootcd_version":"'`cat /mnt/cdrom/bootme/ID`'",'
 					echo '  "nm_status":"'`ps ax | grep nm.py | grep -v grep`'",'
 					echo '  "dns_status":"'`host boot.planet-lab.org 2>&1`'",'
+					echo '  "iptables_status":"'`iptables -t mangle -nL | awk '$1~/^[A-Z]+$/ {modules[$1]=1;}END{for (k in modules) {if (k) printf "%s ",k;}}'`'",'
 					echo '  "princeton_comon_dir":"'`ls -d /vservers/princeton_comon`'",'
 					echo '  "uptime":"'`cat /proc/uptime`'",'
 
@@ -277,7 +278,7 @@ EOF			""")
 
 			continue_slice_check = True
 			oval = values['princeton_comon_dir']
-			if "princeton_comon_dir" in oval:
+			if "princeton_comon" in oval:
 				values['princeton_comon_dir'] = True
 			else:
 				values['princeton_comon_dir'] = False