updates

multi-core.py

@@ -1,8 +1,45 @@
 #!/usr/bin/python26
+import sys
+import datetime
 import json
 from pprint import pprint
-FILE="/crabprod/CSstoragePath/Monitor-json/monitor-multicore-production-2014-10-15-Z19:28.json"
-with open(FILE) as json_data:
+
+
+print " Pool Name,       Date,     Time,",
+firstline=0
+
+import glob
+FILES=glob.glob("/crabprod/CSstoragePath/Monitor-json/monitor-multicore-*.json")
+for FILE in FILES :
+
+  with open(FILE) as json_data:
     d = json.load(json_data)
     json_data.close()
-    pprint(d)
+    #pprint(d)
+
+  TABLES=d['Multi-core pilot monitoring']
+  if firstline==0 :
+    firstline=1
+    for TABLE in sorted(TABLES) :
+      if 'Cpus' in TABLE :
+        print TABLE+" Total,"+TABLE+" Wasted,",
+    print
+
+  POOL=FILE.split('-')
+  print (POOL[3]+",").ljust(11),
+
+  now=int(d['Multi-core pilot monitoring']['Time'])
+  readable_date=datetime.datetime.utcfromtimestamp(now).strftime('%Y-%m-%d, %H:%M:%S,')
+
+  print readable_date,
+
+  for TABLE in sorted(TABLES) :
+    if 'Cpus' in TABLE :
+      busy=0
+      total=0
+      for data in d['Multi-core pilot monitoring'][TABLE]['data']:
+        if data[1]=="Busy" : busy+=data[2]
+        total+=data[2]
+      wasted=total-busy
+      print str(total).rjust(6)+", "+str(wasted).rjust(6)+",",
+  print

multi-core.sh

@@ -261,13 +261,13 @@ echo "}"
 return
 }
 
+JSONFILE=${glideinWMSMonitor_OUTPUT_DIR}-json/monitor-multicore-production-`/bin/date +%F-Z%R -u`.json
+writeoutjsonfile vocms97.cern.ch > $JSONFILE
+
 JSONFILE=${glideinWMSMonitor_OUTPUT_DIR}-json/monitor-multicore-anaops-`/bin/date +%F-Z%R -u`.json
 writeoutjsonfile glidein-collector.t2.ucsd.edu > $JSONFILE
 
 JSONFILE=${glideinWMSMonitor_OUTPUT_DIR}-json/monitor-multicore-global-`/bin/date +%F-Z%R -u`.json
 writeoutjsonfile vocms097.cern.ch > $JSONFILE
 
-JSONFILE=${glideinWMSMonitor_OUTPUT_DIR}-json/monitor-multicore-production-`/bin/date +%F-Z%R -u`.json
-writeoutjsonfile vocms97.cern.ch > $JSONFILE
-
 exit