# NOTE: Must be an absolute path to guarantee it is read.
INSTALLPATH=/usr/share/monitor/
-$INSTALLPATH/shconfig.py > $INSTALLPATH/monitorconfig.sh
+$INSTALLPATH/commands/shconfig.py > $INSTALLPATH/monitorconfig.sh
source $INSTALLPATH/monitorconfig.sh
cd ${MONITOR_SCRIPT_ROOT}
set -e
DATE=`date +%Y-%m-%d-%T`
MONITOR_PID="${MONITOR_SCRIPT_ROOT}/SKIP"
+function send_mail ()
+{
+ subject=$1
+ body=$2
+ mail -s "$subject" $exception_email <<EOF
+$body
+EOF
+}
+
+
echo "#######################################"; echo "Running Monitor at $DATE"; echo "######################################"
echo "Performing API test"
-API=$(./testapi.py)
+API=$(${MONITOR_SCRIPT_ROOT}/tools/testapi.py)
if [ "$API" != "ok" ] ; then
# NOTE: Do not try to run any commands if the API is obviously broken.
echo "API IS DOWN : "`date`
#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}/tools/syncwithplc.py $DATE || :
+# CHECK AGENT IS UP AND RUNNING
+count=$( ssh-add -l | wc -l )
+if [ $count -lt 3 ] ; then
+ send_mail "ssh-agent is not up and running." "Add keys before monitoring can continue"
+ exit
+fi
+
+${MONITOR_SCRIPT_ROOT}/commands/syncwithplc.py $DATE || :
service plc restart monitor
echo "Performing FindAll Nodes"
ps ax | grep locfg | grep -v grep | awk '{print $1}' | xargs -r kill || :
-${MONITOR_SCRIPT_ROOT}/policy.py $DATE || :
+${MONITOR_SCRIPT_ROOT}/commands/policy.py $DATE || :
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