commit a5885442180d50c18b6779acffab062d512a2a6b
author Scott Baker <smbaker@gmail.com> Mon Apr 21 01:28:48 2014 -0700
committer Scott Baker <smbaker@gmail.com> Mon Apr 21 01:28:48 2014 -0700
tree f644c2e7d289b1b98b21a441fe9233454d37473c
parent 8b594db1208dd5ca5f6853f11ba239669dd05878

report allocated slivers in addition to active slivers

planetstack/core/plus/views.py

diff --git a/planetstack/core/plus/views.py b/planetstack/core/plus/views.py
index d4cc56b..38a7a96 100644
--- a/planetstack/core/plus/views.py
+++ b/planetstack/core/plus/views.py
@@ -212,7 +212,7 @@
 
     rows = bq.postprocess_results(rows, filter={"slice": "HyperCache"}, maxi=["cpu"], count=["hostname"], computed=["bytes_sent/elapsed"], groupBy=["Time","site"], maxDeltaTime=80)
 
-    bq.merge_datamodel_sites(rows)
+    bq.merge_datamodel_sites(rows, slice="HyperCache")
 
     new_rows = {}
     for row in rows:
@@ -220,7 +220,8 @@
                "long": float(row.get("long", 0)),
                "health": 0,
                "numNodes": int(row.get("numNodes",0)),
-               "numHPCSlivers": int(row.get("count_hostname", 0)),
+               "activeHPCSlivers": int(row.get("count_hostname", 0)),
+               "numHPCSlivers": int(row.get("allocated_slivers", 0)),
                "siteUrl": str(row.get("url", "")),
                "hot": float(row.get("hotness", 0.0)),
                "bandwidth": row.get("sum_computed_bytes_sent_div_elapsed",0),