Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 2c8de71a3 -> 382efe5e3
Changing time axis values based on time interval in member count gadget Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/382efe5e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/382efe5e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/382efe5e Branch: refs/heads/stratos-4.1.x Commit: 382efe5e3c880e7c4f3eb982137eb7b1f7c9ff7c Parents: cdc4d88 Author: Thanuja <[email protected]> Authored: Fri Oct 9 11:24:08 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Sat Oct 10 00:51:09 2015 +0530 ---------------------------------------------------------------------- .../metering-service/capps/jaggery-files/member-count.jag | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/382efe5e/extensions/das/metering-service/capps/jaggery-files/member-count.jag ---------------------------------------------------------------------- diff --git a/extensions/das/metering-service/capps/jaggery-files/member-count.jag b/extensions/das/metering-service/capps/jaggery-files/member-count.jag index 53d4767..4d403a2 100644 --- a/extensions/das/metering-service/capps/jaggery-files/member-count.jag +++ b/extensions/das/metering-service/capps/jaggery-files/member-count.jag @@ -61,27 +61,33 @@ var timeInterval = request.getParameter("time"); var interval = 1800000; var x_axis_interval; + var time_format; if (timeInterval === TIME_INTERVAL_1) { interval = 1800000; x_axis_interval = 60; + time_format = '%h:%i'; } else if (timeInterval === TIME_INTERVAL_2) { interval = 3600000; x_axis_interval = 120; + time_format = '%h:%i'; } else if (timeInterval === TIME_INTERVAL_3) { interval = 86400000; x_axis_interval = 2880; + time_format = '%Y:%m:%d %h:%i'; } else if (timeInterval === TIME_INTERVAL_4) { interval = 604800000; x_axis_interval = 20160; + time_format = '%Y:%m:%d %h:%i'; } else if (timeInterval === TIME_INTERVAL_5) { interval = 2419200000; x_axis_interval = 80640; + time_format = '%Y:%m:%d'; } var applicationId = request.getParameter("applicationId"); var clusterId = request.getParameter("clusterId"); if (clusterId == ALL_CLUSTERS) { - result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + x_axis_interval + "', '%Y:%m:%d %h:%i') AS Time, SUM(CreatedInstanceCount) AS CreatedInstanceCount , SUM(InitializedInstanceCount) AS InitializedInstanceCount , SUM(ActiveInstanceCount) AS ActiveInstanceCount, SUM(TerminatedInstanceCount) AS TerminatedInstanceCount FROM " + tableName + " WHERE ApplicationId=? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) GROUP BY FROM_UNIXTIME( CEILING( Time/('" + x_axis_interval + "'*1000)) *'"+x_axis_interval+"', '%Y:%m:%d %h:%i'), ApplicationId", applicationId); + result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + x_axis_interval + "', '" + time_format + "') AS Time, SUM(CreatedInstanceCount) AS CreatedInstanceCount , SUM(InitializedInstanceCount) AS InitializedInstanceCount , SUM(ActiveInstanceCount) AS ActiveInstanceCount, SUM(TerminatedInstanceCount) AS TerminatedInstanceCount FROM " + tableName + " WHERE ApplicationId=? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) GROUP BY FROM_UNIXTIME( CEILING( Time/('" + x_axis_interval + "'*1000)) *'"+x_axis_interval+"', '%Y:%m:%d %h:%i'), ApplicationId", applicationId); } else { result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + x_axis_interval + "', '" + time_format + "') AS Time, SUM(CreatedInstanceCount) AS CreatedInstanceCount , SUM(InitializedInstanceCount) AS InitializedInstanceCount , SUM(ActiveInstanceCount) AS ActiveInstanceCount, SUM(TerminatedInstanceCount) AS TerminatedInstanceCount FROM " + tableName + " WHERE ApplicationId=? AND ClusterAlias=? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) GROUP BY FROM_UNIXTIME( CEILING( Time/('" + x_axis_interval + "'*1000)) *'"+x_axis_interval+"', '%Y:%m:%d %h:%i')",applicationId, clusterId); }
