Merge branch 'test-john'

Changes in scripts and acronjobs to read from scratch0/MonitoringScripts and follow github folder structure. All changes tested and running.
CMSCompOps · Jun 6, 2014 · 7c50d8f · 7c50d8f
1 parent ac776a2
commit 7c50d8f
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 107 deletions.
diff --git a/Pledges_View_SSB/prod_cores/Readme.txt b/Pledges_View_SSB/prod_cores/Readme.txt
@@ -6,5 +6,5 @@ output file 	prod.txt
 web		https://cmst1.web.cern.ch/CMST1/SST/prod.txt
 
 —-
-Script in acrontab jartieda
-*/05 * * * * lxplus /afs/cern.ch/user/j/jartieda/MonitoringScripts/Pledges_View_SSB/prod_cores/run_prodcores.sh &> /dev/null
+Script in acrontab cmst1
+*/05 * * * * lxplus /afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/Pledges_View_SSB/prod_cores/run_prodcores.sh &> /dev/null
diff --git a/Pledges_View_SSB/prod_cores/run_prodcores.sh b/Pledges_View_SSB/prod_cores/run_prodcores.sh
@@ -1,33 +1,33 @@
 #!/bin/bash
 clear
-location="/afs/cern.ch/user/j/jartieda/MonitoringScripts/Pledges_View_SSB/prod_cores"
+location="/afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/Pledges_View_SSB/prod_cores"
+outputdir="/afs/cern.ch/user/c/cmst1/www/SST"
 cd $location
 # Email if things are running slowly
 if [ -f scriptRunning.run ];
 then
-   echo "run_prodcores.sh is already running. Will send an email to the admin."
-   # script to send simple email
-   # email subject
-   SUBJECT="[Prod[Cores]] load Prod[Cores]"
-   # Email To ?
-   EMAIL="[email protected], [email protected]"
-   # Email text/message
-   if [ -f emailmessage.txt ];
-   then
-      rm emailmessage.txt
-   fi
-   touch emailmessage.txt
-   EMAILMESSAGE="/tmp/emailmessage.txt"
-   echo "run_prodcores.sh  is running to slowly."
-   # send an email using /bin/mail
-   /bin/mail -s "$SUBJECT" "$EMAIL" < $EMAILMESSAGE
-
+	echo "run_prodcores.sh is already running. Will send an email to the admin."
+	# script to send simple email
+	# email subject
+	SUBJECT="Prod[Cores] running slowly"
+	# Email To ?
+	EMAIL="[email protected]"
+	# Email text/message
+    if [ -f emailmessage.txt ];
+    then
+    	rm emailmessage.txt
+    fi
+    touch emailmessage.txt
+    EMAILMESSAGE="/tmp/emailmessage.txt"
+    echo "run_prodcores.sh is stuck!!"> $EMAILMESSAGE
+    echo $location >>$EMAILMESSAGE
+    # send an email using /bin/mail
+    /bin/mail -s "$SUBJECT" "$EMAIL" < $EMAILMESSAGE
 else
-     echo "bash run_prodcores.sh succesfully"
-     touch scriptRunning.run
+	echo "bash run_prodcores.sh started succesfully"
+	touch scriptRunning.run
 fi
 
-
 #Run the script
 txt="prod"
 echo "python prodcores.py"
@@ -37,7 +37,7 @@ problem="$?"
 echo "problem: $problem"
 echo "The files were created succesfully."
 
-cp $txt".txt"  /afs/cern.ch/user/c/cmst1/www/SST
-cp $txt".json"  /afs/cern.ch/user/c/cmst1/www/SST
+cp $txt".txt"  $outputdir
+cp $txt".json" $outputdir
 
-rm scriptRunning.run
+rm scriptRunning.run
diff --git a/SR_View_SSB/ActiveSites/Readme.txt b/SR_View_SSB/ActiveSites/Readme.txt
@@ -13,15 +13,15 @@ Active Sites:		SR >=60% last 1 week OR last 3 months
 Any site that is not in this list will be automatically moved to the Waiting Room.
 
 --- INFO ---
-# acronjob in acrontab jartieda
+# acronjob in acrontab cmst1
 # 00 08 * * 1 => Every monday at 8AM
-# 00 08 * * 1 lxplus /afs/cern.ch/user/j/jartieda/MonitoringScripts/SR_View_SSB/ActiveSites/sActiveSites.sh &> /dev/null
+# 00 08 * * 1 lxplus /afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/ActiveSites/sActiveSites.sh &> /dev/null
 
 Script name:
 	sActiveSites.sh
 
 Script Location:
-	/afs/cern.ch/user/j/jartieda/MonitoringScripts/SR_View_SSB/ActiveSites/
+	/afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/ActiveSites
 
 Github repository:
 	https://github.com/CMSCompOps/MonitoringScripts/SR_View_SSB/ActiveSites/

diff --git a/SR_View_SSB/ActiveSites/sActiveSites.sh b/SR_View_SSB/ActiveSites/sActiveSites.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Script and files location
-location="/afs/cern.ch/user/j/jartieda/MonitoringScripts/SR_View_SSB/ActiveSites"
+location="/afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/ActiveSites"
 githublocation="https://raw.github.com/CMSCompOps/MonitoringScripts/master/SR_View_SSB/ActiveSites/"
 outFile="./WasCommissionedT2ForSiteMonitor.txt"
 ssbfeed="/afs/cern.ch/cms/LCG/SiteComm/T2WaitingList/WasCommissionedT2ForSiteMonitor.txt"
@@ -31,7 +31,7 @@ then
     # send an email using /bin/mail
     /bin/mail -s "$SUBJECT" "$EMAIL" < $EMAILMESSAGE
 else
-    echo "* previous bash sActiveSites.sh run succesfully"
+    echo "* previous bash sActiveSites.sh ran succesfully"
     touch scriptRunning.run
 fi
 

diff --git a/SR_View_SSB/WRControl/Readme.txt b/SR_View_SSB/WRControl/Readme.txt
@@ -6,4 +6,4 @@
 # web	https://cmst1.web.cern.ch/CMST1/WFMon/WaitingRoom_Sites.txt
 # Script in acrontab t1
 # 5,20,35,50 * * * * => Every 15 minutes every day (starting at 00:05)
-# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/source_The_Run_File_WaitingRoom_Sites.sh &> /dev/null
+# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/WRControl/source_The_Run_File_WaitingRoom_Sites.sh &> /dev/null
diff --git a/SR_View_SSB/WRControl/run_WaitingRoom_Sites.sh b/SR_View_SSB/WRControl/run_WaitingRoom_Sites.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-cd /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard
+location="/afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/WRControl"
+outputdir="/afs/cern.ch/user/c/cmst1/www/WFMon/"
+cd $location
 
 echo "exporting KEY and CERT"
 
@@ -15,7 +17,7 @@ then
    echo "run_WaitingRoom_Sites.sh is already running. Will send an email to the admin."
    # script to send simple email
    # email subject
-   SUBJECT="[MonitoringScripts] WRControl running slow"
+   SUBJECT="[MonitoringScripts] WRControl running slowly."
    # Email To ?
    EMAIL="[email protected]"
    # Email text/message
@@ -25,13 +27,13 @@ then
    fi
    touch emailmessage.txt
    EMAILMESSAGE="/tmp/emailmessage.txt"
-   echo "run_WaitingRoom_Sites.sh  is running to slowly. See: /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/"> $EMAILMESSAGE
-   echo "/afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/" >>$EMAILMESSAGE
+   echo "run_WaitingRoom_Sites.sh  is running slowly." > $EMAILMESSAGE
+   echo $location >> $EMAILMESSAGE
    # send an email using /bin/mail
    /bin/mail -s "$SUBJECT" "$EMAIL" < $EMAILMESSAGE
 
 else
-     echo "bash run_WaitingRoom_Sites.sh succesfully"
+     echo "bash run_WaitingRoom_Sites.sh started succesfully"
      touch scriptRunning.run
 fi
 
@@ -45,6 +47,6 @@ cat sites_WaitingRoom.log
 problem="$?"
 echo "problem: $problem"
 
-cp $txt /afs/cern.ch/user/c/cmst1/www/WFMon/
-echo "WaitingRoom_Sites.txt copied to: /afs/cern.ch/user/c/cmst1/www/WFMon/ "
+cp $txt $outputdir
+echo "WaitingRoom_Sites.txt copied to: " $outputdir
 rm scriptRunning.run
diff --git a/SR_View_SSB/WRControl/source_The_Run_File_WaitingRoom_Sites.sh b/SR_View_SSB/WRControl/source_The_Run_File_WaitingRoom_Sites.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-cd /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard
+cd /afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/WRControl
 source run_WaitingRoom_Sites.sh
diff --git a/SR_View_SSB/WRCriteria/Readme.txt b/SR_View_SSB/WRCriteria/Readme.txt
@@ -9,4 +9,4 @@
 # web	https://cmst1.web.cern.ch/CMST1/WFMon/BadSites_SiteReadiness.txt
 # Script in acrontab t1
 # 5,20,35,50 * * * * => Every 15 minutes every day (starting at 00:05)
-# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/SiteReadiness_Dashboard/run_badSites_SiteReadiness.sh &> /dev/null 
+# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/WRCriteria/run_badSites_SiteReadiness.sh &> /dev/null 
diff --git a/SR_View_SSB/WRCriteria/run_badSites_SiteReadiness.sh b/SR_View_SSB/WRCriteria/run_badSites_SiteReadiness.sh
@@ -1,23 +1,15 @@
 #!/bin/sh
-#
-# Sten Luyckx
-# Script in acrontab t1
-# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/SiteReadiness_Dashboard/run_badSites_SiteReadiness.sh &> /dev/null 
-# Green red if : site readiness percentage is bigger or smaller than 60 % for both the last week as in the last 3 months
-# Script for Dashboard metric 152: SiteReadiness 1W&3M (>60%) 
-# outputfile BadSites_SiteReadiness.txt
-# outputdir /afs/cern.ch/user/c/cmst1/www/WFMon/
-
-
-cd /afs/cern.ch/user/c/cmst1/scratch0/SiteReadiness_Dashboard
+location="/afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/WRCriteria/"
+outputdir="/afs/cern.ch/user/c/cmst1/www/WFMon/"
+cd $location
 
 # Email if things are running slowly
 if [ -f scriptRunning.run ];
 then
    echo "bash run_badSites_SiteReadiness.sh is already running. Will send an email to the admin."
    # script to send simple email
    # email subject
-   SUBJECT="[MonitoringScripts] WRCriteria is running slow"
+   SUBJECT="[MonitoringScripts] WRCriteria is running slowly"
    # Email To ?
    EMAIL="[email protected]"
    # Email text/message
@@ -27,8 +19,8 @@ then
    fi
    touch emailmessage.txt
    EMAILMESSAGE="/tmp/emailmessage.txt"
-   echo "Run_badSites_SiteReadiness.sh  is running to slowly. See: /afs/cern.ch/user/c/cmst1/scratch0/SiteReadiness_Dashboard"> $EMAILMESSAGE
-   echo "/afs/cern.ch/user/c/cmst1/scratch0/SiteReadiness_Dashboard" >>$EMAILMESSAGE
+   echo "Run_badSites_SiteReadiness.sh  is running slowly."> $EMAILMESSAGE
+   echo $location >>$EMAILMESSAGE
    # send an email using /bin/mail
    /bin/mail -s "$SUBJECT" "$EMAIL" < $EMAILMESSAGE
 
@@ -46,6 +38,6 @@ python badsites_SiteReadiness.py $txt &> badSites_SiteReadiness.log
 problem="$?"
 echo "problem: $problem"
 
-cp $txt /afs/cern.ch/user/c/cmst1/www/WFMon/
-echo "BadSites_SiteReadiness.txt copied to: /afs/cern.ch/user/c/cmst1/www/WFMon/ "
+cp $txt $outputdir
+echo "BadSites_SiteReadiness.txt copied to: " $outputdir
 rm scriptRunning.run
diff --git a/SR_View_SSB/WRDays/Readme.txt b/SR_View_SSB/WRDays/Readme.txt
@@ -8,4 +8,4 @@
 # web	https://cmst1.web.cern.ch/CMST1/WFMon/WaitingRoom_1MonthSum.txt
 # Script in acrontab t1
 # 5,20,35,50 * * * * => Every 15 minutes every day (starting at 00:05)
-# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/run_WaitingRoom_Sites.sh &> /dev/null
+# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/WRDays/run_WaitingRoom_Sites.sh &> /dev/null
diff --git a/SR_View_SSB/WRDays/run_WaitingRoom_Sites.sh b/SR_View_SSB/WRDays/run_WaitingRoom_Sites.sh
@@ -1,23 +1,14 @@
 #!/bin/bash
-# Script in acrontab t1
-# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/run_WaitingRoom_Sites.sh &> /dev/null
-# Script for Dashboard metric 154, 155, 156
-# outputfile WaitingRoom_1MonthSum.txt
-# outputfile WaitingRoom_2MonthSum.txt
-# outputfile WaitingRoom_3MonthSum.txt
-# this script read all of data from http://dashb-ssb.cern.ch/dashboard/ according to column, dateFrom, dateTo, sites and it calculates How many days Sites are in WaitingRoom as last 1 month, last 2 months, last 3 months. 
-clear
-#fixing access
-#source /afs/cern.ch/project/gd/LCG-share/new_3.2/etc/profile.d/grid_env.sh
-#voms-proxy-init -voms cms
-# Email if things are running slowly
+location="/afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB/WRDays/"
+outputdir="afs/cern.ch/user/c/cmst1/www/WFMon/"
+cd $location
 
 if [ -f scriptRunning.run ];
 then
    echo "run_WaitingRoom_SumMetrics.sh is already running. Will send an email to the admin."
    # script to send simple email
    # email subject
-   SUBJECT="[MonitoringScripts] WRDays running slow"
+   SUBJECT="[MonitoringScripts] WRDays running slowly"
    # Email To ?
    EMAIL="[email protected]"
    # Email text/message
@@ -27,26 +18,25 @@ then
    fi
    touch emailmessage.txt
    EMAILMESSAGE="/tmp/emailmessage.txt"
-   echo "run_WaitingRoom_SumMetrics.sh  is running to slowly. See: /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/"> $EMAILMESSAGE
-   echo "/afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/" >>$EMAILMESSAGE
+   echo "run_WaitingRoom_SumMetrics.sh  is running slowly."> $EMAILMESSAGE
+   echo $location >>$EMAILMESSAGE
    # send an email using /bin/mail
    /bin/mail -s "$SUBJECT" "$EMAIL" < $EMAILMESSAGE
 
 else
-     echo "bash run_WaitingRoom_SumMetrics.sh succesfully"
+     echo "bash run_WaitingRoom_SumMetrics.sh started succesfully"
      touch scriptRunning.run
 fi
 
 
 #Run the script
 txt="WaitingRoom_"  #postfix in code itself
 echo "python waitingRoom_SummedMetrics.py $txt1"
-python /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/waitingRoom_SummedMetrics.py $txt &> /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/sites_WaitingRoom_SummedMetrics.log
-#cat sites_WaitingRoom_SummedMetrics.log
+python waitingRoom_SummedMetrics.py $txt &> sites_WaitingRoom_SummedMetrics.log
 
 problem="$?"
 echo "problem: $problem"
 
-cp "/afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/"$txt*.txt /afs/cern.ch/user/c/cmst1/www/WFMon/
-echo "WaitingRoom_XMonthSum.txt files copied to: /afs/cern.ch/user/c/cmst1/www/WFMon/ "
-rm scriptRunning.run
+cp $txt*.txt $outputdir
+echo "WaitingRoom_XMonthSum.txt files copied to: " $outputdir
+rm scriptRunning.run
diff --git a/SR_View_SSB/WRDays/waitingRoom_SummedMetrics.py b/SR_View_SSB/WRDays/waitingRoom_SummedMetrics.py
@@ -94,8 +94,7 @@ def main_function(outputfile_txt, submonths):
   print days_per_site
 
   # write to file
-  #f1=open('./'+outputfile_txt, 'w+')
-  f1=open('/afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/'+outputfile_txt, 'w')
+  f1=open('./'+outputfile_txt, 'w+')
   f1.write('# This txt goes into SSB and shows the number of days a site has been in the Waiting Room for X months --> See filename)\n')
   f1.write('# Readme:\n# https://raw.githubusercontent.com/CMSCompOps/MonitoringScripts/master/SR_View_SSB/WRDays/Readme.txt\n')
   now_write = time.strftime('%Y-%m-%d %H:%M:%S')

diff --git a/SR_View_SSB/copy2locations4acronjobs.sh b/SR_View_SSB/copy2locations4acronjobs.sh
@@ -1,21 +1,18 @@
 #!/bin/sh
-# before copying files please do a git pull at:
-base="/afs/cern.ch/user/j/jartieda/MonitoringScripts/"
-cd $base
+location="/afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/SR_View_SSB"
+cd $location
 git pull
 
-location=$base"SR_View_SSB/"
-
 #ActiveSites
 # Already in the right location: $location/ActiveSites/
 
 #WRControl
-cp -a $location/WRControl/. /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/
+#cp -a $location/WRControl/. /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/
 
 #WRCriteria
-cp -a $location/WRCriteria/. /afs/cern.ch/user/c/cmst1/scratch0/SiteReadiness_Dashboard/
+#cp -a $location/WRCriteria/. /afs/cern.ch/user/c/cmst1/scratch0/SiteReadiness_Dashboard/
 
 #WRDays
-cp -a $location/WRDays/. /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/
+#cp -a $location/WRDays/. /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/
 
-echo "*** All copies completed ***"
+#echo "*** All copies completed ***"
diff --git a/WFM_Input_DashBoard/Readme.rtf b/WFM_Input_DashBoard/Readme.rtf
@@ -1,11 +1,11 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \margl1440\margr1440\vieww12600\viewh7800\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
 
-\f0\fs24 \cf0 # Script in acrontab t1\
-# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/WFM_Input_DashBoard/runWFMonDBShort.sh &> /dev/null\
+\f0\fs24 \cf0 # Script in acrontab cmst1\
+# 5,20,35,50 * * * * lxplus ssh vocms202 /afs/cern.ch/user/c/cmst1/scratch0/MonitoringScripts/WFM_Input_DashBoard/runWFMonDBShort.sh &> /dev/null\
 # json files are fetched by Dashboardteam, via a special way. Cant be changed by myself\
 # Script for Dashboard metric (part of) 137, 138: Running/Pending jobs . This metric is shared with that of the # on voboxes instead of only on per sites\
 # outputfile SB_siteInfo.json SSB_voBoxInfo.json Running*.txt Pending*.txt per Type of job \