get BIGQUERY_TABLE setting from plstackapi config file
authorScott Baker <smbaker@gmail.com>
Fri, 25 Apr 2014 19:20:47 +0000 (12:20 -0700)
committerScott Baker <smbaker@gmail.com>
Fri, 25 Apr 2014 19:20:47 +0000 (12:20 -0700)
planetstack/planetstack/settings.py
planetstack/templates/admin/dashboard/welcome.html

index d706245..ce13f08 100644 (file)
@@ -240,3 +240,5 @@ LOGGING = {
         },
     }
 }
+
+BIGQUERY_TABLE = getattr(config, "bigquery_table", "demoevents")
index 4967169..d8c3b70 100644 (file)
@@ -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>