Repository: stratos Updated Branches: refs/heads/master 0a5fec3b9 -> d559479f2
Calling fetchData() once filtering values are selected Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7d33cb38 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7d33cb38 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7d33cb38 Branch: refs/heads/master Commit: 7d33cb3818d8544a1dc37bbc2fef3794f4454ee4 Parents: 5781994 Author: Thanuja <[email protected]> Authored: Wed Feb 10 14:11:51 2016 +0530 Committer: Thanuja <[email protected]> Committed: Wed Feb 10 15:18:06 2016 +0530 ---------------------------------------------------------------------- .../GadgetApplicationSignUps/Application_Signups/index.xml | 2 +- .../GadgetApplicationSignUps/Application_Signups/js/main.js | 5 +++++ .../GadgetMemberCount/Member_Count/js/main.js | 5 +++++ .../GadgetMemberInformation/Member_Information/js/main.js | 5 +++++ .../GadgetMemberStatus/Member_Status/js/main.js | 5 +++++ .../GadgetInFlightRequest/In_Flight_Request/js/main.js | 5 +++++ .../GadgetLoadAverage/Load_Average/js/main.js | 5 +++++ .../GadgetMemoryUsage/Memory_Usage/js/main.js | 5 +++++ .../GadgetScalingDetails/Scaling_Details/js/main.js | 5 +++++ 9 files changed, 41 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7d33cb38/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/index.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/index.xml b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/index.xml index cd9be65..f69a9c3 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/index.xml +++ b/extensions/das/modules/artifacts/metering-dashboard/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> http://git-wip-us.apache.org/repos/asf/stratos/blob/7d33cb38/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/js/main.js b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/js/main.js index 39adfcd..228d8eb 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetApplicationSignUps/Application_Signups/js/main.js +++ b/extensions/das/modules/artifacts/metering-dashboard/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", http://git-wip-us.apache.org/repos/asf/stratos/blob/7d33cb38/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/main.js b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/main.js index 928eef7..3c43aae 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/main.js +++ b/extensions/das/modules/artifacts/metering-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", http://git-wip-us.apache.org/repos/asf/stratos/blob/7d33cb38/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/main.js b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/main.js index 095b91a..e63d14c 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/main.js +++ b/extensions/das/modules/artifacts/metering-dashboard/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", http://git-wip-us.apache.org/repos/asf/stratos/blob/7d33cb38/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/main.js b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/main.js index 3e9a270..3a8b60e 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/main.js +++ b/extensions/das/modules/artifacts/metering-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", http://git-wip-us.apache.org/repos/asf/stratos/blob/7d33cb38/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetInFlightRequest/In_Flight_Request/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetInFlightRequest/In_Flight_Request/js/main.js b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetInFlightRequest/In_Flight_Request/js/main.js index a969a39..6375574 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetInFlightRequest/In_Flight_Request/js/main.js +++ b/extensions/das/modules/artifacts/monitoring-dashboard/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", http://git-wip-us.apache.org/repos/asf/stratos/blob/7d33cb38/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetLoadAverage/Load_Average/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetLoadAverage/Load_Average/js/main.js b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetLoadAverage/Load_Average/js/main.js index 59df7ad..678a681 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetLoadAverage/Load_Average/js/main.js +++ b/extensions/das/modules/artifacts/monitoring-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", http://git-wip-us.apache.org/repos/asf/stratos/blob/7d33cb38/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetMemoryUsage/Memory_Usage/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetMemoryUsage/Memory_Usage/js/main.js b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetMemoryUsage/Memory_Usage/js/main.js index f3200a2..1c6a6b5 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetMemoryUsage/Memory_Usage/js/main.js +++ b/extensions/das/modules/artifacts/monitoring-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", http://git-wip-us.apache.org/repos/asf/stratos/blob/7d33cb38/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetScalingDetails/Scaling_Details/js/main.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetScalingDetails/Scaling_Details/js/main.js b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetScalingDetails/Scaling_Details/js/main.js index cc4d466..6ec6321 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetScalingDetails/Scaling_Details/js/main.js +++ b/extensions/das/modules/artifacts/monitoring-dashboard/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",
