Updated Branches: refs/heads/master 86f4e725b -> ea1804c9e
Member wise health stats sent from CEP Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/48981476 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/48981476 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/48981476 Branch: refs/heads/master Commit: 48981476ccc9d975c2f5e9ebf11754b4c1582256 Parents: dc11e31 Author: Manula Thantriwatte <[email protected]> Authored: Tue Dec 17 15:04:15 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Dec 17 15:04:15 2013 +0530 ---------------------------------------------------------------------- .../MemberAverageLoadAverageEventFormatter.xml | 11 +++ ...erAverageMemoryConsumptionEventFormatter.xml | 11 +++ .../MemberGradientLoadAverageEventFormatter.xml | 11 +++ ...rGradientMemoryConsumptionEventFormatter.xml | 11 +++ ...econdDerivativeLoadAverageEventFormatter.xml | 11 +++ ...erivativeMemoryConsumptionEventFormatter.xml | 11 +++ .../execution-plans/AverageHeathRequest.xml | 6 ++ .../execution-plans/GradientOfHealthRequest.xml | 6 ++ .../SecondDerivativeOfHealthRequest.xml | 10 ++- .../stream-manager-config.xml | 92 ++++++++++++++++++++ 10 files changed, 178 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/event-formatters/MemberAverageLoadAverageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/event-formatters/MemberAverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberAverageLoadAverageEventFormatter.xml new file mode 100644 index 0000000..582a6ef --- /dev/null +++ b/extensions/cep/artifacts/event-formatters/MemberAverageLoadAverageEventFormatter.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<eventFormatter name="MemberAverageLoadAverageEventFormatter" + statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> + <from streamName="member_average_load_average_stats" version="1.0.0"/> + <mapping customMapping="enable" type="json"> + <inline>{"member_average_load_average":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_average_load_average}}"}}</inline> + </mapping> + <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> + <property name="transport.jms.Destination">summarized-health-stats</property> + </to> +</eventFormatter> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/event-formatters/MemberAverageMemoryConsumptionEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/event-formatters/MemberAverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberAverageMemoryConsumptionEventFormatter.xml new file mode 100644 index 0000000..631256e --- /dev/null +++ b/extensions/cep/artifacts/event-formatters/MemberAverageMemoryConsumptionEventFormatter.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<eventFormatter name="MemberAverageMemoryConsumptionEventFormatter" + statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> + <from streamName="member_average_memory_consumption_stats" version="1.0.0"/> + <mapping customMapping="enable" type="json"> + <inline>{"member_average_memory_consumption":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_average_memory_consumption}}"}}</inline> + </mapping> + <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> + <property name="transport.jms.Destination">summarized-health-stats</property> + </to> +</eventFormatter> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/event-formatters/MemberGradientLoadAverageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/event-formatters/MemberGradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberGradientLoadAverageEventFormatter.xml new file mode 100644 index 0000000..3cd3427 --- /dev/null +++ b/extensions/cep/artifacts/event-formatters/MemberGradientLoadAverageEventFormatter.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<eventFormatter name="MemberGradientLoadAverageEventFormatter" + statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> + <from streamName="member_gradient_load_average_stats" version="1.0.0"/> + <mapping customMapping="enable" type="json"> + <inline>{"member_gradient_load_average":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_gradient_load_average}}"}}</inline> + </mapping> + <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> + <property name="transport.jms.Destination">summarized-health-stats</property> + </to> +</eventFormatter> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/event-formatters/MemberGradientMemoryConsumptionEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/event-formatters/MemberGradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberGradientMemoryConsumptionEventFormatter.xml new file mode 100644 index 0000000..9dd43b6 --- /dev/null +++ b/extensions/cep/artifacts/event-formatters/MemberGradientMemoryConsumptionEventFormatter.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<eventFormatter name="MemberGradientMemoryConsumptionEventFormatter" + statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter";> + <from streamName="member_gradient_memory_consumption_stats" version="1.0.0"/> + <mapping customMapping="enable" type="json"> + <inline>{"member_gradient_memory_consumption":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_gradient_memory_consumption}}"}}</inline> + </mapping> + <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> + <property name="transport.jms.Destination">summarized-health-stats</property> + </to> +</eventFormatter> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeLoadAverageEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeLoadAverageEventFormatter.xml new file mode 100644 index 0000000..15ec828 --- /dev/null +++ b/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeLoadAverageEventFormatter.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<eventFormatter name="MemberSecondDerivativeLoadAverageEventFormatter" + statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter";> + <from streamName="member_second_derivative_load_average_stats" version="1.0.0"/> + <mapping customMapping="enable" type="json"> + <inline>{"member_second_derivative_load_average":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_second_derivative_load_average}}"}}</inline> + </mapping> + <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> + <property name="transport.jms.Destination">summarized-health-stats</property> + </to> +</eventFormatter> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml new file mode 100644 index 0000000..6fdf2e6 --- /dev/null +++ b/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<eventFormatter name="MemberSecondDerivativeMemoryConsumptionEventFormatter" + statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter";> + <from streamName="member_second_derivative_memory_consumption_stats" version="1.0.0"/> + <mapping customMapping="enable" type="json"> + <inline>{"member_second_derivative_memory_consumption":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_second_derivative_memory_consumption}}"}}</inline> + </mapping> + <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms"> + <property name="transport.jms.Destination">summarized-health-stats</property> + </to> +</eventFormatter> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml b/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml index c220a0d..d3cf7ff 100644 --- a/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml +++ b/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml @@ -11,10 +11,16 @@ </importedStreams> <queryExpressions><![CDATA[from healthStats1 [health_description == 'port_not_open'] select cluster_id, network_partition_id, member_id, partition_id insert into fault_message; from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select cluster_id, network_partition_id, avg(value) as average_load_average group by cluster_id, network_partition_id insert into average_load_average_stats; + from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select member_id, cluster_id, network_partition_id, avg(value) as member_average_load_average group by member_id insert into member_average_load_average_stats; + from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select member_id, cluster_id, network_partition_id, avg(value) as member_average_memory_consumption group by member_id insert into member_average_memory_consumption_stats; from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select cluster_id, network_partition_id, avg(value) as average_memory_consumption group by cluster_id, network_partition_id insert into average_memory_consumption_stats;]]></queryExpressions> <exportedStreams> <stream name="average_load_average_stats" passthroughFlow="disable" valueOf="average_load_average_stats" version="1.0.0"/> + <stream name="member_average_load_average_stats" passthroughFlow="disable" + valueOf="member_average_load_average_stats" version="1.0.0"/> + <stream name="member_average_memory_consumption_stats" passthroughFlow="disable" + valueOf="member_average_memory_consumption_stats" version="1.0.0"/> <stream name="average_memory_consumption_stats" passthroughFlow="disable" valueOf="average_memory_consumption_stats" version="1.0.0"/> <stream name="fault_message" passthroughFlow="disable" http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml b/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml index 2d79ebb..75406f9 100644 --- a/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml +++ b/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml @@ -12,12 +12,18 @@ <queryExpressions><![CDATA[ from healthStats2 #window.stratos:faultHandling(1min, member_id) select cluster_id, network_partition_id, member_id, partition_id group by cluster_id, network_partition_id insert into fault_message; from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select cluster_id, network_partition_id, value as gradient_load_average group by cluster_id, network_partition_id insert into gradient_load_average_stats; + from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select member_id, cluster_id, network_partition_id, value as member_gradient_load_average group by member_id insert into member_gradient_load_average_stats; + from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select member_id, cluster_id, network_partition_id, value as member_gradient_memory_consumption group by member_id insert into member_gradient_memory_consumption_stats; from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select cluster_id, network_partition_id, value as gradient_memory_consumption group by cluster_id, network_partition_id insert into gradient_memory_consumption_stats;]]></queryExpressions> <exportedStreams> <stream name="gradient_load_average_stats" valueOf="gradient_load_average_stats" version="1.0.0"/> <stream name="gradient_memory_consumption_stats" valueOf="gradient_memory_consumption_stats" version="1.0.0"/> + <stream name="member_gradient_load_average_stats" + valueOf="member_gradient_load_average_stats" version="1.0.0"/> + <stream name="member_gradient_memory_consumption_stats" + valueOf="member_gradient_memory_consumption_stats" version="1.0.0"/> <stream name="fault_message" passthroughFlow="disable" valueOf="fault_message" version="1.0.0"/> </exportedStreams> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml index 60958ec..fefa306 100644 --- a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml +++ b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml @@ -10,12 +10,18 @@ <stream as="healthStats3" name="cartridge_agent_health_stats" version="1.0.0"/> </importedStreams> <queryExpressions><![CDATA[ - from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select cluster_id,network_partition_id,value as second_derivative_memory_consumption group by cluster_id,network_partition_id insert into second_derivative_memory_consumption_stats; - from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select cluster_id,network_partition_id,value as second_derivative_load_average group by cluster_id,network_partition_id insert into second_derivative_load_average_stats;]]></queryExpressions> + from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select cluster_id, network_partition_id, value as second_derivative_memory_consumption group by cluster_id,network_partition_id insert into second_derivative_memory_consumption_stats; + from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select member_id, cluster_id, network_partition_id, value as member_second_derivative_memory_consumption group by member_id insert into member_second_derivative_memory_consumption_stats; + from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select member_id, cluster_id, network_partition_id, value as member_second_derivative_load_average group by member_id insert into member_second_derivative_load_average_stats; + from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select cluster_id, network_partition_id, value as second_derivative_load_average group by cluster_id,network_partition_id insert into second_derivative_load_average_stats;]]></queryExpressions> <exportedStreams> <stream name="second_derivative_memory_consumption_stats" valueOf="second_derivative_memory_consumption_stats" version="1.0.0"/> <stream name="second_derivative_load_average_stats" valueOf="second_derivative_load_average_stats" version="1.0.0"/> + <stream name="member_second_derivative_memory_consumption_stats" + valueOf="member_second_derivative_memory_consumption_stats" version="1.0.0"/> + <stream name="member_second_derivative_load_average_stats" + valueOf="member_second_derivative_load_average_stats" version="1.0.0"/> </exportedStreams> </executionPlan> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48981476/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml b/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml index 8089507..7aa5bfb 100755 --- a/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml +++ b/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml @@ -174,4 +174,96 @@ </payloadData> </streamDefinition> <!-- cartridge agent health stats stream definitions end --> + + <!-- This is for member_id wise grouping--> + <streamDefinition name="member_average_load_average_stats" version="1.0.0"> + <description>average load average stats</description> + <nickName>average load average stats</nickName> + <metaData> + </metaData> + <correlationData> + </correlationData> + <payloadData> + <property name="member_id" type="String" /> + <property name="cluster_id" type="String" /> + <property name="network_partition_id" type="String"/> + <property name="member_average_load_average" type="double"/> + </payloadData> + </streamDefinition> + + <streamDefinition name="member_average_memory_consumption_stats" version="1.0.0"> + <description>average memory consumption stats</description> + <nickName>average memory consumption stats</nickName> + <metaData> + </metaData> + <correlationData> + </correlationData> + <payloadData> + <property name="member_id" type="String"/> + <property name="cluster_id" type="String"/> + <property name="network_partition_id" type="String"/> + <property name="member_average_memory_consumption" type="double"/> + </payloadData> + </streamDefinition> + + <streamDefinition name="member_gradient_load_average_stats" version="1.0.0"> + <description>gradient load average stats</description> + <nickName>gradient load average stats</nickName> + <metaData> + </metaData> + <correlationData> + </correlationData> + <payloadData> + <property name="member_id" type="String" /> + <property name="cluster_id" type="String" /> + <property name="network_partition_id" type="String"/> + <property name="member_gradient_load_average" type="double"/> + </payloadData> + </streamDefinition> + + <streamDefinition name="member_gradient_memory_consumption_stats" version="1.0.0"> + <description>gradient memoryconsumption stats</description> + <nickName>gradient memoryconsumption stats</nickName> + <metaData> + </metaData> + <correlationData> + </correlationData> + <payloadData> + <property name="member_id" type="String" /> + <property name="cluster_id" type="String" /> + <property name="network_partition_id" type="String"/> + <property name="member_gradient_memory_consumption" type="double"/> + </payloadData> + </streamDefinition> + + <streamDefinition name="member_second_derivative_memory_consumption_stats" version="1.0.0"> + <description>second derivative memory consumption stats</description> + <nickName>second derivative memory consumption stats</nickName> + <metaData> + </metaData> + <correlationData> + </correlationData> + <payloadData> + <property name="member_id" type="String" /> + <property name="cluster_id" type="String" /> + <property name="network_partition_id" type="String"/> + <property name="member_second_derivative_memory_consumption" type="double"/> + </payloadData> + </streamDefinition> + + <streamDefinition name="member_second_derivative_load_average_stats" version="1.0.0"> + <description>second derivative load average stats</description> + <nickName>second derivative load average stats</nickName> + <metaData> + </metaData> + <correlationData> + </correlationData> + <payloadData> + <property name="member_id" type="String" /> + <property name="cluster_id" type="String" /> + <property name="network_partition_id" type="String"/> + <property name="member_second_derivative_load_average" type="double"/> + </payloadData> + </streamDefinition> + </streamManagerConfiguration>
