From: Scott Baker <smbaker@gmail.com>
Date: Fri, 25 Apr 2014 19:20:47 +0000 (-0700)
Subject: get BIGQUERY_TABLE setting from plstackapi config file
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c40941b4b7d5aeea42d24339efa337f7da48c702;p=plstackapi.git

get BIGQUERY_TABLE setting from plstackapi config file
---

diff --git a/planetstack/planetstack/settings.py b/planetstack/planetstack/settings.py
index d706245..ce13f08 100644
--- a/planetstack/planetstack/settings.py
+++ b/planetstack/planetstack/settings.py
@@ -240,3 +240,5 @@ LOGGING = {
         },
     }
 }
+
+BIGQUERY_TABLE = getattr(config, "bigquery_table", "demoevents")
diff --git a/planetstack/templates/admin/dashboard/welcome.html b/planetstack/templates/admin/dashboard/welcome.html
index 4967169..d8c3b70 100644
--- a/planetstack/templates/admin/dashboard/welcome.html
+++ b/planetstack/templates/admin/dashboard/welcome.html
@@ -73,8 +73,8 @@ function confirmDialog(title,msg) {
     <div id="HPCDashboard">
     <h1>CDN Operations View</h1>
     <span id="hpcSummary">
-        <span class="summary-attr"><b>Active Slivers:</b> <span id="active-slivers-value"> </span> </span>
-        <span class="summary-attr"><b>Overall Throughput:</b> <span id="overall-throughput-value"> </span>  </span>
+        <span class="summary-attr"><b>Allocated Slivers:</b> <span id="active-slivers-value"> </span> </span>
+        <span class="summary-attr"><b>Bytes Served:</b> <span id="overall-throughput-value"> </span>  </span>
         <span class="summary-attr-util"><b>Average CPU Utilization:</b> <span id="cpu-utilization-value"> </span>  </span>
     </span>
     <div id="map-us" ></div>