Repository: stratos Updated Branches: refs/heads/master d559479f2 -> 80a737142
http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/memory-usage.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/memory-usage.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/memory-usage.jag index 4ca7b37..0a2cf68 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/memory-usage.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/memory-usage.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,34 @@ 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_MEMORY_CONSUMPTION_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_MEMORY_CONSUMPTION_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_MEMORY_CONSUMPTION_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_MEMORY_CONSUMPTION_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); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/scaling-details.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/scaling-details.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/scaling-details.jag index c74e3d3..3ed5c99 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/scaling-details.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/mysql/scaling-details.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_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_EVENT_STORE_DB"); try { @@ -57,10 +49,19 @@ include("monitoring-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 clusterId = request.getParameter("clusterId"); - result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/1000 ), '%Y:%m:%d %h:%i') AS Time, ClusterId, MinInstanceCount, MaxInstanceCount, RIFPredicted, RIFThreshold, RIFRequiredInstances, MCPredicted, MCThreshold, MCRequiredInstances, LAPredicted, LAThreshold, LARequiredInstances, RequiredInstanceCount, ActiveInstanceCount, AdditionalInstanceCount, ScalingReason FROM SCALING_DETAILS WHERE ClusterId= ? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)", clusterId); + result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/1000 ), '%Y:%m:%d %h:%i') AS Time, ClusterId, " + + "MinInstanceCount, MaxInstanceCount, RIFPredicted, RIFThreshold, RIFRequiredInstances, MCPredicted, " + + "MCThreshold, MCRequiredInstances, LAPredicted, LAThreshold, LARequiredInstances, " + + "RequiredInstanceCount, ActiveInstanceCount, AdditionalInstanceCount, ScalingReason FROM " + + "SCALING_DETAILS WHERE ClusterId= ? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + + "') AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4))* 1000)", clusterId); print(result); } catch (e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/health-stats-clusters.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/health-stats-clusters.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/health-stats-clusters.jag index d31a758..f71f3bd 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/health-stats-clusters.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/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 \"ClusterId\" FROM AVG_MEMORY_CONSUMPTION_STATS"); + var result = db.query("SELECT DISTINCT ClusterId \"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/oracle/health-stats-members.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/health-stats-members.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/health-stats-members.jag index 71dff24..f7ff0f9 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/health-stats-members.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/health-stats-members.jag @@ -26,8 +26,9 @@ include("monitoring-authentication.jag"); try { var clusterId = request.getParameter('clusterId'); - var result = db.query("SELECT DISTINCT MemberId \"MemberId\" FROM M_AVG_MEMORY_CONSUMPTION_STATS WHERE " + - "ClusterId=?", clusterId); + var result = db.query("SELECT DISTINCT MemberId \"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); @@ -40,4 +41,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/oracle/in-flight-request.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/in-flight-request.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/in-flight-request.jag index dd98b08..2259bcd 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/in-flight-request.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/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,6 +59,14 @@ include("monitoring-authentication.jag"); interval = 2419200; x_axis_interval = 80640; time_format = 'yyyy-mm-dd'; + } else if (timeInterval === TIME_INTERVAL_6) { + interval = 2419200 * 6; + x_axis_interval = 80640 * 6; + time_format = 'yyyy-mm-dd'; + } else if (timeInterval === TIME_INTERVAL_7) { + interval = 2419200*12; + x_axis_interval = 80640*12; + time_format = 'yyyy-mm-dd'; } var clusterId = request.getParameter("clusterId"); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/load-average.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/load-average.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/load-average.jag index 4083979..8ed8b58 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/load-average.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/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,6 +60,14 @@ include("monitoring-authentication.jag"); interval = 2419200; x_axis_interval = 80640; time_format = 'yyyy-mm-dd'; + } else if (timeInterval === TIME_INTERVAL_6) { + interval = 2419200 * 6; + x_axis_interval = 80640 * 6; + time_format = 'yyyy-mm-dd'; + } else if (timeInterval === TIME_INTERVAL_7) { + interval = 2419200 * 12; + x_axis_interval = 80640 * 12; + time_format = 'yyyy-mm-dd'; } var clusterId = request.getParameter("clusterId"); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/memory-usage.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/memory-usage.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/memory-usage.jag index 1aaf920..536b65b 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/memory-usage.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/memory-usage.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,6 +60,14 @@ include("monitoring-authentication.jag"); interval = 2419200; x_axis_interval = 80640; time_format = 'yyyy-mm-dd'; + } else if (timeInterval === TIME_INTERVAL_6) { + interval = 2419200 * 6; + x_axis_interval = 80640 * 6; + time_format = 'yyyy-mm-dd'; + } else if (timeInterval === TIME_INTERVAL_7) { + interval = 2419200 * 12; + x_axis_interval = 80640 * 12; + time_format = 'yyyy-mm-dd'; } var clusterId = request.getParameter("clusterId"); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/scaling-details.jag ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/scaling-details.jag b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/scaling-details.jag index fa868e2..16c7bf7 100644 --- a/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/scaling-details.jag +++ b/extensions/das/modules/artifacts/monitoring-dashboard/jaggery-files/oracle/scaling-details.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_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_EVENT_STORE_DB"); try { @@ -56,6 +48,10 @@ include("monitoring-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 clusterId = request.getParameter("clusterId"); http://git-wip-us.apache.org/repos/asf/stratos/blob/80a73714/extensions/das/modules/distribution/README.md ---------------------------------------------------------------------- diff --git a/extensions/das/modules/distribution/README.md b/extensions/das/modules/distribution/README.md index c3641b3..37327b3 100644 --- a/extensions/das/modules/distribution/README.md +++ b/extensions/das/modules/distribution/README.md @@ -47,6 +47,6 @@ port offset. Please refer below link for more information on WSO2 DAS. -https://docs.wso2.com/display/DAS300/WSO2+Data+Analytics+Server+Documentation +https://docs.wso2.com/display/DAS301/WSO2+Data+Analytics+Server+Documentation Thank you for using Apache Stratos! \ No newline at end of file
