X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=automate-default.sh;h=3e65fcf0cd477edc26f52a7512d584720882ce79;hb=6c38b5cef7bf12fa4ade23ae1c54b3491797fb1d;hp=8b18032f4c52ecbe1856013560cf4e92ffab4c0e;hpb=c0c256ab8a054cfe53a1a32a569a6cc82f5a4a22;p=monitor.git

diff --git a/automate-default.sh b/automate-default.sh
index 8b18032..3e65fcf 100755
--- a/automate-default.sh
+++ b/automate-default.sh
@@ -56,13 +56,14 @@ if [ -z "$AGENT" ] ; then
         # if no agent is running, set it up.
         ssh-agent > ${MONITOR_SCRIPT_ROOT}/agent.sh
         source ${MONITOR_SCRIPT_ROOT}/agent.sh
+        ssh-add /etc/planetlab/myops_ssh_key.rsa
         ssh-add /etc/planetlab/debug_ssh_key.rsa
         ssh-add /etc/planetlab/root_ssh_key.rsa
 fi
 #TODO: should add a call to ssh-add -l to check if the keys are loaded or not.
 source ${MONITOR_SCRIPT_ROOT}/agent.sh
 
-${MONITOR_SCRIPT_ROOT}/checksync.py $DATE || :
+#${MONITOR_SCRIPT_ROOT}/checksync.py $DATE || :
 ${MONITOR_SCRIPT_ROOT}/syncwithplc.py $DATE || :
 service plc restart monitor
 
@@ -74,10 +75,11 @@ ps ax | grep BatchMode | grep -v grep | awk '{print $1}' | xargs -r kill || :
 # clean up stray 'locfg' processes that hang around inappropriately...
 ps ax | grep locfg | grep -v grep | awk '{print $1}' | xargs -r kill || :
 
-${MONITOR_SCRIPT_ROOT}/policy.py $DATE
-${MONITOR_SCRIPT_ROOT}/checksync.py $DATE || :
-service plc restart monitor
-curl -s 'http://summer.cs.princeton.edu/status/tabulator.cgi?table=table_nodeview&formatcsv' > /var/lib/monitor/comon/$DATE.comon.csv
+
+${MONITOR_SCRIPT_ROOT}/policy.py $DATE || :
+${MONITOR_SCRIPT_ROOT}/statistics/add-record.py || :
+curl -s 'http://summer.cs.princeton.edu/status/tabulator.cgi?table=table_nodeview&formatcsv' > /var/lib/monitor/comon/$DATE.comon.csv || :
 
 cp ${MONITOR_SCRIPT_ROOT}/monitor.log ${MONITOR_ARCHIVE_ROOT}/`date +%F-%H:%M`.monitor.log
+service plc restart monitor || :
 rm -f $MONITOR_PID