Removing datasource and fiter variables from gadgets
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f41b6cef Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f41b6cef Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f41b6cef Branch: refs/heads/stratos-4.1.x Commit: f41b6cef3fd389eaaba431c6371afd3503d98e04 Parents: 6287466 Author: Thanuja <[email protected]> Authored: Wed Oct 21 13:00:28 2015 +0530 Committer: Thanuja <[email protected]> Committed: Wed Oct 21 13:00:28 2015 +0530 ---------------------------------------------------------------------- .../GadgetMemberCount/Member_Count/js/gadgetconf.js | 1 - .../GadgetMemberCount/Member_Count/js/main.js | 5 +---- .../Member_Information/js/gadgetconf.js | 1 - .../GadgetMemberInformation/Member_Information/js/main.js | 7 ++----- .../GadgetMemberStatus/Member_Status/js/gadgetconf.js | 1 - .../GadgetMemberStatus/Member_Status/js/main.js | 7 ++----- 6 files changed, 5 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f41b6cef/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/gadgetconf.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/gadgetconf.js b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/gadgetconf.js index 5cee4a2..503e038 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/gadgetconf.js +++ b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberCount/Member_Count/js/gadgetconf.js @@ -21,7 +21,6 @@ var gadgetConfig = { "id": "Member_Count", "title": "Member_Count", - "datasource": "MEMBER_COUNT", "type": "batch", "columns": [ { http://git-wip-us.apache.org/repos/asf/stratos/blob/f41b6cef/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 86bf4db..928eef7 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 @@ -18,7 +18,7 @@ * under the License. * */ -var datasource, type, columns, filter, maxUpdateValue; +var type, columns, maxUpdateValue; var REFRESH_INTERVAL = 5000; var dataLoaded = true; @@ -27,8 +27,6 @@ var applicationId = ''; var clusterId = ''; //loading gadget configuration -datasource = gadgetConfig.datasource; -filter = gadgetConfig.filter; type = gadgetConfig.type; var counter = 0; maxUpdateValue = gadgetConfig.maxUpdateValue; @@ -71,7 +69,6 @@ function fetchData(callback) { if (application != "") { var request = { - tableName: datasource, applicationId: application, clusterId: cluster, time: time http://git-wip-us.apache.org/repos/asf/stratos/blob/f41b6cef/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/gadgetconf.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/gadgetconf.js b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/gadgetconf.js index a8e3ff4..813c13a 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/gadgetconf.js +++ b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberInformation/Member_Information/js/gadgetconf.js @@ -21,7 +21,6 @@ var gadgetConfig = { "id": "Member_Information", "title": "Member Information", - "datasource": "MEMBER_INFORMATION", "type": "batch", "columns": [ { http://git-wip-us.apache.org/repos/asf/stratos/blob/f41b6cef/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 54cfea1..095b91a 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 @@ -18,7 +18,7 @@ * under the License. * */ -var datasource, type, columns, filter, maxUpdateValue; +var type, columns, maxUpdateValue; var REFRESH_INTERVAL = 5000; var dataLoaded = true; @@ -27,8 +27,6 @@ var applicationId = ''; var clusterId = ''; //this needs to be loaded from an autogenerated -datasource = gadgetConfig.datasource; -filter = gadgetConfig.filter; type = gadgetConfig.type; var counter = 0; maxUpdateValue = gadgetConfig.maxUpdateValue; @@ -43,7 +41,7 @@ gadgets.HubSettings.onConnect = function () { //first, fetch datasource schema -getColumns(datasource); +getColumns(); //load data immediately fetchData(drawChart); @@ -70,7 +68,6 @@ function fetchData(callback) { if (application != "") { var request = { - tableName: datasource, applicationId: application, clusterId: cluster }; http://git-wip-us.apache.org/repos/asf/stratos/blob/f41b6cef/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/gadgetconf.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/gadgetconf.js b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/gadgetconf.js index 7a47acc..886ed4d 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/gadgetconf.js +++ b/extensions/das/modules/artifacts/metering-dashboard/capps/stratos-metering-service/GadgetMemberStatus/Member_Status/js/gadgetconf.js @@ -21,7 +21,6 @@ var gadgetConfig = { "id": "Member_Status", "title": "Member Status", - "datasource": "MEMBER_STATUS", "type": "batch", "columns": [ { http://git-wip-us.apache.org/repos/asf/stratos/blob/f41b6cef/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 a103dd6..3e9a270 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 @@ -18,7 +18,7 @@ * under the License. * */ -var datasource, type, columns, filter, maxUpdateValue; +var type, columns, maxUpdateValue; var REFRESH_INTERVAL = 5000; var dataLoaded = true; @@ -28,8 +28,6 @@ var applicationId = ''; var clusterId = ''; //this needs to be loaded from an autogenerated -datasource = gadgetConfig.datasource; -filter = gadgetConfig.filter; type = gadgetConfig.type; var counter = 0; maxUpdateValue = gadgetConfig.maxUpdateValue; @@ -43,7 +41,7 @@ gadgets.HubSettings.onConnect = function () { }); }; -getColumns(datasource); +getColumns(); //load data immediately fetchData(drawChart); @@ -71,7 +69,6 @@ function fetchData(callback) { if (application != "") { var request = { - tableName: datasource, applicationId: application, clusterId: cluster, time: time
