Merge branch 'master' of https://github.com/Thanu/stratos. This closes …

…#505
apache · Feb 10, 2016 · d559479 · d559479
2 parents 0a5fec3 + 7d33cb3
commit d559479
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 1 deletion.
diff --git a/...ard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/index.xml b/...ard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/index.xml
@@ -77,7 +77,7 @@
  <div id="placeholder" class="demo-placeholder" style="height:90%"></div>
  <script language="javascript" type="text/javascript">
  if(jQuery("#placeholder").html() == ""){
- jQuery("#placeholder").append('<div id="noChart"><table><tr><td style="padding:30px 20px 0px 20px"><img src="../../portal/images/noEvents.png" align="left" style="width:24;height:24"/></td><td><br/><b><p><br/> Data is not available for plotting</p></b></td></tr><tr><td></td><td><p>The chart will be loaded once the dashboard receives events</p><td/></tr></table></div>');
+ jQuery("#placeholder").append('<div id="noChart"><table><tr><td style="padding:30px 20px 0px 20px"><img src="../../portal/images/noEvents.png" align="left" style="width:24;height:24"/></td><td><br/><b><p><br/>Please select an application to view data</p></b></td></tr></table></div>');
  }
  </script>
  </body>

diff --git a/...rd/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/js/main.js b/...rd/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/js/main.js
@@ -32,6 +32,7 @@ maxUpdateValue = gadgetConfig.maxUpdateValue;
 gadgets.HubSettings.onConnect = function () {
  gadgets.Hub.subscribe('application-signups-filter', function (topic, data) {
  applicationId = data['applicationId'];
+ fetchData(drawChart);
  });
 };
 
@@ -64,6 +65,10 @@ function fetchData(callback) {
  var request = {
  applicationId: application,
  };
+
+ jQuery("#placeholder").html("");
+ jQuery("#placeholder").append('<div id="noChart"><table><tr><td><b><p><br/>Updating</p></b></td></tr></table></div>');
+
  $.ajax({
  url: "/portal/apis/application-signups",
  method: "GET",

diff --git a/...tering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/main.js b/...tering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/main.js
@@ -37,6 +37,7 @@ gadgets.HubSettings.onConnect = function () {
  applicationId = data['applicationId'];
  timeInterval = data['timeInterval'];
  console.log("Member Filter Value:" + JSON.stringify(data));
+ fetchData(drawChart);
  });
 };
 
@@ -73,6 +74,10 @@ function fetchData(callback) {
  clusterId: cluster,
  time: time
  };
+
+ jQuery("#placeholder").html("");
+ jQuery("#placeholder").append('<div id="noChart"><table><tr><td><b><p><br/>Updating</p></b></td></tr></table></div>');
+
  $.ajax({
  url: "/portal/apis/member-count",
  method: "GET",

diff --git a/...oard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/main.js b/...oard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/main.js
@@ -36,6 +36,7 @@ gadgets.HubSettings.onConnect = function () {
  clusterId = data['clusterId'];
  applicationId = data['applicationId'];
  console.log("Member Filter Value:" + JSON.stringify(data));
+ fetchData(drawChart);
  });
 };
 
@@ -71,6 +72,10 @@ function fetchData(callback) {
  applicationId: application,
  clusterId: cluster
  };
+
+ jQuery("#placeholder").html("");
+ jQuery("#placeholder").append('<div id="noChart"><table><tr><td><b><p><br/>Updating</p></b></td></tr></table></div>');
+
  $.ajax({
  url: "/portal/apis/member-info",
  method: "GET",

diff --git a/...ring-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/main.js b/...ring-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/main.js
@@ -38,6 +38,7 @@ gadgets.HubSettings.onConnect = function () {
  applicationId = data['applicationId'];
  timeInterval = data['timeInterval'];
  console.log("Member Filter Value: " + JSON.stringify(data));
+ fetchData(drawChart);
  });
 };
 
@@ -73,6 +74,10 @@ function fetchData(callback) {
  clusterId: cluster,
  time: time
  };
+
+ jQuery("#placeholder").html("");
+ jQuery("#placeholder").append('<div id="noChart"><table><tr><td><b><p><br/>Updating</p></b></td></tr></table></div>');
+
  $.ajax({
  url: "/portal/apis/member-status",
  method: "GET",

diff --git a/...board/capps/stratos-monitoring-service/GadgetInFlightRequest/In_Flight_Request/js/main.js b/...board/capps/stratos-monitoring-service/GadgetInFlightRequest/In_Flight_Request/js/main.js
@@ -37,6 +37,7 @@ gadgets.HubSettings.onConnect = function () {
  memberId = data['memberId'];
  timeInterval = data['timeInterval'];
  console.log("Health Stats Filter Value:" + JSON.stringify(data));
+ fetchData(drawChart);
  });
 };
 
@@ -72,6 +73,10 @@ function fetchData(callback) {
  clusterId: cluster,
  time: time
  };
+
+ jQuery("#placeholder").html("");
+ jQuery("#placeholder").append('<div id="noChart"><table><tr><td><b><p><br/>Updating</p></b></td></tr></table></div>');
+
  $.ajax({
  url: "/portal/apis/in-flight-request",
  method: "GET",

diff --git a/...ring-dashboard/capps/stratos-monitoring-service/GadgetLoadAverage/Load_Average/js/main.js b/...ring-dashboard/capps/stratos-monitoring-service/GadgetLoadAverage/Load_Average/js/main.js
@@ -37,6 +37,7 @@ gadgets.HubSettings.onConnect = function () {
  memberId = data['memberId'];
  timeInterval = data['timeInterval'];
  console.log("Health Stats Filter Value:" + JSON.stringify(data));
+ fetchData(drawChart);
  });
 };
 
@@ -73,6 +74,10 @@ function fetchData(callback) {
  memberId: member,
  time: time
  };
+
+ jQuery("#placeholder").html("");
+ jQuery("#placeholder").append('<div id="noChart"><table><tr><td><b><p><br/>Updating</p></b></td></tr></table></div>');
+
  $.ajax({
  url: "/portal/apis/load-average",
  method: "GET",

diff --git a/...ring-dashboard/capps/stratos-monitoring-service/GadgetMemoryUsage/Memory_Usage/js/main.js b/...ring-dashboard/capps/stratos-monitoring-service/GadgetMemoryUsage/Memory_Usage/js/main.js
@@ -37,6 +37,7 @@ gadgets.HubSettings.onConnect = function () {
  memberId = data['memberId'];
  timeInterval = data['timeInterval'];
  console.log("Health Stats Filter Value:" + JSON.stringify(data));
+ fetchData(drawChart);
  });
 };
 
@@ -73,6 +74,10 @@ function fetchData(callback) {
  memberId: member,
  time: time
  };
+
+ jQuery("#placeholder").html("");
+ jQuery("#placeholder").append('<div id="noChart"><table><tr><td><b><p><br/>Updating</p></b></td></tr></table></div>');
+
  $.ajax({
  url: "/portal/apis/memory-usage",
  method: "GET",

diff --git a/...ashboard/capps/stratos-monitoring-service/GadgetScalingDetails/Scaling_Details/js/main.js b/...ashboard/capps/stratos-monitoring-service/GadgetScalingDetails/Scaling_Details/js/main.js
@@ -37,6 +37,7 @@ gadgets.HubSettings.onConnect = function () {
  memberId = data['memberId'];
  timeInterval = data['timeInterval'];
  console.log("Health Stats Filter Value:" + JSON.stringify(data));
+ fetchData(drawChart);
  });
 };
 
@@ -74,6 +75,10 @@ function fetchData(callback) {
  clusterId: cluster,
  time: time
  };
+
+ jQuery("#placeholder").html("");
+ jQuery("#placeholder").append('<div id="noChart"><table><tr><td><b><p><br/>Updating</p></b></td></tr></table></div>');
+
  $.ajax({
  url: "/portal/apis/scaling-details",
  method: "GET",