X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fscanapi.py;h=88bd5131f984874b4e23793afed7dff6be398160;hb=0ab12188e17261dd130208731b65f5f042969659;hp=327b2b44d70c4144ca0186a8f7945981621fe3bc;hpb=6c38b5cef7bf12fa4ade23ae1c54b3491797fb1d;p=monitor.git diff --git a/monitor/scanapi.py b/monitor/scanapi.py index 327b2b4..88bd513 100644 --- a/monitor/scanapi.py +++ b/monitor/scanapi.py @@ -236,8 +236,9 @@ class ScanNodeInternal(ScanInterface): echo "{" echo ' "kernel_version":"'`uname -a`'",' echo ' "bmlog":"'`ls /tmp/bm.log`'",' - echo ' "bootcd_version":"'`cat /mnt/cdrom/bootme/ID`'",' + echo ' "bootcd_version":"'`cat /mnt/cdrom/bootme/ID || cat /usr/bootme/ID`'",' echo ' "boot_server":"'`cat /mnt/cdrom/bootme/BOOTSERVER`'",' + echo ' "install_date":"'`python -c "import os,time,stat; print time.ctime(os.stat('/usr/boot/plnode.txt')[stat.ST_CTIME])" || python -c "import os,time,stat; print time.ctime(os.stat('/usr/boot/cacert.pem')[stat.ST_CTIME])"`'",' 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;}}'`'",' @@ -262,6 +263,7 @@ EOF """) else: values.update({'kernel_version': "", 'bmlog' : "", 'bootcd_version' : '', 'boot_server' : '', + 'install_date' : '', 'nm_status' : '', 'fs_status' : '', 'uptime' : '',