X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=statistics%2Fsliceavg.py;h=012ba6b1c1cb4b0bcaf0dffa02a0a16596d73376;hp=739814f4420f730298dbc84271cf93618348014a;hb=a043462186ca0db241c1b52b6660ee39dcbceb3e;hpb=8814d16dc60e8027c9a30963b47dd77b54efcdbf

diff --git a/statistics/sliceavg.py b/statistics/sliceavg.py
index 739814f..012ba6b 100755
--- a/statistics/sliceavg.py
+++ b/statistics/sliceavg.py
@@ -5,6 +5,8 @@ import sys
 
 from monitor.wrapper import plc
 
+from monitor.database.info.model import *
+
 api = plc.cacheapi
 api.AuthCheck()
 
@@ -18,28 +20,29 @@ for site in api.GetSites({'peer_id': None}):
 	sliver_cnt = 0
 	for slice in sl:
 		sliver_cnt += len(slice['node_ids'])
-	val = (site['login_base'], sliver_cnt)
+	val = (site['login_base'], sliver_cnt, site['max_slices'])
 	site_list.append(val)
 	#print val
 
-print "------------------------------------------"
 site_list.sort(lambda x,y: cmp(y[1], x[1]))
 totals = 0
 use_count = 0
+print "loginbase,status,sliver_count,max_slices"
 for i in site_list:
 	if i[1] != 0: 
-		print "%10s %s" % i
+		h = HistorySiteRecord.get_by(loginbase=i[0])
+		print "%10s,%s,%s,%s" % (i[0],h.status, i[1], i[2])
 		use_count += 1
 	totals += i[1]
 
 site_avg = totals/len(site_list)
 
-print "high: %s %s" % site_list[0]
-print "low: %s %s" % site_list[-1]
-print "median: %s %s" % site_list[len(site_list)/2]
-print "used median: %s %s" % site_list[use_count/2]
-print "all avg: %s" % site_avg
-print "used avg: %s" % (totals/use_count)
-print "totals: %s" % totals 
-print "use_count: %s" % use_count
-print "site_count: %s" % len(site_list)
+#print "high: %s %s" % site_list[0]
+#print "low: %s %s" % site_list[-1]
+#print "median: %s %s" % site_list[len(site_list)/2]
+#print "used median: %s %s" % site_list[use_count/2]
+#print "all avg: %s" % site_avg
+#print "used avg: %s" % (totals/use_count)
+#print "totals: %s" % totals 
+#print "use_count: %s" % use_count
+#print "site_count: %s" % len(site_list)