commit 0fd787d12c09a60af44102baea63a88a6e94309e
author Scott Baker <smbaker@gmail.com> Tue May 13 17:03:47 2014 -0700
committer Scott Baker <smbaker@gmail.com> Tue May 13 17:03:47 2014 -0700
tree a55251f2dbdeee5a87240d0b7d2cd91f00fc4699
parent 526b71ef03d14957f70311104a67b85eef8bd30b

change compose_query to use a filter dictionary, add queryspec to compose_cached_query

planetstack/core/static/page_analytics.js

diff --git a/planetstack/core/static/page_analytics.js b/planetstack/core/static/page_analytics.js
index b9d0c35..5f65fb2 100644
--- a/planetstack/core/static/page_analytics.js
+++ b/planetstack/core/static/page_analytics.js
@@ -1,7 +1,4 @@
-function getObjectAndEventQuery() {
-    var selectedNodeTxt = $('#currentOriginalNode').text();
-    selectedNodeTxt = selectedNodeTxt.trim();
-    selectedNodeTxt = selectedNodeTxt.split(' ').join('');//selectedNodeTxt.replace(" ", "")
+function getPageKind() {
     var parentNodeTxt = $('#selectedMainNav').text();
     parentNodeTxt = parentNodeTxt.replace("/\n","");
     parentNodeTxt = parentNodeTxt.replace("»","");
@@ -9,15 +6,23 @@
     if (parentNodeTxt.length > 0 && parentNodeTxt.charAt(parentNodeTxt.length-1)=='s') {
             parentNodeTxt = parentNodeTxt.substring(0, parentNodeTxt.length-1);
     }
+    return parentNodeTxt;
+}
+
+function getObjectQuery() {
+    var selectedNodeTxt = $('#currentOriginalNode').text();
+    selectedNodeTxt = selectedNodeTxt.trim();
+    selectedNodeTxt = selectedNodeTxt.split(' ').join('');//selectedNodeTxt.replace(" ", "")
+    parentNodeTxt = getPageKind();
 
     if (parentNodeTxt == "Slice") {
-        return "&event=libvirt_heartbeat&slice=" + selectedNodeTxt;
+        return "&slice=" + selectedNodeTxt;
     } else if (parentNodeTxt == "Site") {
-        return "&event=node_heartbeat&site=" + selectedNodeTxt;
+        return "&site=" + selectedNodeTxt;
     } else if (parentNodeTxt == "Node") {
-        return "&event=node_heartbeat&node=" + selectedNodeTxt;
+        return "&node=" + selectedNodeTxt;
     } else {
-        return "&event=node_heartbeat";
+        return "";
     }
 }
 
@@ -48,7 +53,7 @@
 }
 
 function updatePageAnalytics() {
-    var url= '/analytics/bigquery/?avg=%cpu&count=%hostname&cached=1' + getObjectAndEventQuery();
+    var url= '/analytics/bigquery/?avg=%cpu&count=%hostname&cached=default' + getObjectQuery();
     console.log(url);
     $.ajax({
     url: url,
@@ -75,7 +80,11 @@
 }
 
 function updatePageBandwidth() {
-    var url='/analytics/bigquery/?computed=%bytes_sent/%elapsed&cached=1' + getObjectAndEventQuery();
+    var url='/analytics/bigquery/?computed=%bytes_sent/%elapsed&cached=default' + getObjectQuery();
+
+    if (getPageKind()!="Slice") {
+        url = url + "&event=node_heartbeat";
+    }
 
     $.ajax({
     url : url,