removed siteDB connection

Author: Gökhan Kandemir

SR_View_SSB/WRDays/run_WaitingRoom_Sites.sh

@@ -1,24 +1,15 @@
 #!/bin/bash
-# Sten Luyckx
 # 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
-# outputdir /afs/cern.ch/user/c/cmst1/www/WFMon/
-# usercert and userkey files must be in folder "data"
 # 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
-cd /afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/
-
-echo "exporting KEY and CERT"
-
 #fixing access
-export X509_USER_CERT=/data/certs/servicecert.pem
-export X509_USER_KEY=/data/certs/servicekey.pem
-
-
+#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
 
 if [ -f scriptRunning.run ];
@@ -58,4 +49,4 @@ echo "problem: $problem"
 
 cp $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
+rm scriptRunning.run

SR_View_SSB/WRDays/waitingRoom_SummedMetrics.py

@@ -37,54 +37,24 @@ def extractJson(col, startDate, endDate):
 
 #_______________________________________________________________________
 
-# function needed to fetch a list of all sites from siteDB
-def fetch_all_sites(url,api):
-  # examples in:
-  # https://github.com/gutsche/old-scripts/blob/master/SiteDB/extract_site_executive_mail_addresses.py
-  # https://github.com/dballesteros7/dev-scripts/blob/master/src/reqmgr/input-blocks.py
-  # https://twiki.cern.ch/twiki/bin/view/CMSPublic/CompOpsWorkflowOperationsWMAgentScripts#Resubmit
-  headers = {"Accept": "application/json"}
-  if 'X509_USER_PROXY' in os.environ:
-      print 'X509_USER_PROXY found'
-      conn = httplib.HTTPSConnection(url, cert_file = os.getenv('X509_USER_PROXY'), key_file = os.getenv('X509_USER_PROXY'))
-  elif 'X509_USER_CERT' in os.environ and 'X509_USER_KEY' in os.environ:
-      print 'X509_USER_CERT and X509_USER_KEY found'
-      conn = httplib.HTTPSConnection(url, cert_file = os.getenv('X509_USER_CERT'), key_file = os.getenv('X509_USER_KEY'))
-  else:
-      print 'You need a valid proxy or cert/key files'
-      sys.exit()
-  print 'conn found in if else structure'
-  r1=conn.request("GET",api, None, headers)
-  print 'r1 passed'
-  r2=conn.getresponse()
-  print 'r2 passed'
-  inputjson=r2.read()
-  print '-------------------------------------------------------------'
-  jn = simplejson.loads(inputjson)
-  conn.close()
-
-  site_T2= []
-  for i in jn['result']:
-    if i[jn['desc']['columns'].index('type')]=='cms':
-      sitedbname=i[jn['desc']['columns'].index('alias')]
-      if 'T2' in sitedbname:
-        site_T2.append(sitedbname)
+# function needed to fetch a list of all sites from metric 153
+def fetch_all_sites(jsn):
+  site_T2 = []
+  for row in jsn['csvdata']:
+    if row['VOName'][0:2] == 'T2':
+      site_T2.append(row['VOName'])
   return site_T2
 #_______________________________________________________________________
 
-def main_function(outputfile_txt, submonths,allSites):
+def main_function(outputfile_txt, submonths):
   print outputfile_txt
   columnnumber='153'
   enddate=date.today() # query date
   startdate=addmonths(enddate,submonths) # query date
   start=startdate.strftime("%Y-%m-%d") # as string field to query
   end=enddate.strftime("%Y-%m-%d") # as string field to query
   jsn=extractJson(columnnumber, start, end) # results from dashboard extracts into JSON file
-  filename = 'tmpjson' + start + '.json'
-  f=open(filename,'w')
-  f.write(unicode(simplejson.dumps(jsn, ensure_ascii=False)))
-  f.close()
- 
+  allSites = fetch_all_sites(jsn) 
   # sum @ days 
   days_per_site={}
   for site in allSites: # Read all sites from allsites variable
@@ -123,12 +93,12 @@ def main_function(outputfile_txt, submonths,allSites):
     	print '------------------------------'
   print days_per_site
 
-
   # write to file
-  f1=open('./'+outputfile_txt, 'w+')
+  #f1=open('./'+outputfile_txt, 'w+')
+  f1=open('/afs/cern.ch/user/c/cmst1/scratch0/Waitingroom_Dashboard/Waitingroom_SummedMetric/'+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=(datetime.utcnow()).strftime("%Y-%m-%d %H:%M:%S")
+  now_write = time.strftime('%Y-%m-%d %H:%M:%S')
   print "Local current time :", now_write
   link="https://dashb-ssb.cern.ch/dashboard/request.py/siteviewhistorywithstatistics?columnid=153#time=2184&start_date=&end_date=&use_downtimes=false&merge_colors=false&sites=all"
   for key, number in days_per_site.iteritems():
@@ -142,12 +112,12 @@ def main_function(outputfile_txt, submonths,allSites):
 if __name__ == '__main__':
   outputfile_txt=sys.argv[1]
   print 'starting to fetch all sites from siteDB'
-  allSitesList = fetch_all_sites('cmsweb.cern.ch','/sitedb/data/prod/site-names')
-  main_function(outputfile_txt+'1MonthSum.txt',-1,allSitesList)
+  main_function(outputfile_txt+'1MonthSum.txt',-1)
   print '__________________________________________________'
   print '__________________________________________________'
-  main_function(outputfile_txt+'2MonthSum.txt',-2,allSitesList)
+  main_function(outputfile_txt+'2MonthSum.txt',-2)
   print '__________________________________________________'
   print '__________________________________________________'
-  main_function(outputfile_txt+'3MonthSum.txt',-3,allSitesList)
+  main_function(outputfile_txt+'3MonthSum.txt',-3)
+