http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/clusters.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/clusters.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/clusters.jag index fe863df..c8ca3c1 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/clusters.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/clusters.jag @@ -25,7 +25,7 @@ include('metering-authentication.jag'); try { var applicationId = request.getParameter('applicationId'); - var result = db.query("SELECT DISTINCT ClusterAlias FROM MEMBER_COUNT WHERE ApplicationId = ?", applicationId); + var result = db.query("SELECT DISTINCT ClusterAlias FROM MEMBER_STATUS WHERE ApplicationId = ?", applicationId); if (result != null) { print(result);
http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-count.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-count.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-count.jag index 6850012..871db4d 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-count.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-count.jag @@ -21,24 +21,16 @@ include('metering-authentication.jag'); (function () { - var log = new Log(); var TIME_INTERVAL_1 = '30 Min'; var TIME_INTERVAL_2 = '1 Hour'; var TIME_INTERVAL_3 = '1 Day'; var TIME_INTERVAL_4 = '1 Week'; var TIME_INTERVAL_5 = '1 Month'; + var TIME_INTERVAL_6 = '6 Month'; + var TIME_INTERVAL_7 = '1 Year'; var ALL_CLUSTERS = 'All Clusters'; - var content = request.getContent(); - var contentAsString = null; - if (content != '' && content != null) { - contentAsString = stringify(content); - if (log.isDebugEnabled()) { - log.debug("Value of content: " + contentAsString); - } - } - var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB"); try { @@ -46,36 +38,35 @@ include('metering-authentication.jag'); 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'; + } else if (timeInterval === TIME_INTERVAL_6) { + interval = 2419200000 * 6; + } else if (timeInterval === TIME_INTERVAL_7) { + interval = 2419200000 * 12; } + 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 + "', '" + time_format + "') AS Time, SUM(CreatedInstanceCount) AS CreatedInstanceCount , SUM(InitializedInstanceCount) AS InitializedInstanceCount , SUM(ActiveInstanceCount) AS ActiveInstanceCount, SUM(TerminatedInstanceCount) AS TerminatedInstanceCount FROM MEMBER_COUNT 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+"', '" + time_format + "'), ApplicationId", applicationId); + result = db.query("SELECT timestamp as Time, active_instances as ActiveInstances FROM " + + "APP_ACTIVE_MEMBER_COUNT WHERE " + "APPLICATION_ID=? AND TIMESTAMP > " + + "ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND TIMESTAMP <= " + + "ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)", 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 MEMBER_COUNT 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+"', '" + time_format + "')", applicationId, clusterId); + result = db.query("SELECT timestamp as Time, active_instances as ActiveInstances FROM " + + "CLUSTER_ACTIVE_MEMBER_COUNT WHERE " + "APPLICATION_ID=? AND CLUSTER_ALIAS=? AND TIMESTAMP > " + + "ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "') AND TIMESTAMP <= " + + "ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)", applicationId, clusterId); } print(result); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-info.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-info.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-info.jag index 68337f8..a107629 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-info.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-info.jag @@ -21,17 +21,8 @@ include('metering-authentication.jag'); (function () { - var log = new Log(); - var ALL_CLUSTERS = 'All Clusters'; - var content = request.getContent(); - var contentAsString = null; - if (content != '' && content != null) { - contentAsString = stringify(content); - if (log.isDebugEnabled()) { - log.debug("Value of content: " + contentAsString); - } - } + var ALL_CLUSTERS = 'All Clusters'; var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB"); @@ -41,9 +32,11 @@ include('metering-authentication.jag'); var clusterId = request.getParameter("clusterId"); if (clusterId == ALL_CLUSTERS) { - result = db.query("SELECT * FROM MEMBER_INFORMATION WHERE MemberId IN (SELECT DISTINCT MemberId FROM ANALYTICS_PROCESSED_DATA_STORE.MEMBER_STATUS WHERE ApplicationId= ?)", applicationId); + result = db.query("SELECT * FROM MEMBER_INFORMATION WHERE MemberId IN (SELECT DISTINCT MemberId FROM " + + "MEMBER_STATUS WHERE ApplicationId= ?)", applicationId); } else { - result = db.query("SELECT * FROM MEMBER_INFORMATION WHERE MemberId IN (SELECT DISTINCT MemberId FROM ANALYTICS_PROCESSED_DATA_STORE.MEMBER_STATUS WHERE ApplicationId= ? AND ClusterAlias= ?)", applicationId, clusterId); + result = db.query("SELECT * FROM MEMBER_INFORMATION WHERE MemberId IN (SELECT DISTINCT MemberId FROM " + + "MEMBER_STATUS WHERE ApplicationId= ? AND ClusterAlias= ?)", applicationId, clusterId); } print(result); } http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-status.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-status.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-status.jag index 2aff4ac..136c1fd 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-status.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/mysql/member-status.jag @@ -21,24 +21,16 @@ include('metering-authentication.jag'); (function () { - var log = new Log(); var TIME_INTERVAL_1 = '30 Min'; var TIME_INTERVAL_2 = '1 Hour'; var TIME_INTERVAL_3 = '1 Day'; var TIME_INTERVAL_4 = '1 Week'; var TIME_INTERVAL_5 = '1 Month'; + var TIME_INTERVAL_6 = '6 Month'; + var TIME_INTERVAL_7 = '1 Year'; var ALL_CLUSTERS = 'All Clusters'; - var content = request.getContent(); - var contentAsString = null; - if (content != '' && content != null) { - contentAsString = stringify(content); - if (log.isDebugEnabled()) { - log.debug("Value of content: " + contentAsString); - } - } - var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB"); try { @@ -56,14 +48,23 @@ include('metering-authentication.jag'); interval = 604800000; } else if (timeInterval === TIME_INTERVAL_5) { interval = 2419200000; + } else if (timeInterval === TIME_INTERVAL_6) { + interval = 2419200000 * 6; + } else if (timeInterval === TIME_INTERVAL_7) { + interval = 2419200000 * 12; } var applicationId = request.getParameter("applicationId"); var clusterId = request.getParameter("clusterId"); if (clusterId == ALL_CLUSTERS) { - result = db.query("SELECT FROM_UNIXTIME(Time/1000, '%Y:%m:%d %h:%i:%s') AS Time, MemberId, MemberStatus FROM MEMBER_STATUS WHERE ApplicationId= ? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) ORDER BY MemberID, Time", applicationId); + result = db.query("SELECT FROM_UNIXTIME(Time/1000, '%Y:%m:%d %H:%i:%s') AS Time, MemberId, MemberStatus " + + "FROM MEMBER_STATUS WHERE ApplicationId= ? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000 -'" + + interval + "') AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) ORDER BY MemberID, Time", applicationId); }else { - result = db.query("SELECT FROM_UNIXTIME(Time/1000, '%Y:%m:%d %h:%i:%s') AS Time, MemberId, MemberStatus FROM MEMBER_STATUS WHERE ApplicationId= ? AND ClusterAlias= ? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) ORDER BY MemberID, Time", applicationId, clusterId); + result = db.query("SELECT FROM_UNIXTIME(Time/1000, '%Y:%m:%d %H:%i:%s') AS Time, MemberId, MemberStatus " + + "FROM MEMBER_STATUS WHERE ApplicationId= ? AND ClusterAlias= ? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME " + + "(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) ORDER BY " + + "MemberID, Time", applicationId, clusterId); } print(result); } http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/application-signups.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/application-signups.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/application-signups.jag index 7730429..cb553d7 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/application-signups.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/application-signups.jag @@ -21,17 +21,8 @@ include('metering-authentication.jag'); (function () { - var log = new Log(); - var ALL_CLUSTERS = 'Select Application'; - var content = request.getContent(); - var contentAsString = null; - if (content != '' && content != null) { - contentAsString = stringify(content); - if (log.isDebugEnabled()) { - log.debug("Value of content: " + contentAsString); - } - } + var ALL_CLUSTERS = 'Select Application'; var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB"); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/applications.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/applications.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/applications.jag index 33346d7..4c3eb73 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/applications.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/applications.jag @@ -24,7 +24,7 @@ include('metering-authentication.jag'); var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB"); try { - var result = db.query("SELECT DISTINCT ApplicationId \"ApplicationId\" FROM MEMBER_COUNT"); + var result = db.query("SELECT DISTINCT ApplicationId \"ApplicationId\" FROM MEMBER_STATUS"); if (result != null) { print(result); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/clusters.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/clusters.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/clusters.jag index 82b845f..366f25e 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/clusters.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/clusters.jag @@ -25,8 +25,7 @@ include('metering-authentication.jag'); try { var applicationId = request.getParameter('applicationId'); - var result = db.query("SELECT DISTINCT ClusterAlias \"ClusterAlias\" FROM MEMBER_COUNT WHERE ApplicationId = " + - "?", applicationId); + var result = db.query("SELECT DISTINCT ClusterAlias \"ClusterAlias\" FROM MEMBER_STATUS WHERE ApplicationId=?",applicationId); if (result != null) { print(result); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-count.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-count.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-count.jag index 6fae1ea..33af165 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-count.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-count.jag @@ -21,86 +21,56 @@ include('metering-authentication.jag'); (function () { - var log = new Log(); var TIME_INTERVAL_1 = '30 Min'; var TIME_INTERVAL_2 = '1 Hour'; var TIME_INTERVAL_3 = '1 Day'; var TIME_INTERVAL_4 = '1 Week'; var TIME_INTERVAL_5 = '1 Month'; + var TIME_INTERVAL_6 = '6 Month'; + var TIME_INTERVAL_7 = '1 Year'; var ALL_CLUSTERS = 'All Clusters'; - var content = request.getContent(); - var contentAsString = null; - if (content != '' && content != null) { - contentAsString = stringify(content); - if (log.isDebugEnabled()) { - log.debug("Value of content: " + contentAsString); - } - } - var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB"); try { var result; + var timeInterval = request.getParameter("time"); var interval = 1800; - var x_axis_interval; - var time_format; if (timeInterval === TIME_INTERVAL_1) { interval = 1800; - x_axis_interval = 60; - time_format = 'hh24:mi'; } else if (timeInterval === TIME_INTERVAL_2) { interval = 3600; - x_axis_interval = 120; - time_format = 'hh24:mi'; } else if (timeInterval === TIME_INTERVAL_3) { interval = 86400; - x_axis_interval = 2880; - time_format = 'yyyy-mm-dd hh24:mi'; } else if (timeInterval === TIME_INTERVAL_4) { interval = 604800; - x_axis_interval = 20160; - time_format = 'yyyy-mm-dd hh24:mi'; } else if (timeInterval === TIME_INTERVAL_5) { interval = 2419200; - x_axis_interval = 80640; - time_format = 'yyyy-mm-dd'; + } else if (timeInterval === TIME_INTERVAL_6) { + interval = 2419200 * 6; + } else if (timeInterval === TIME_INTERVAL_7) { + interval = 2419200 * 12; } var applicationId = request.getParameter("applicationId"); var clusterId = request.getParameter("clusterId"); if (clusterId == ALL_CLUSTERS) { - result = db.query("SELECT TO_CHAR((TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC' + NUMTODSINTERVAL" + - "(CEIL(Time/(" + x_axis_interval + " * 1000)) * " + x_axis_interval + ", 'second')) AT LOCAL, '" - + time_format + "') \"Time\", SUM(CreatedInstanceCount) AS \"CreatedInstanceCount\", SUM" + - "(InitializedInstanceCount) AS \"InitializedInstanceCount\", SUM(ActiveInstanceCount) AS " + - "\"ActiveInstanceCount\", SUM(TerminatedInstanceCount) AS \"TerminatedInstanceCount\" FROM " + - "MEMBER_COUNT WHERE ApplicationId=? AND TO_CHAR((TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE " + - "'UTC' + NUMTODSINTERVAL(Time/1000,'second')) AT LOCAL, 'yyyy-mm-dd hh24:mi') BETWEEN TO_CHAR" + - "(LOCALTIMESTAMP - NUMTODSINTERVAL(" + interval + ", 'second'),'yyyy-mm-dd hh24:mi') AND TO_CHAR" + - "(LOCALTIMESTAMP,'yyyy-mm-dd hh24:mi') GROUP BY TO_CHAR((TIMESTAMP '1970-01-01 00:00:00' AT TIME " + - "ZONE 'UTC' + NUMTODSINTERVAL(CEIL(Time/(" + x_axis_interval + " * 1000)) * " + x_axis_interval + - ", 'second')) AT LOCAL, '" + time_format + "'), ApplicationId ORDER BY TO_CHAR((TIMESTAMP " + - "'1970-01-01 00:00:00' AT TIME ZONE 'UTC' + NUMTODSINTERVAL(CEIL(Time/(" + x_axis_interval + " *" + - " 1000)) * " + x_axis_interval + ", 'second')) AT LOCAL, '" + time_format + "')", applicationId); + result = db.query("SELECT timestamp as \"Time\", active_instances as \"ActiveInstances\" FROM " + + "APP_ACTIVE_MEMBER_COUNT WHERE APPLICATION_ID=? AND TO_CHAR(TIMESTAMP '1970-01-01 00:00:00' " + + "AT TIME ZONE 'UTC' + NUMTODSINTERVAL(timestamp/1000,'second'), 'yyyy-mm-dd hh24:mi:ss') BETWEEN " + + "TO_CHAR(SYSTIMESTAMP AT TIME ZONE 'UTC' - NUMTODSINTERVAL(" + interval + ", 'second')," + + "'yyyy-mm-dd hh24:mi:ss') AND TO_CHAR(SYSTIMESTAMP AT TIME ZONE 'UTC','yyyy-mm-dd hh24:mi:ss')", + applicationId); } else { - result = db.query("SELECT TO_CHAR((TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC' + NUMTODSINTERVAL" + - "(CEIL(Time/(" + x_axis_interval + " * 1000)) * " + x_axis_interval + ", 'second')) AT LOCAL, '" - + time_format + "') \"Time\", SUM(CreatedInstanceCount) AS \"CreatedInstanceCount\", SUM" + - "(InitializedInstanceCount) AS \"InitializedInstanceCount\", SUM(ActiveInstanceCount) AS " + - "\"ActiveInstanceCount\", SUM(TerminatedInstanceCount) AS \"TerminatedInstanceCount\" FROM " + - "MEMBER_COUNT WHERE ApplicationId=? AND ClusterAlias=? AND TO_CHAR((TIMESTAMP '1970-01-01 " + - "00:00:00' AT TIME ZONE 'UTC' + NUMTODSINTERVAL(Time/1000,'second')) AT LOCAL, 'yyyy-mm-dd " + - "hh24:mi') BETWEEN TO_CHAR(LOCALTIMESTAMP - NUMTODSINTERVAL(" + interval + ", 'second')," + - "'yyyy-mm-dd hh24:mi') AND TO_CHAR(LOCALTIMESTAMP,'yyyy-mm-dd hh24:mi') GROUP BY TO_CHAR(" + - "(TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC' + NUMTODSINTERVAL(CEIL(Time/(" + - x_axis_interval + " * 1000)) * " + x_axis_interval + ", 'second')) AT LOCAL, '" + time_format + - "'), ApplicationId ORDER BY TO_CHAR((TIMESTAMP '1970-01-01 00:00:00' AT TIME ZONE 'UTC' + " + - "NUMTODSINTERVAL(CEIL(Time/(" + x_axis_interval + " * 1000)) * " + x_axis_interval + ", 'second')" + - ") AT LOCAL, '" + time_format + "')", applicationId, clusterId); + result = db.query("SELECT timestamp as \"Time\", active_instances as \"ActiveInstances\" FROM " + + "CLUSTER_ACTIVE_MEMBER_COUNT WHERE APPLICATION_ID=? AND CLUSTER_ALIAS=? AND TO_CHAR(TIMESTAMP " + + "'1970-01-01 00:00:00' AT TIME ZONE 'UTC' + NUMTODSINTERVAL(timestamp/1000,'second'), " + + "'yyyy-mm-dd hh24:mi:ss') BETWEEN TO_CHAR(SYSTIMESTAMP AT TIME ZONE 'UTC' - NUMTODSINTERVAL(" + + interval + ", 'second'),'yyyy-mm-dd hh24:mi:ss') AND TO_CHAR(SYSTIMESTAMP AT TIME ZONE 'UTC', " + + "'yyyy-mm-dd hh24:mi:ss')", applicationId, clusterId); } print(result); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-info.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-info.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-info.jag index b37ecb8..7378ec1 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-info.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-info.jag @@ -21,18 +21,8 @@ include('metering-authentication.jag'); (function () { - var log = new Log(); - var ALL_CLUSTERS = 'All Clusters'; - - var content = request.getContent(); - var contentAsString = null; - if (content != '' && content != null) { - contentAsString = stringify(content); - if (log.isDebugEnabled()) { - log.debug("Value of content: " + contentAsString); - } - } + var ALL_CLUSTERS = 'All Clusters'; var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB"); try { http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-status.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-status.jag b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-status.jag index 68cbc36..c73e7ba 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-status.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/jaggery-files/oracle/member-status.jag @@ -21,24 +21,16 @@ include('metering-authentication.jag'); (function () { - var log = new Log(); var TIME_INTERVAL_1 = '30 Min'; var TIME_INTERVAL_2 = '1 Hour'; var TIME_INTERVAL_3 = '1 Day'; var TIME_INTERVAL_4 = '1 Week'; var TIME_INTERVAL_5 = '1 Month'; + var TIME_INTERVAL_6 = '6 Month'; + var TIME_INTERVAL_7 = '1 Year'; var ALL_CLUSTERS = 'All Clusters'; - var content = request.getContent(); - var contentAsString = null; - if (content != '' && content != null) { - contentAsString = stringify(content); - if (log.isDebugEnabled()) { - log.debug("Value of content: " + contentAsString); - } - } - var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB"); try { @@ -56,7 +48,12 @@ include('metering-authentication.jag'); interval = 604800; } else if (timeInterval === TIME_INTERVAL_5) { interval = 2419200; + } else if (timeInterval === TIME_INTERVAL_6) { + interval = 2419200 * 6; + } else if (timeInterval === TIME_INTERVAL_7) { + interval = 2419200 * 12; } + var applicationId = request.getParameter("applicationId"); var clusterId = request.getParameter("clusterId"); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/ues-patch/README.md ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/ues-patch/README.md b/extensions/das/modules/artifacts/metering-dashboard/ues-patch/README.md index 9ac2469..42a10f6 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/ues-patch/README.md +++ b/extensions/das/modules/artifacts/metering-dashboard/ues-patch/README.md @@ -1,11 +1,9 @@ -This folder (ues-patch) contains fix for DAS-3.0.0 analytics dashboard to support reading request parameters from +This folder (ues-patch) contains fix for DAS-3.0.1 analytics dashboard to support reading request parameters from dashboard url and publish the values to gadgets. You can find the related UES product jira here: https://wso2.org/jira/browse/UES-582 - Please follow below steps to apply the patch locally: -1. Copy 'ues-gadgets.js' and 'ues-pubsub.js' files to `<DAS-HOME>/repository/deployment/server/jaggeryapps/portal/js/` +1. Copy 'ues-gadgets.js' and 'ues-pubsub.js' files to <DAS-HOME>/repository/deployment/server/jaggeryapps/portal/js/ folder. - -2. Copy 'dashboard.jag' file to `<DAS-HOME>/repository/deployment/server/jaggeryapps/portal/theme/templates/` folder. \ No newline at end of file +2. Copy 'dashboard.jag' file to <DAS-HOME>/repository/deployment/server/jaggeryapps/portal/theme/templates/ folder. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/ues-patch/dashboard.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/ues-patch/dashboard.jag b/extensions/das/modules/artifacts/metering-dashboard/ues-patch/dashboard.jag index eddc276..6bc67f6 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/ues-patch/dashboard.jag +++ b/extensions/das/modules/artifacts/metering-dashboard/ues-patch/dashboard.jag @@ -25,36 +25,52 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;"> <link rel="icon" href="<%=urlPrefix%><%=utils.resolveUrl('images/favicon.png')%>" type="image/x-icon" /> - <link rel="stylesheet" href="<%=urlPrefix%>css/bootstrap.min.css"> - <link rel="stylesheet" href="<%=urlPrefix%>css/fontwso2.css"> - <link rel="stylesheet" href="<%=urlPrefix%>css/fontwso2-extend.css"> - <link rel="stylesheet" href="<%=urlPrefix%>css/OpenSans.css"> - <link rel="stylesheet" href="<%=urlPrefix%>css/common.css"> - <link rel="stylesheet" href="<%=urlPrefix%>css/dashboard.css"> - <link rel="stylesheet" href="<%=urlPrefix%>css/bootstrap-modal-carousel.min.css"> + <link rel="stylesheet" href="<%=urlPrefix%>css/bootstrap.min.css" /> + <link rel="stylesheet" href="<%=urlPrefix%>css/fontwso2.css" /> + <link rel="stylesheet" href="<%=urlPrefix%>css/fontwso2-extend.css" /> + <link rel="stylesheet" href="<%=urlPrefix%>css/OpenSans.css" /> + <link rel="stylesheet" href="<%=urlPrefix%>css/common.css" /> + <link rel="stylesheet" href="<%=urlPrefix%>css/dashboard.css" /> + <link rel="stylesheet" href="<%=urlPrefix%>css/bootstrap-modal-carousel.min.css" /> + <% include('/controllers/includes/theme-dashboard-styles.jag'); %> - <script src="<%=urlPrefix%>js/handlebars-v4.0.2.js"></script> - <%var i18n = require("i18n"); -i18n.init(request);%> - <title><%= i18n.localize("dashboard.lable")%></title> + <% +var i18n = require("i18n"); +i18n.init(request, utils.getLocaleResourcePath()); +%> +<title><%= i18n.localize("dashboard.lable")%></title> </head> + <body class="lang_<%=request.getLocale()%>"> + <% var usr = require('/modules/user.js'); var user = usr.current(); var pages = dashboard.pages; var isAnonView = request.getParameter('isAnonView'); -if (!user) { - if (isAnonView) { +if(!user) { + if(isAnonView){ response.sendRedirect(request.getRequestURL()); } isAnonView = true; -} else { +} else{ isAnonView = JSON.parse(isAnonView); + if(user.domain != urlDomain && urlDomain){ + isAnonView = true; + } } + +// Check whether the layout is fluid +var isFluid = false; +pages.forEach(function(page) { + if(page.id == pageId) { + isFluid = page.layout.fluidLayout; + } +}); %> + <div id="navigation" role="navigation" class="navbar navbar-inverse navbar-fixed-top"> - <div class="container"> + <div class="<%= isFluid ? 'container-fluid': 'container'%>"> <div class="navbar-header"> <button data-target=".horizontal-bar" data-toggle="collapse" class="navbar-toggle" type="button"> <span class="sr-only">Toggle navigation</span> @@ -64,20 +80,20 @@ if (!user) { </button> <a href="<%=dbRoot%>?isAnonView=<%=isAnonView%>" class="navbar-brand"><%=dashboard.title%></a> </div> + <div class="collapse navbar-collapse horizontal-bar"> <ul class="nav navbar-nav"> + <!-- render home page link --> <% if(dashboard.pages.length >= 2) { %> <li - <% if(dashboard.landing === pageId) { %> - class="active" - <% } %>> - <a href="<%=dbRoot%>?isAnonView=<%=isAnonView%>"><%= i18n.localize("home")%></a> + <% if (dashboard.landing === pageId) { %> class="active"<% } %>> + <a href="<%=dbRoot%>?isAnonView=<%=isAnonView%>"><%= i18n.localize("home")%></a> </li> <% } %> - <% -pages.forEach(function (page) { + <!-- render links to other pages --> + <% pages.forEach(function (page) { if(isAnonView || !user) { if (page.isanon) { // Anonymous viewing. So render only anonymous pages links. @@ -90,60 +106,63 @@ pages.forEach(function (page) { function renderPageLink(page) { if (dashboard.landing !== page.id) { %> - <li - <% if (page.id === pageId) { %> - class="active" - <% } %>> - <a href="<%=dbRoot%><%=page.id%>?isAnonView=<%=isAnonView%>"> <%=page.title%></a> - </li> - <% } + <li + <% if (page.id === pageId) { %> class="active"<% } %>> + <a href="<%=dbRoot%><%=page.id%>?isAnonView=<%=isAnonView%>"><%=page.title%></a> + </li> + <% } };%> </ul> <ul class="nav navbar-nav navbar-right"> <% if (user) { - if (user.isEditor) { %> + if(urlDomain == user.domain || (user.domain == superDomain && (!urlDomain || urlDomain == superDomain))){ + if (user.isEditor) { %> <li> <a class="ues-copy" href="<%=dbRoot%>?editor=true"> <span class="fw-stack"> <i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-settings fw-stack-1x"></i> </span> - <%= i18n.localize("edit.button")%> + <%= i18n.localize("edit.button")%> </a> </li> - <% } else - {%> + <% } else {%> <li> <a class="ues-copy" href="<%=dbRoot%>?custom=true"> <span class="fw-stack"> <i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-settings fw-stack-1x"></i> </span> - <%= i18n.localize("personalize")%> + <%= i18n.localize("personalize")%> </a> </li> - <% } %> + <% }} %> <li> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> - <%= user? user.username : "anon" %> <span class="caret"></span> + <%= user ? user.username : "anon" %> <span class="caret"></span> </a> <ul class="dropdown-menu" role="menu"> - <li><a href="<%=urlPrefix%>logout?destination=<%=dest%>"> + <li> + <a href="<%=urlPrefix%>logout?destination=<%=dest%>"> <%= i18n.localize("logout.lable")%> - </a></li> + </a> + </li> </ul> </li> <% } else { %> - <li><a href="<%=urlPrefix%>login-controller?destination=<%=dest%>"> - <%= i18n.localize("login.lable")%> - </a></li> - <% } %> + <li> + <a href="<%=urlPrefix%>login-controller?destination=<%=dest%>"> + <%= i18n.localize("login.lable")%> + </a> + </li> + <% } %> </ul> - </div> - <!--/.nav-collapse --> + </div> <!--/.nav-collapse --> </div> </div> -<div id="wrapper"></div> + +<div id="wrapper"><%=renderEngine.getDashboardContent(pageId || dashboard.landing, isAnonView)%></div> + <script id="ues-component-toolbar-hbs" type="text/x-handlebars-template"> <div class="ues-toolbar"> <ul class="list-inline pull-right"> @@ -156,26 +175,13 @@ function renderPageLink(page) { {{/has}} </div> </script> -<script id="ues-component-full-hbs" type="text/x-handlebars-template"> - <div class="modal fade modal-fullscreen force-fullscreen" id="componentFull" tabindex="-1" role="dialog" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-body"> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-default">Close</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> - </div><!-- /.modal --> -</script> <script id="ues-gadget-setting-hbs" type="text/x-handlebars-template"> <div class="ues-sandbox" data-component="{{id}}"> <div id="ues-gadget-options" class="ues-gadget-options ues-gadget-properties gadget-setting"> <form class="ues-component-properties"> {{#has options}} <div class="ues-options ues-properties"> - <h4>Options</h4> + <h4><%= i18n.localize("options") %></h4> {{#each options}} <div class="form-group"> {{#equals type "STRING"}} @@ -197,6 +203,12 @@ function renderPageLink(page) { </select> </label> {{/equals}} + {{#equals type "LIST"}} + <label>{{title}} + <textarea name="{{@key}}" class="form-control" rows="4" placeholder='<%= i18n.localize("placeholder.item.list")%>'>{{value}}</textarea> + <label><%= i18n.localize("enter.your.list.entries.lable")%></label> + </label> + {{/equals}} {{#equals type "text"}} <label>{{title}} <textarea name="{{@key}}" class="form-control" rows="4">{{value}}</textarea> @@ -215,9 +227,15 @@ function renderPageLink(page) { </div> </div> </script> -<!--<iframe id="sandbox" src="preview.jag"></iframe>--> +<script id="ues-dashboard-banner-hbs" type="text/x-handlebars-template"> + {{#if isBannerExists}} + <img src="<%=urlPrefix%>banners/<%=dashboard.id%>" /> + {{/if}} +</script> + <script src="<%=urlPrefix%>js/jquery-1.10.2.js"></script> <script src="<%=urlPrefix%>js/bootstrap.min.js"></script> +<script src="<%=urlPrefix%>js/handlebars-v4.0.2.js"></script> <!-- TODO fix shindig url --> <script src="/shindig/gadgets/js/container:open-views:opensearch:rpc:xmlutil:pubsub-2.js?c=1&debug=1&container=default"></script> <script src="<%=urlPrefix%>js/ues.js"></script> @@ -226,17 +244,58 @@ function renderPageLink(page) { <% include('/controllers/includes/dashboard-scripts.jag'); %> <script src="<%=urlPrefix%>js/ues-gadgets.js"></script> <script src="<%=urlPrefix%>js/ues-dashboards.js"></script> +<script src="<%=urlPrefix%>js/ues-pubsub.js"></script> <script src="<%=urlPrefix%>extensions/components/gadget/index.js"></script> <script src="<%=urlPrefix%>extensions/components/widget/index.js"></script> <script src="<%=urlPrefix%>extensions/uris/local/index.js"></script> <script src="<%=urlPrefix%>extensions/uris/store/index.js"></script> <script src="<%=urlPrefix%>js/bootstrap-modal-carousel.min.js"></script> <script src="<%=urlPrefix%>js/gadget-properties.js"></script> +<script src="<%=urlPrefix%>js/ds-handlebar-helpers.js"></script> +<script src="<%=urlPrefix%>js/ues-saml-at.js"></script> +<script src="<%=urlPrefix%>js/dashboard.js"></script> <% include('/controllers/includes/theme-dashboard-scripts.jag'); %> + <script> if(!ues.global.renderFromExtension){ ues.dashboards.render($('#wrapper'), ues.global.dashboard, ues.global.page); } + + $(document).ready(function() { + var bannerHbs = Handlebars.compile($('#ues-dashboard-banner-hbs').html()); + var banner = ues.global.dashboard.banner; + $('.ues-banner-placeholder').html(bannerHbs({ isBannerExists: banner.globalBannerExists || banner.customBannerExists })); + + resizeComponents(); + }); + + $(window).resize(function() { + resizeComponents(); + }); + + function resizeComponents() { + + var containerWidth = $('#wrapper > div').width(), + unitHeight = (containerWidth > 720) ? Math.floor(containerWidth / 12) : 120; + + $('#wrapper .ues-component-box').each(function(i, o) { + var height = $(this).attr('data-height') * unitHeight; + $(this).css('height', height + 'px'); + }); + + var placeholder = $('.ues-banner-placeholder'), + bannerImg = placeholder.find('img'); + if (bannerImg.length > 0) { + var img = new Image(); + img.onload = function() { + placeholder.css('min-height', this.height).css('height', ''); + } + img.src = bannerImg.attr('src'); + } else { + placeholder.css('height', ''); + } + } + </script> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/metering-dashboard/ues-patch/ues-gadgets.js ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/ues-patch/ues-gadgets.js b/extensions/das/modules/artifacts/metering-dashboard/ues-patch/ues-gadgets.js index 9f18384..690e3e0 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/ues-patch/ues-gadgets.js +++ b/extensions/das/modules/artifacts/metering-dashboard/ues-patch/ues-gadgets.js @@ -102,26 +102,29 @@ //Initializing OpenAjax ManagedHub var hub = new OpenAjax.hub.ManagedHub({ onSubscribe: function (topic, container) { - readRequestParam(); - if(topic.indexOf("token-channel") !=-1){ - if(username){ - ues.hub.publish("token-channel", username); - }else{ - - jQuery.ajax({ - url: '/portal/apis/user', - type: 'get', - dataType: "json", - success: function (data) { - username = data.username; - ues.hub.publish("token-channel", username); - }, - error: function (msg) { - ues.hub.publish("token-channel", null); - } - }); + readRequestParam(); + if (topic.indexOf("token-channel") != -1) { + fetchAccessToken(); + } + if(topic.indexOf("user-channel") !=-1){ + if(username){ + ues.hub.publish("user-channel", username); + }else{ + + jQuery.ajax({ + url: '/portal/apis/user', + type: 'get', + dataType: "json", + success: function (data) { + username = data.username; + ues.hub.publish("user-channel", username); + }, + error: function (msg) { + ues.hub.publish("user-channel", null); + } + }); + } } - } var fn = configs(ues.configs, ['hub', 'subscribe']); return fn ? fn(topic, container) : true; }, http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/monitoring-dashboard.json ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/monitoring-dashboard.json b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/monitoring-dashboard.json index 9016faa..131b687 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/monitoring-dashboard.json +++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/monitoring-dashboard.json @@ -12,22 +12,63 @@ }, "pages": [ { - "id": "health-stats", + "id": "landing", "title": "Health Stats", "layout": { - "id": "single-column", - "title": "Single Column", - "description": "This is a layout generated through single-column.io", - "thumbnail": "store://layout/single-column/index.png", - "url": "store://layout/single-column/index.hbs", - "content": "<div class=\"container\">\n<div class=\"row\">\n <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"b\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"c\" class=\"col-md-12 ues-component-box\"></div>\n</div>\n</div>\n" + "content": { + "loggedIn": { + "blocks": [ + { + "id": "a", + "col": 1, + "row": 8, + "size_x": 12, + "size_y": 5, + "banner": false + }, + { + "id": "b", + "col": 1, + "row": 13, + "size_x": 12, + "size_y": 5, + "banner": false + }, + { + "id": "c", + "col": 1, + "row": 18, + "size_x": 12, + "size_y": 6, + "banner": false + }, + { + "id": "2fc411045d01a5d664ce2ffc1ce4b9fe", + "col": 1, + "row": 3, + "size_x": 12, + "size_y": 5, + "banner": false + }, + { + "id": "fdb364d08b52e0729822fe8b8cf2ee83", + "col": 1, + "row": 1, + "size_x": 12, + "size_y": 2, + "banner": false + } + ] + } + }, + "fluidLayout": false }, "isanon": false, "content": { "default": { - "a": [ + "fdb364d08b52e0729822fe8b8cf2ee83": [ { - "id": "8nfqbaxvjc8cwhfr", + "id": "rrwtvabbaz3lqibxncfgh9f6r", "content": { "id": "Health_Stats_Filter", "title": "", @@ -52,14 +93,17 @@ "description": "This notifies cancellation of state selection" } }, + "options": {}, "locale_titles": { "en-US": "" }, "settings": {} } - }, + } + ], + "2fc411045d01a5d664ce2ffc1ce4b9fe": [ { - "id": "8wnyg587eaznz5mi", + "id": "zzotld9irni34dzx3lczhncdi", "content": { "id": "Memory_Usage", "title": "Memory Usage", @@ -74,7 +118,7 @@ "description": "Used to filter based on state", "on": [ { - "from": "8nfqbaxvjc8cwhfr", + "from": "rrwtvabbaz3lqibxncfgh9f6r", "event": "health-stats-filter" } ] @@ -91,16 +135,16 @@ "titlePosition": "left", "title": "Memory Usage" }, - "settings": {}, "locale_titles": { "en-US": "Memory Usage" - } + }, + "settings": {} } } ], - "b": [ + "a": [ { - "id": "hhy2fj8wgu1bgldi", + "id": "0dlxzn1hstk1p3jo2rm6etgldi", "content": { "id": "Load_Average", "title": "Load Average", @@ -115,7 +159,7 @@ "description": "Used to filter based on state", "on": [ { - "from": "8nfqbaxvjc8cwhfr", + "from": "rrwtvabbaz3lqibxncfgh9f6r", "event": "health-stats-filter" } ] @@ -132,17 +176,19 @@ "titlePosition": "left", "title": "Load Average" }, - "settings": {}, "locale_titles": { "en-US": "Load Average" - } + }, + "settings": {} } - }, + } + ], + "b": [ { - "id": "3rlgpdhg2e29", + "id": "6zcemtxm80p77vey017lrqkt9", "content": { "id": "In_Flight_Request", - "title": "In Flight Request", + "title": "In-Flight Request", "type": "gadget", "thumbnail": "local://images/gadgetIcon.png", "data": { @@ -154,7 +200,7 @@ "description": "Used to filter based on state", "on": [ { - "from": "8nfqbaxvjc8cwhfr", + "from": "rrwtvabbaz3lqibxncfgh9f6r", "event": "health-stats-filter" } ] @@ -171,19 +217,19 @@ "titlePosition": "left", "title": "In-Flight Request" }, - "settings": {}, "locale_titles": { "en-US": "In-Flight Request" - } + }, + "settings": {} } } ], "c": [ { - "id": "a7jevl0wisc680k9", + "id": "7xb1k0zbnjena6bzpd190be29", "content": { "id": "Scaling_Details", - "title": "Scaling Details", + "title": "Cluster Instances", "type": "gadget", "thumbnail": "local://images/gadgetIcon.png", "data": { @@ -195,7 +241,7 @@ "description": "Used to filter based on state", "on": [ { - "from": "8nfqbaxvjc8cwhfr", + "from": "rrwtvabbaz3lqibxncfgh9f6r", "event": "health-stats-filter" } ] @@ -212,10 +258,10 @@ "titlePosition": "left", "title": "Cluster Instances" }, - "settings": {}, "locale_titles": { "en-US": "Cluster Instances" - } + }, + "settings": {} } } ] @@ -224,7 +270,15 @@ } } ], - "landing": "health-stats", + "identityServerUrl": "", + "accessTokenUrl": "", + "apiKey": "", + "apiSecret": "", + "banner": { + "globalBannerExists": null, + "customBannerExists": null + }, + "landing": "landing", "isanon": false, "isUserCustom": false } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/stratos-monitoring-dashboard.json ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/stratos-monitoring-dashboard.json b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/stratos-monitoring-dashboard.json deleted file mode 100644 index 545b004..0000000 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/Dashboard/stratos-monitoring-dashboard.json +++ /dev/null @@ -1,274 +0,0 @@ -{ - "id": "stratos-monitoring-dashboard", - "title": "Stratos Monitoring Dashboard", - "description": "This dashboard helps to monitor health stats.", - "permissions": { - "viewers": [ - "Internal/everyone" - ], - "editors": [ - "Internal/everyone" - ] - }, - "pages": [ - { - "id": "health-stats", - "title": "Health Stats", - "layout": { - "id": "single-column", - "title": "Single Column", - "description": "This is a layout generated through single-column.io", - "thumbnail": "store://layout/single-column/index.png", - "url": "store://layout/single-column/index.hbs", - "content": "<div class=\"container\">\n<div class=\"row\">\n <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"b\" class=\"col-md-12 ues-component-box\"></div>\n <div id=\"c\" class=\"col-md-12 ues-component-box\"></div>\n</div>\n</div>\n" - }, - "content": { - "a": [ - { - "id": "np79atkpuq8h0k9", - "content": { - "id": "Health_Stats_Filter", - "title": "Health Stats Filter", - "type": "gadget", - "thumbnail": "store://gadget/Health_Stats_Filter/index.png", - "data": { - "url": "store://gadget/Health_Stats_Filter/index.xml" - }, - "styles": { - "title": "", - "height": "150", - "borders": false, - "titlePosition": "left" - }, - "notify": { - "health-stats-filter": { - "type": "address", - "description": "This notifies time interval" - }, - "cancel": { - "type": "boolean", - "description": "This notifies cancellation of state selection" - } - }, - "options": {}, - "settings": {} - } - }, - { - "id": "8wnyg587eaznz5mi", - "content": { - "id": "Memory_Usage", - "title": "Memory Usage", - "type": "gadget", - "thumbnail": "local://images/gadgetIcon.png", - "data": { - "url": "local://store/carbon.super/gadget/Memory_Usage/index.xml" - }, - "listen": { - "health-stats-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "np79atkpuq8h0k9", - "event": "health-stats-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "Memory Usage", - "height": "400", - "borders": true, - "titlePosition": "left" - }, - "options": { - "dataSource": { - "type": "STRING", - "title": "Data Source", - "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag", - "options": [], - "required": false - }, - "updateGraph": { - "type": "STRING", - "title": "Update Interval (s)", - "value": "5", - "options": [], - "required": false - } - }, - "settings": {} - } - } - ], - "b": [ - { - "id": "hhy2fj8wgu1bgldi", - "content": { - "id": "Load_Average", - "title": "Load Average", - "type": "gadget", - "thumbnail": "local://images/gadgetIcon.png", - "data": { - "url": "local://store/carbon.super/gadget/Load_Average/index.xml" - }, - "listen": { - "health-stats-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "np79atkpuq8h0k9", - "event": "health-stats-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "Load Average", - "height": "400", - "borders": true, - "titlePosition": "left" - }, - "options": { - "dataSource": { - "type": "STRING", - "title": "Data Source", - "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag", - "options": [], - "required": false - }, - "updateGraph": { - "type": "STRING", - "title": "Update Interval (s)", - "value": "5", - "options": [], - "required": false - } - }, - "settings": {} - } - }, - { - "id": "3rlgpdhg2e29", - "content": { - "id": "In_Flight_Request", - "title": "In Flight Request", - "type": "gadget", - "thumbnail": "local://images/gadgetIcon.png", - "data": { - "url": "local://store/carbon.super/gadget/In_Flight_Request/index.xml" - }, - "listen": { - "health-stats-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "np79atkpuq8h0k9", - "event": "health-stats-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "In-Flight Request", - "height": "400", - "borders": true, - "titlePosition": "left" - }, - "options": { - "dataSource": { - "type": "STRING", - "title": "Data Source", - "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag", - "options": [], - "required": false - }, - "updateGraph": { - "type": "STRING", - "title": "Update Interval (s)", - "value": "5", - "options": [], - "required": false - } - }, - "settings": {} - } - } - ], - "c": [ - { - "id": "a7jevl0wisc680k9", - "content": { - "id": "Scaling_Details", - "title": "Scaling Details", - "type": "gadget", - "thumbnail": "local://images/gadgetIcon.png", - "data": { - "url": "local://store/carbon.super/gadget/Scaling_Details/index.xml" - }, - "listen": { - "health-stats-filter": { - "type": "address", - "description": "Used to filter based on state", - "on": [ - { - "from": "np79atkpuq8h0k9", - "event": "health-stats-filter" - } - ] - }, - "auto-update": { - "type": "boolean", - "description": "Used to filter based on state", - "on": [] - } - }, - "styles": { - "title": "Cluster Instances", - "height": "600", - "borders": true, - "titlePosition": "left" - }, - "options": { - "dataSource": { - "type": "STRING", - "title": "Data Source", - "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag", - "options": [], - "required": false - }, - "updateGraph": { - "type": "STRING", - "title": "Update Interval (s)", - "value": "5", - "options": [], - "required": false - } - }, - "settings": {} - } - } - ] - } - } - ], - "landing": "health-stats" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetHealthStatsFilter/Health_Stats_Filter/index.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetHealthStatsFilter/Health_Stats_Filter/index.xml b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetHealthStatsFilter/Health_Stats_Filter/index.xml index 9ca6312..46c16dc 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetHealthStatsFilter/Health_Stats_Filter/index.xml +++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/GadgetHealthStatsFilter/Health_Stats_Filter/index.xml @@ -67,6 +67,8 @@ <input type="button" class="button" value="1 Day" onClick="publish(this.value)"> <input type="button" class="button" value="1 Week" onClick="publish(this.value)"> <input type="button" class="button" value="1 Month" onClick="publish(this.value)"> + <input type="button" class="button" value="6 Month" onClick="publish(this.value)"> + <input type="button" class="button" value="1 Year" onClick="publish(this.value)"> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/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 6375574..7bd5e35 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 @@ -20,7 +20,7 @@ */ var type, columns, maxUpdateValue; -var REFRESH_INTERVAL = 5000; +var REFRESH_INTERVAL = 300000; var dataLoaded = true; var timeInterval = '30 Min'; var clusterId = ''; http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/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 678a681..5e4772b 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 @@ -20,7 +20,7 @@ */ var type, columns, maxUpdateValue; -var REFRESH_INTERVAL = 5000; +var REFRESH_INTERVAL = 300000; var dataLoaded = true; var timeInterval = '30 Min'; var clusterId = ''; http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/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 1c6a6b5..051f4f0 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 @@ -20,7 +20,7 @@ */ var type, columns, maxUpdateValue; -var REFRESH_INTERVAL = 5000; +var REFRESH_INTERVAL = 300000; var dataLoaded = true; var timeInterval = '30 Min'; var clusterId = ''; http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/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 6ec6321..263477d 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 @@ -20,7 +20,7 @@ */ var type, columns, maxUpdateValue; -var REFRESH_INTERVAL = 5000; +var REFRESH_INTERVAL = 300000; var dataLoaded = true; var timeInterval = '30 Min'; var clusterId = ''; http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsInFlightRequest/in_flight_request.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsInFlightRequest/in_flight_request.xml b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsInFlightRequest/in_flight_request.xml index ee3636a..b12d0c6 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsInFlightRequest/in_flight_request.xml +++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsInFlightRequest/in_flight_request.xml @@ -31,5 +31,5 @@ INSERT OVERWRITE TABLE average_in_flight_requests_new select * from average_in_flight_requests; </Script> - <CronExpression>0/15 * * * * ?</CronExpression> + <CronExpression>0 0/15 * 1/1 * ? *</CronExpression> </Analytics> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsLoadAverage/load_average.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsLoadAverage/load_average.xml b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsLoadAverage/load_average.xml index cc14215..2a38077 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsLoadAverage/load_average.xml +++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsLoadAverage/load_average.xml @@ -42,5 +42,5 @@ INSERT OVERWRITE TABLE member_average_load_average_stats_new select timestamp, member_id, cluster_id, cluster_instance_id, network_partition_id, member_average_load_average from member_average_load_average_stats; </Script> - <CronExpression>0/15 * * * * ?</CronExpression> + <CronExpression>0 0/15 * 1/1 * ? *</CronExpression> </Analytics> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsMemoryUsage/memory_usage.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsMemoryUsage/memory_usage.xml b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsMemoryUsage/memory_usage.xml index 8e15cd3..c6bdf44 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsMemoryUsage/memory_usage.xml +++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsMemoryUsage/memory_usage.xml @@ -42,5 +42,5 @@ INSERT OVERWRITE TABLE member_average_memory_consumption_stats_new select timestamp, member_id, cluster_id, cluster_instance_id, network_partition_id, member_average_memory_consumption from member_average_memory_consumption_stats; </Script> - <CronExpression>0/15 * * * * ?</CronExpression> + <CronExpression>0 0/15 * 1/1 * ? *</CronExpression> </Analytics> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsScalingDecision/scaling_decision.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsScalingDecision/scaling_decision.xml b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsScalingDecision/scaling_decision.xml index 743adc9..dd8a97c 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsScalingDecision/scaling_decision.xml +++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/stratos-monitoring-service/SparkscriptsScalingDecision/scaling_decision.xml @@ -31,5 +31,5 @@ INSERT OVERWRITE TABLE scaling_details select * from scaling_decision; </Script> - <CronExpression>0/15 * * * * ?</CronExpression> + <CronExpression>0 0/15 * 1/1 * ? *</CronExpression> </Analytics> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/mysql/monitoring-script.sql ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/mysql/monitoring-script.sql b/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/mysql/monitoring-script.sql index 9c31466..bab5cf4 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/mysql/monitoring-script.sql +++ b/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/mysql/monitoring-script.sql @@ -20,6 +20,7 @@ CREATE DATABASE IF NOT EXISTS ANALYTICS_FS_DB; CREATE DATABASE IF NOT EXISTS ANALYTICS_EVENT_STORE; CREATE DATABASE IF NOT EXISTS ANALYTICS_PROCESSED_DATA_STORE; +CREATE TABLE ANALYTICS_EVENT_STORE.MEMBER_LIST(ClusterId VARCHAR(150), MemberId VARCHAR(150), MemberStatus VARCHAR(50)); CREATE TABLE ANALYTICS_EVENT_STORE.AVG_MEMORY_CONSUMPTION_STATS(Time long, ClusterId VARCHAR(150), ClusterInstanceId VARCHAR(150), NetworkPartitionId VARCHAR(150), Value DOUBLE); CREATE TABLE ANALYTICS_EVENT_STORE.M_AVG_MEMORY_CONSUMPTION_STATS(Time long, MemberId VARCHAR(150), ClusterId VARCHAR http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/oracle/monitoring-script.sql ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/oracle/monitoring-script.sql b/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/oracle/monitoring-script.sql index 97109d9..6e21e06 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/oracle/monitoring-script.sql +++ b/extensions/das/modules/artifacts/monitoring-dashboard/database-scripts/oracle/monitoring-script.sql @@ -18,6 +18,7 @@ * */ +CREATE TABLE MEMBER_LIST(ClusterId VARCHAR2(150), MemberId VARCHAR2(150), MemberStatus VARCHAR2(50)); CREATE TABLE AVG_MEMORY_CONSUMPTION_STATS(Time NUMBER(20), ClusterId VARCHAR2(150), ClusterInstanceId VARCHAR2(150), NetworkPartitionId VARCHAR2(150), Value NUMERIC); CREATE TABLE M_AVG_MEMORY_CONSUMPTION_STATS(Time NUMBER(20), MemberId VARCHAR2(150), ClusterId VARCHAR2(150), @@ -32,4 +33,3 @@ CREATE TABLE SCALING_DETAILS(Time NUMBER(20), ScalingDecisionId VARCHAR2(150), C MinInstanceCount INT, MaxInstanceCount INT, RIFPredicted INT, RIFThreshold INT, RIFRequiredInstances INT, MCPredicted INT, MCThreshold INT, MCRequiredInstances INT, LAPredicted INT, LAThreshold INT,LARequiredInstances INT, RequiredInstanceCount INT, ActiveInstanceCount INT, AdditionalInstanceCount INT, ScalingReason VARCHAR2(150)); - http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-clusters.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-clusters.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-clusters.jag index d7339cf..7ee095e 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-clusters.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-clusters.jag @@ -26,7 +26,7 @@ include("monitoring-authentication.jag"); try { var clusterInstanceId = request.getParameter('clusterInstanceId'); - var result = db.query("SELECT DISTINCT ClusterId FROM AVG_MEMORY_CONSUMPTION_STATS"); + var result = db.query("SELECT DISTINCT ClusterId FROM MEMBER_LIST"); if (result != null) { print(result); @@ -39,4 +39,4 @@ include("monitoring-authentication.jag"); db.close(); } }()); -%> \ No newline at end of file +%> http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-members.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-members.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-members.jag index 0b50209..12d6d27 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-members.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/health-stats-members.jag @@ -26,8 +26,8 @@ include("monitoring-authentication.jag"); try { var clusterId = request.getParameter('clusterId'); - var result = db.query("SELECT DISTINCT MemberId FROM M_AVG_MEMORY_CONSUMPTION_STATS WHERE ClusterId=?", clusterId); - + var result = db.query("SELECT DISTINCT MemberId FROM MEMBER_LIST WHERE ClusterId=? AND MemberStatus='Active' " + + "AND MemberId NOT IN (SELECT MemberId FROM MEMBER_LIST WHERE MemberStatus='Terminated')", clusterId); if (result != null) { print(result); } @@ -39,4 +39,4 @@ include("monitoring-authentication.jag"); db.close(); } }()); -%> \ No newline at end of file +%> http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/in-flight-request.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/in-flight-request.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/in-flight-request.jag index e5478e8..8fbe4be 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/in-flight-request.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/in-flight-request.jag @@ -21,22 +21,14 @@ include("monitoring-authentication.jag"); (function () { - var log = new Log(); var TIME_INTERVAL_1 = '30 Min'; var TIME_INTERVAL_2 = '1 Hour'; var TIME_INTERVAL_3 = '1 Day'; var TIME_INTERVAL_4 = '1 Week'; var TIME_INTERVAL_5 = '1 Month'; - - var content = request.getContent(); - var contentAsString = null; - if (content != '' && content != null) { - contentAsString = stringify(content); - if (log.isDebugEnabled()) { - log.debug("Value of content: " + contentAsString); - } - } + var TIME_INTERVAL_6 = '6 Month'; + var TIME_INTERVAL_7 = '1 Year'; var db = new Database("WSO2_ANALYTICS_EVENT_STORE_DB"); @@ -67,10 +59,22 @@ include("monitoring-authentication.jag"); interval = 2419200000; x_axis_interval = 80640; time_format = '%Y:%m:%d'; + } else if (timeInterval === TIME_INTERVAL_6) { + interval = 2419200000*6; + x_axis_interval = 80640*6; + time_format = '%Y:%m:%d'; + } else if (timeInterval === TIME_INTERVAL_7) { + interval = 2419200000*12; + x_axis_interval = 80640*12; + time_format = '%Y:%m:%d'; } var clusterId = request.getParameter("clusterId"); - result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + x_axis_interval + "', '" + time_format + "') AS Time, AVG(Count) AS Count FROM AVG_IN_FLIGHT_REQUESTS WHERE ClusterId=? 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'), ClusterId", clusterId); + result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + x_axis_interval + + "', '" + time_format + "') AS Time, AVG(Count) AS Count FROM AVG_IN_FLIGHT_REQUESTS WHERE " + + "ClusterId=? 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'), ClusterId", clusterId); print(result); } http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/load-average.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/load-average.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/load-average.jag index 84ed3ad..194abe1 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/load-average.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/load-average.jag @@ -21,24 +21,16 @@ include("monitoring-authentication.jag"); (function () { - var log = new Log(); var TIME_INTERVAL_1 = '30 Min'; var TIME_INTERVAL_2 = '1 Hour'; var TIME_INTERVAL_3 = '1 Day'; var TIME_INTERVAL_4 = '1 Week'; var TIME_INTERVAL_5 = '1 Month'; + var TIME_INTERVAL_6 = '6 Month'; + var TIME_INTERVAL_7 = '1 Year'; var ALL_MEMBERS = 'All Members'; - var content = request.getContent(); - var contentAsString = null; - if (content != '' && content != null) { - contentAsString = stringify(content); - if (log.isDebugEnabled()) { - log.debug("Value of content: " + contentAsString); - } - } - var db = new Database("WSO2_ANALYTICS_EVENT_STORE_DB"); try { @@ -68,15 +60,33 @@ include("monitoring-authentication.jag"); interval = 2419200000; x_axis_interval = 80640; time_format = '%Y:%m:%d'; + } else if (timeInterval === TIME_INTERVAL_6) { + interval = 2419200000*6; + x_axis_interval = 80640*6; + time_format = '%Y:%m:%d'; + } else if (timeInterval === TIME_INTERVAL_7) { + interval = 2419200000*12; + x_axis_interval = 80640*12; + time_format = '%Y:%m:%d'; } var clusterId = request.getParameter("clusterId"); var memberId = request.getParameter("memberId"); if (memberId == ALL_MEMBERS) { - result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + x_axis_interval + "', '" + time_format + "') AS Time, AVG(Value) AS Value FROM AVG_LOAD_AVERAGE_STATS WHERE ClusterId=? 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'), ClusterId", clusterId); + result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + + x_axis_interval + "', '" + time_format + "') AS Time, AVG(Value) AS Value FROM " + + "AVG_LOAD_AVERAGE_STATS WHERE ClusterId=? 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'), " + + "ClusterId", clusterId); }else{ - result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + x_axis_interval + "', '" + time_format + "') AS Time, AVG(Value) AS Value FROM M_AVG_LOAD_AVERAGE_STATS WHERE ClusterId=? AND MemberId=? 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'), ClusterId, MemberId", clusterId, memberId); + result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + + x_axis_interval + "', '" + time_format + "') AS Time, AVG(Value) AS Value FROM " + + "M_AVG_LOAD_AVERAGE_STATS WHERE ClusterId=? AND MemberId=? 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'), ClusterId, MemberId", clusterId, memberId); } print(result);
