You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/11 16:48:32 UTC
[1/2] git commit: Updated cep artifact folder names
Updated Branches:
refs/heads/master 5f2b80449 -> 02b6b7fb4
Updated cep artifact folder names
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4b8ef109
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4b8ef109
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4b8ef109
Branch: refs/heads/master
Commit: 4b8ef10947acfa1aed28614a33ef2e008b6217a2
Parents: fafe2af
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 11 21:18:03 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 11 21:18:03 2013 +0530
----------------------------------------------------------------------
.../HealthStatisticsEventBuilder.xml | 10 ++
.../InstanceStatisticsEventBuilder.xml | 22 +++
.../LoadBalancerStatisticsEventBuilder.xml | 10 ++
.../stratos.instance.stats_1.0.0_builder.xml | 10 ++
.../AverageLoadAverageEventFormatter.xml | 11 ++
.../AverageMemoryConsumptionEventFormatter.xml | 11 ++
.../AverageRequestsInflightEventFormatter.xml | 11 ++
.../FaultMessageEventFormatter.xml | 11 ++
.../event-formatters/GradientEventFormatter.xml | 11 ++
.../GradientLoadAverageEventFormatter.xml | 11 ++
.../GradientMemoryConsumptionEventFormatter.xml | 11 ++
.../SecondDerivativeEventFormatter.xml | 11 ++
...econdDerivativeLoadAverageEventFormatter.xml | 11 ++
...erivativeMemoryConsumptionEventFormatter.xml | 11 ++
.../HealthStatisticsEventBuilder.xml | 10 --
.../InstanceStatisticsEventBuilder.xml | 22 ---
.../LoadBalancerStatisticsEventBuilder.xml | 10 --
.../stratos.instance.stats_1.0.0_builder.xml | 10 --
.../AverageLoadAverageEventFormatter.xml | 11 --
.../AverageMemoryConsumptionEventFormatter.xml | 11 --
.../AverageRequestsInflightEventFormatter.xml | 11 --
.../FaultMessageEventFormatter.xml | 11 --
.../eventformatters/GradientEventFormatter.xml | 11 --
.../GradientLoadAverageEventFormatter.xml | 11 --
.../GradientMemoryConsumptionEventFormatter.xml | 11 --
.../SecondDerivativeEventFormatter.xml | 11 --
...econdDerivativeLoadAverageEventFormatter.xml | 11 --
...erivativeMemoryConsumptionEventFormatter.xml | 11 --
.../execution-plans/AverageHeathRequest.xml | 24 +++
.../AverageRequestsInflightFinder.xml | 19 +++
.../execution-plans/GradientOfHealthRequest.xml | 24 +++
.../GradientOfRequestsInFlightFinder.xml | 18 ++
.../SecondDerivativeOfHealthRequest.xml | 21 +++
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 +++
.../executionplans/AverageHeathRequest.xml | 24 ---
.../AverageRequestsInflightFinder.xml | 19 ---
.../executionplans/GradientOfHealthRequest.xml | 24 ---
.../GradientOfRequestsInFlightFinder.xml | 18 --
.../SecondDerivativeOfHealthRequest.xml | 21 ---
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 ---
.../DefaultWSO2EventInputAdaptor.xml | 3 +
.../InstanceStatsInputAdaptor.xml | 9 +
.../DefaultWSO2EventInputAdaptor.xml | 3 -
.../InstanceStatsInputAdaptor.xml | 9 -
.../DefaultWSO2EventOutputAdaptor.xml | 8 +
.../output-event-adaptors/JMSOutputAdaptor.xml | 8 +
.../DefaultWSO2EventOutputAdaptor.xml | 8 -
.../outputeventadaptors/JMSOutputAdaptor.xml | 8 -
.../stream-manager-config.xml | 164 +++++++++++++++++++
.../stream-manager-config.xml | 164 -------------------
50 files changed, 479 insertions(+), 479 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/event-builders/HealthStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-builders/HealthStatisticsEventBuilder.xml b/extensions/cep/artifacts/event-builders/HealthStatisticsEventBuilder.xml
new file mode 100644
index 0000000..cff277f
--- /dev/null
+++ b/extensions/cep/artifacts/event-builders/HealthStatisticsEventBuilder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventBuilder name="HealthStatisticsEventBuilder" statistics="disable"
+ trace="enable" xmlns="http://wso2.org/carbon/eventbuilder">
+ <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
+ <property name="stream">stratos.agent.health.stats</property>
+ <property name="version">1.0.0</property>
+ </from>
+ <mapping customMapping="disable" type="wso2event"/>
+ <to streamName="stratos.agent.health.stats" version="1.0.0"/>
+</eventBuilder>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/event-builders/InstanceStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-builders/InstanceStatisticsEventBuilder.xml b/extensions/cep/artifacts/event-builders/InstanceStatisticsEventBuilder.xml
new file mode 100644
index 0000000..4b83f73
--- /dev/null
+++ b/extensions/cep/artifacts/event-builders/InstanceStatisticsEventBuilder.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventBuilder name="InstanceStatisticsEventBuilder" statistics="disable"
+ trace="disable" xmlns="http://wso2.org/carbon/eventbuilder">
+ <from eventAdaptorName="InstanceStatsInputAdaptor" eventAdaptorType="jms">
+ <property name="transport.jms.Destination">instance-stats</property>
+ </from>
+ <mapping customMapping="disable" type="json">
+ <property>
+ <from jsonPath="$.instance.memberId"/>
+ <to name="memberId" type="string"/>
+ </property>
+ <property>
+ <from jsonPath="$.instance.clusterId"/>
+ <to name="clusterId" type="string"/>
+ </property>
+ <property>
+ <from jsonPath="$.instance.loadAverage"/>
+ <to name="loadAverage" type="double"/>
+ </property>
+ </mapping>
+ <to streamName="stratos.instance.stats" version="1.0.0"/>
+</eventBuilder>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/event-builders/LoadBalancerStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-builders/LoadBalancerStatisticsEventBuilder.xml b/extensions/cep/artifacts/event-builders/LoadBalancerStatisticsEventBuilder.xml
new file mode 100644
index 0000000..fd1a707
--- /dev/null
+++ b/extensions/cep/artifacts/event-builders/LoadBalancerStatisticsEventBuilder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventBuilder name="LoadBalancerStatisticsEventBuilder"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventbuilder">
+ <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
+ <property name="stream">stratos.lb.in.flight.req.count</property>
+ <property name="version">1.0.0</property>
+ </from>
+ <mapping customMapping="disable" type="wso2event"/>
+ <to streamName="stratos.lb.in.flight.req.count" version="1.0.0"/>
+</eventBuilder>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/event-builders/stratos.instance.stats_1.0.0_builder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-builders/stratos.instance.stats_1.0.0_builder.xml b/extensions/cep/artifacts/event-builders/stratos.instance.stats_1.0.0_builder.xml
new file mode 100644
index 0000000..ed6b588
--- /dev/null
+++ b/extensions/cep/artifacts/event-builders/stratos.instance.stats_1.0.0_builder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventBuilder name="stratos.instance.stats_1.0.0_builder"
+ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventbuilder">
+ <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
+ <property name="stream">stratos.instance.stats</property>
+ <property name="version">1.0.0</property>
+ </from>
+ <mapping customMapping="disable" type="wso2event"/>
+ <to streamName="stratos.instance.stats" version="1.0.0"/>
+</eventBuilder>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
new file mode 100644
index 0000000..19593dc
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="AverageLoadAverageEventFormatter"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="average_load_average_stats" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"average_load_average":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
new file mode 100644
index 0000000..02776d4
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="AverageMemoryConsumptionEventFormatter"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="average_memory_consumption_stats" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"average_memory_consumption":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/event-formatters/AverageRequestsInflightEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/AverageRequestsInflightEventFormatter.xml b/extensions/cep/artifacts/event-formatters/AverageRequestsInflightEventFormatter.xml
new file mode 100644
index 0000000..19a4f30
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/AverageRequestsInflightEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="AverageRequestsInflightEventFormatter"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="aggregated_requests_stats" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"average_requests_in_flight":{"cluster_id":"{{cluster_id}}","value":"{{count}}"}}</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/4b8ef109/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
new file mode 100644
index 0000000..03d7f8f
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="FaultMessageEventFormatter"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="fault_message" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"member_fault":{"member_id":"{{member_id}}", "cluster_id":"{{cluster_id}}"}}</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/4b8ef109/extensions/cep/artifacts/event-formatters/GradientEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/GradientEventFormatter.xml b/extensions/cep/artifacts/event-formatters/GradientEventFormatter.xml
new file mode 100644
index 0000000..e3d9e82
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/GradientEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="GradientEventFormatter" statistics="disable"
+ trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="gradient_stats" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"gradient_of_requests_in_flight":{"cluster_id":"{{cluster_id}}","value":"{{count}}"}}</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/4b8ef109/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
new file mode 100644
index 0000000..9b733f4
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="GradientLoadAverageEventFormatter"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="gradient_load_average_stats" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"gradient_load_average":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
new file mode 100644
index 0000000..f82112a
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="GradientMemoryConsumptionEventFormatter"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="gradient_memory_consumption_stats" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"gradient_memory_consumption":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/event-formatters/SecondDerivativeEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/SecondDerivativeEventFormatter.xml b/extensions/cep/artifacts/event-formatters/SecondDerivativeEventFormatter.xml
new file mode 100644
index 0000000..ddb1cc4
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/SecondDerivativeEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="SecondDerivativeEventFormatter"
+ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="second_derivative_of_requests_stats" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"second_derivative_of_requests_in_flight":{"cluster_id":"{{cluster_id}}","value":"{{count}}"}}</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/4b8ef109/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
new file mode 100644
index 0000000..1cd3d85
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="SecondDerivativeLoadAverageEventFormatter"
+ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="second_derivative_load_average_stats" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"second_derivative_load_average":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
new file mode 100644
index 0000000..4ae867e
--- /dev/null
+++ b/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="SecondDerivativeMemoryConsumptionEventFormatter"
+ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+ <from streamName="second_derivative_memory_consumption_stats" version="1.0.0"/>
+ <mapping customMapping="enable" type="json">
+ <inline>{"second_derivative_memory_consumption":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/eventbuilders/HealthStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventbuilders/HealthStatisticsEventBuilder.xml b/extensions/cep/artifacts/eventbuilders/HealthStatisticsEventBuilder.xml
deleted file mode 100644
index cff277f..0000000
--- a/extensions/cep/artifacts/eventbuilders/HealthStatisticsEventBuilder.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventBuilder name="HealthStatisticsEventBuilder" statistics="disable"
- trace="enable" xmlns="http://wso2.org/carbon/eventbuilder">
- <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
- <property name="stream">stratos.agent.health.stats</property>
- <property name="version">1.0.0</property>
- </from>
- <mapping customMapping="disable" type="wso2event"/>
- <to streamName="stratos.agent.health.stats" version="1.0.0"/>
-</eventBuilder>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/eventbuilders/InstanceStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventbuilders/InstanceStatisticsEventBuilder.xml b/extensions/cep/artifacts/eventbuilders/InstanceStatisticsEventBuilder.xml
deleted file mode 100644
index 4b83f73..0000000
--- a/extensions/cep/artifacts/eventbuilders/InstanceStatisticsEventBuilder.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventBuilder name="InstanceStatisticsEventBuilder" statistics="disable"
- trace="disable" xmlns="http://wso2.org/carbon/eventbuilder">
- <from eventAdaptorName="InstanceStatsInputAdaptor" eventAdaptorType="jms">
- <property name="transport.jms.Destination">instance-stats</property>
- </from>
- <mapping customMapping="disable" type="json">
- <property>
- <from jsonPath="$.instance.memberId"/>
- <to name="memberId" type="string"/>
- </property>
- <property>
- <from jsonPath="$.instance.clusterId"/>
- <to name="clusterId" type="string"/>
- </property>
- <property>
- <from jsonPath="$.instance.loadAverage"/>
- <to name="loadAverage" type="double"/>
- </property>
- </mapping>
- <to streamName="stratos.instance.stats" version="1.0.0"/>
-</eventBuilder>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/eventbuilders/LoadBalancerStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventbuilders/LoadBalancerStatisticsEventBuilder.xml b/extensions/cep/artifacts/eventbuilders/LoadBalancerStatisticsEventBuilder.xml
deleted file mode 100644
index fd1a707..0000000
--- a/extensions/cep/artifacts/eventbuilders/LoadBalancerStatisticsEventBuilder.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventBuilder name="LoadBalancerStatisticsEventBuilder"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventbuilder">
- <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
- <property name="stream">stratos.lb.in.flight.req.count</property>
- <property name="version">1.0.0</property>
- </from>
- <mapping customMapping="disable" type="wso2event"/>
- <to streamName="stratos.lb.in.flight.req.count" version="1.0.0"/>
-</eventBuilder>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/eventbuilders/stratos.instance.stats_1.0.0_builder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventbuilders/stratos.instance.stats_1.0.0_builder.xml b/extensions/cep/artifacts/eventbuilders/stratos.instance.stats_1.0.0_builder.xml
deleted file mode 100644
index ed6b588..0000000
--- a/extensions/cep/artifacts/eventbuilders/stratos.instance.stats_1.0.0_builder.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventBuilder name="stratos.instance.stats_1.0.0_builder"
- statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventbuilder">
- <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
- <property name="stream">stratos.instance.stats</property>
- <property name="version">1.0.0</property>
- </from>
- <mapping customMapping="disable" type="wso2event"/>
- <to streamName="stratos.instance.stats" version="1.0.0"/>
-</eventBuilder>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml
deleted file mode 100644
index 19593dc..0000000
--- a/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="AverageLoadAverageEventFormatter"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="average_load_average_stats" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"average_load_average":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 02776d4..0000000
--- a/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="AverageMemoryConsumptionEventFormatter"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="average_memory_consumption_stats" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"average_memory_consumption":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/eventformatters/AverageRequestsInflightEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageRequestsInflightEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageRequestsInflightEventFormatter.xml
deleted file mode 100644
index 19a4f30..0000000
--- a/extensions/cep/artifacts/eventformatters/AverageRequestsInflightEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="AverageRequestsInflightEventFormatter"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="aggregated_requests_stats" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"average_requests_in_flight":{"cluster_id":"{{cluster_id}}","value":"{{count}}"}}</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/4b8ef109/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
deleted file mode 100644
index 03d7f8f..0000000
--- a/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="FaultMessageEventFormatter"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="fault_message" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"member_fault":{"member_id":"{{member_id}}", "cluster_id":"{{cluster_id}}"}}</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/4b8ef109/extensions/cep/artifacts/eventformatters/GradientEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/GradientEventFormatter.xml b/extensions/cep/artifacts/eventformatters/GradientEventFormatter.xml
deleted file mode 100644
index e3d9e82..0000000
--- a/extensions/cep/artifacts/eventformatters/GradientEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="GradientEventFormatter" statistics="disable"
- trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="gradient_stats" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"gradient_of_requests_in_flight":{"cluster_id":"{{cluster_id}}","value":"{{count}}"}}</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/4b8ef109/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml
deleted file mode 100644
index 9b733f4..0000000
--- a/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="GradientLoadAverageEventFormatter"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="gradient_load_average_stats" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"gradient_load_average":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index f82112a..0000000
--- a/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="GradientMemoryConsumptionEventFormatter"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="gradient_memory_consumption_stats" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"gradient_memory_consumption":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/eventformatters/SecondDerivativeEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeEventFormatter.xml b/extensions/cep/artifacts/eventformatters/SecondDerivativeEventFormatter.xml
deleted file mode 100644
index ddb1cc4..0000000
--- a/extensions/cep/artifacts/eventformatters/SecondDerivativeEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="SecondDerivativeEventFormatter"
- statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="second_derivative_of_requests_stats" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"second_derivative_of_requests_in_flight":{"cluster_id":"{{cluster_id}}","value":"{{count}}"}}</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/4b8ef109/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
deleted file mode 100644
index 1cd3d85..0000000
--- a/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="SecondDerivativeLoadAverageEventFormatter"
- statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="second_derivative_load_average_stats" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"second_derivative_load_average":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 4ae867e..0000000
--- a/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="SecondDerivativeMemoryConsumptionEventFormatter"
- statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
- <from streamName="second_derivative_memory_consumption_stats" version="1.0.0"/>
- <mapping customMapping="enable" type="json">
- <inline>{"second_derivative_memory_consumption":{"member_id":"{{member_id}}","value":"{{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/4b8ef109/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
new file mode 100644
index 0000000..ccca3fd
--- /dev/null
+++ b/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="AverageHeathRequest" statistics="disable"
+ trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will average health stats of an instance over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
+ <stream as="healthStats1" name="stratos.agent.health.stats" version="1.0.0"/>
+ </importedStreams>
+ <queryExpressions><![CDATA[define partition healthStats1Partition by member_id;
+ from healthStats1 [health_description == 'port_not_open'] select member_id, cluster_id insert into fault_message partition by healthStats1Partition;
+ from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select member_id, avg(value) as average_load_average insert into average_load_average_stats partition by healthStats1Partition;
+ from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select member_id, avg(value) as average_memory_consumption insert into average_memory_consumption_stats partition by healthStats1Partition;]]></queryExpressions>
+ <exportedStreams>
+ <stream name="average_load_average_stats" passthroughFlow="disable"
+ valueOf="average_load_average_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"
+ valueOf="fault_message" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/execution-plans/AverageRequestsInflightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/AverageRequestsInflightFinder.xml b/extensions/cep/artifacts/execution-plans/AverageRequestsInflightFinder.xml
new file mode 100644
index 0000000..6ec19fc
--- /dev/null
+++ b/extensions/cep/artifacts/execution-plans/AverageRequestsInflightFinder.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="AverageRequestsInflightFinder" statistics="disable"
+ trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will average the number of requests in flight over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
+ <stream as="lbStats1" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
+ </importedStreams>
+ <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
+from lbStats1#window.timeBatch(1 min)
+select cluster_id, avg(in_flight_request_count) as count insert into aggregated_requests_stats partition by lbStats1Partition;]]></queryExpressions>
+ <exportedStreams>
+ <stream name="aggregated_requests_stats"
+ valueOf="aggregated_requests_stats" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/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
new file mode 100644
index 0000000..4a5d2cb
--- /dev/null
+++ b/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="GradientOfHealthRequest" statistics="disable"
+ trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will find the gradient of the heath request over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
+ <stream as="healthStats2" name="stratos.agent.health.stats" version="1.0.0"/>
+ </importedStreams>
+ <queryExpressions><![CDATA[define partition healthStats2Partition by member_id;
+ from healthStats2 #window.stratos:faultHandling(1min, member_id) select member_id, cluster_id insert into fault_message partition by healthStats2Partition;
+ from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_load_average insert into gradient_load_average_stats partition by healthStats2Partition;
+ from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_memory_consumption insert into gradient_memory_consumption_stats partition by healthStats2Partition;]]></queryExpressions>
+ <exportedStreams>
+ <stream name="gradient_load_average_stats" passthroughFlow="disable"
+ valueOf="gradient_load_average_stats" version="1.0.0"/>
+ <stream name="gradient_memory_consumption_stats" passthroughFlow="disable"
+ valueOf="gradient_memory_consumption_stats" version="1.0.0"/>
+ <stream name="fault_message" passthroughFlow="disable"
+ valueOf="fault_message" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
new file mode 100644
index 0000000..a8be5fa
--- /dev/null
+++ b/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="GradientOfRequestsInFlightFinder"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will find the gradient of the number of requests in flight over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
+ <stream as="lbStats2" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
+ </importedStreams>
+ <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
+from lbStats2#window.stratos:gradient(1 min, in_flight_request_count)
+select cluster_id, in_flight_request_count as count insert into gradient_stats partition by lbStats1Partition;]]></queryExpressions>
+ <exportedStreams>
+ <stream name="gradient_stats" valueOf="gradient_stats" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/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
new file mode 100644
index 0000000..fd7c8d9
--- /dev/null
+++ b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="SecondDerivativeOfHealthRequest"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will find the second derivative of health stats over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
+ <stream as="healthStats3" name="stratos.agent.health.stats" version="1.0.0"/>
+ </importedStreams>
+ <queryExpressions><![CDATA[define partition healthStats3Partition by member_id;
+ from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select member_id, value as second_derivative_memory_consumption insert into second_derivative_memory_consumption_stats partition by healthStats3Partition;
+ from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select member_id, value as second_derivative_load_average insert into second_derivative_load_average_stats partition by healthStats3Partition;]]></queryExpressions>
+ <exportedStreams>
+ <stream name="second_derivative_memory_consumption_stats" passthroughFlow="disable"
+ valueOf="second_derivative_memory_consumption_stats" version="1.0.0"/>
+ <stream name="second_derivative_load_average_stats" passthroughFlow="disable"
+ valueOf="second_derivative_load_average_stats" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
new file mode 100644
index 0000000..1afde17
--- /dev/null
+++ b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="SecondDerivativeOfRequestsInFlightFinder"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will find the second derivative of the number of requests in flight over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
+ <stream as="lbStats3" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
+ </importedStreams>
+ <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
+from lbStats3#window.stratos:secondDerivative(1 min, in_flight_request_count)
+select cluster_id, in_flight_request_count as count insert into second_derivative_of_requests_stats partition by lbStats1Partition;]]></queryExpressions>
+ <exportedStreams>
+ <stream name="second_derivative_of_requests_stats"
+ valueOf="second_derivative_of_requests_stats" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
deleted file mode 100644
index ccca3fd..0000000
--- a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="AverageHeathRequest" statistics="disable"
- trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
- <description>This will average health stats of an instance over a minute.</description>
- <siddhiConfiguration>
- <property name="siddhi.enable.distributed.processing">false</property>
- <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
- </siddhiConfiguration>
- <importedStreams>
- <stream as="healthStats1" name="stratos.agent.health.stats" version="1.0.0"/>
- </importedStreams>
- <queryExpressions><![CDATA[define partition healthStats1Partition by member_id;
- from healthStats1 [health_description == 'port_not_open'] select member_id, cluster_id insert into fault_message partition by healthStats1Partition;
- from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select member_id, avg(value) as average_load_average insert into average_load_average_stats partition by healthStats1Partition;
- from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select member_id, avg(value) as average_memory_consumption insert into average_memory_consumption_stats partition by healthStats1Partition;]]></queryExpressions>
- <exportedStreams>
- <stream name="average_load_average_stats" passthroughFlow="disable"
- valueOf="average_load_average_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"
- valueOf="fault_message" version="1.0.0"/>
- </exportedStreams>
-</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/executionplans/AverageRequestsInflightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/AverageRequestsInflightFinder.xml b/extensions/cep/artifacts/executionplans/AverageRequestsInflightFinder.xml
deleted file mode 100644
index 6ec19fc..0000000
--- a/extensions/cep/artifacts/executionplans/AverageRequestsInflightFinder.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="AverageRequestsInflightFinder" statistics="disable"
- trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
- <description>This will average the number of requests in flight over a minute.</description>
- <siddhiConfiguration>
- <property name="siddhi.enable.distributed.processing">false</property>
- <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
- </siddhiConfiguration>
- <importedStreams>
- <stream as="lbStats1" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
- </importedStreams>
- <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
-from lbStats1#window.timeBatch(1 min)
-select cluster_id, avg(in_flight_request_count) as count insert into aggregated_requests_stats partition by lbStats1Partition;]]></queryExpressions>
- <exportedStreams>
- <stream name="aggregated_requests_stats"
- valueOf="aggregated_requests_stats" version="1.0.0"/>
- </exportedStreams>
-</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
deleted file mode 100644
index 4a5d2cb..0000000
--- a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="GradientOfHealthRequest" statistics="disable"
- trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
- <description>This will find the gradient of the heath request over a minute.</description>
- <siddhiConfiguration>
- <property name="siddhi.enable.distributed.processing">false</property>
- <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
- </siddhiConfiguration>
- <importedStreams>
- <stream as="healthStats2" name="stratos.agent.health.stats" version="1.0.0"/>
- </importedStreams>
- <queryExpressions><![CDATA[define partition healthStats2Partition by member_id;
- from healthStats2 #window.stratos:faultHandling(1min, member_id) select member_id, cluster_id insert into fault_message partition by healthStats2Partition;
- from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_load_average insert into gradient_load_average_stats partition by healthStats2Partition;
- from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_memory_consumption insert into gradient_memory_consumption_stats partition by healthStats2Partition;]]></queryExpressions>
- <exportedStreams>
- <stream name="gradient_load_average_stats" passthroughFlow="disable"
- valueOf="gradient_load_average_stats" version="1.0.0"/>
- <stream name="gradient_memory_consumption_stats" passthroughFlow="disable"
- valueOf="gradient_memory_consumption_stats" version="1.0.0"/>
- <stream name="fault_message" passthroughFlow="disable"
- valueOf="fault_message" version="1.0.0"/>
- </exportedStreams>
-</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
deleted file mode 100644
index a8be5fa..0000000
--- a/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="GradientOfRequestsInFlightFinder"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
- <description>This will find the gradient of the number of requests in flight over a minute.</description>
- <siddhiConfiguration>
- <property name="siddhi.enable.distributed.processing">false</property>
- <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
- </siddhiConfiguration>
- <importedStreams>
- <stream as="lbStats2" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
- </importedStreams>
- <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
-from lbStats2#window.stratos:gradient(1 min, in_flight_request_count)
-select cluster_id, in_flight_request_count as count insert into gradient_stats partition by lbStats1Partition;]]></queryExpressions>
- <exportedStreams>
- <stream name="gradient_stats" valueOf="gradient_stats" version="1.0.0"/>
- </exportedStreams>
-</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
deleted file mode 100644
index fd7c8d9..0000000
--- a/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="SecondDerivativeOfHealthRequest"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
- <description>This will find the second derivative of health stats over a minute.</description>
- <siddhiConfiguration>
- <property name="siddhi.enable.distributed.processing">false</property>
- <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
- </siddhiConfiguration>
- <importedStreams>
- <stream as="healthStats3" name="stratos.agent.health.stats" version="1.0.0"/>
- </importedStreams>
- <queryExpressions><![CDATA[define partition healthStats3Partition by member_id;
- from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select member_id, value as second_derivative_memory_consumption insert into second_derivative_memory_consumption_stats partition by healthStats3Partition;
- from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select member_id, value as second_derivative_load_average insert into second_derivative_load_average_stats partition by healthStats3Partition;]]></queryExpressions>
- <exportedStreams>
- <stream name="second_derivative_memory_consumption_stats" passthroughFlow="disable"
- valueOf="second_derivative_memory_consumption_stats" version="1.0.0"/>
- <stream name="second_derivative_load_average_stats" passthroughFlow="disable"
- valueOf="second_derivative_load_average_stats" version="1.0.0"/>
- </exportedStreams>
-</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
deleted file mode 100644
index 1afde17..0000000
--- a/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="SecondDerivativeOfRequestsInFlightFinder"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
- <description>This will find the second derivative of the number of requests in flight over a minute.</description>
- <siddhiConfiguration>
- <property name="siddhi.enable.distributed.processing">false</property>
- <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
- </siddhiConfiguration>
- <importedStreams>
- <stream as="lbStats3" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
- </importedStreams>
- <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
-from lbStats3#window.stratos:secondDerivative(1 min, in_flight_request_count)
-select cluster_id, in_flight_request_count as count insert into second_derivative_of_requests_stats partition by lbStats1Partition;]]></queryExpressions>
- <exportedStreams>
- <stream name="second_derivative_of_requests_stats"
- valueOf="second_derivative_of_requests_stats" version="1.0.0"/>
- </exportedStreams>
-</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/input-event-adaptors/DefaultWSO2EventInputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/input-event-adaptors/DefaultWSO2EventInputAdaptor.xml b/extensions/cep/artifacts/input-event-adaptors/DefaultWSO2EventInputAdaptor.xml
new file mode 100644
index 0000000..8cc5e89
--- /dev/null
+++ b/extensions/cep/artifacts/input-event-adaptors/DefaultWSO2EventInputAdaptor.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inputEventAdaptor name="DefaultWSO2EventInputAdaptor"
+ statistics="disable" trace="enable" type="wso2event" xmlns="http://wso2.org/carbon/eventadaptormanager"/>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/input-event-adaptors/InstanceStatsInputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/input-event-adaptors/InstanceStatsInputAdaptor.xml b/extensions/cep/artifacts/input-event-adaptors/InstanceStatsInputAdaptor.xml
new file mode 100644
index 0000000..a687546
--- /dev/null
+++ b/extensions/cep/artifacts/input-event-adaptors/InstanceStatsInputAdaptor.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inputEventAdaptor name="InstanceStatsInputAdaptor" statistics="disable"
+ trace="disable" type="jms" xmlns="http://wso2.org/carbon/eventadaptormanager">
+ <property name="java.naming.provider.url">/home/ubuntu/packages/cep/wso2cep-3.0.0/repository/conf/jndi.properties</property>
+ <property name="transport.jms.SubscriptionDurable">false</property>
+ <property name="java.naming.factory.initial">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</property>
+ <property name="transport.jms.ConnectionFactoryJNDIName">topicConnectionfactory</property>
+ <property name="transport.jms.DestinationType">topic</property>
+</inputEventAdaptor>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml b/extensions/cep/artifacts/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml
deleted file mode 100644
index 8cc5e89..0000000
--- a/extensions/cep/artifacts/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inputEventAdaptor name="DefaultWSO2EventInputAdaptor"
- statistics="disable" trace="enable" type="wso2event" xmlns="http://wso2.org/carbon/eventadaptormanager"/>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/inputeventadaptors/InstanceStatsInputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/inputeventadaptors/InstanceStatsInputAdaptor.xml b/extensions/cep/artifacts/inputeventadaptors/InstanceStatsInputAdaptor.xml
deleted file mode 100644
index a687546..0000000
--- a/extensions/cep/artifacts/inputeventadaptors/InstanceStatsInputAdaptor.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inputEventAdaptor name="InstanceStatsInputAdaptor" statistics="disable"
- trace="disable" type="jms" xmlns="http://wso2.org/carbon/eventadaptormanager">
- <property name="java.naming.provider.url">/home/ubuntu/packages/cep/wso2cep-3.0.0/repository/conf/jndi.properties</property>
- <property name="transport.jms.SubscriptionDurable">false</property>
- <property name="java.naming.factory.initial">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</property>
- <property name="transport.jms.ConnectionFactoryJNDIName">topicConnectionfactory</property>
- <property name="transport.jms.DestinationType">topic</property>
-</inputEventAdaptor>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/output-event-adaptors/DefaultWSO2EventOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/output-event-adaptors/DefaultWSO2EventOutputAdaptor.xml b/extensions/cep/artifacts/output-event-adaptors/DefaultWSO2EventOutputAdaptor.xml
new file mode 100644
index 0000000..59ba20d
--- /dev/null
+++ b/extensions/cep/artifacts/output-event-adaptors/DefaultWSO2EventOutputAdaptor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<outputEventAdaptor name="DefaultWSO2EventOutputAdaptor"
+ statistics="disable" trace="disable" type="wso2event" xmlns="http://wso2.org/carbon/eventadaptormanager">
+ <property name="username">admin</property>
+ <property name="receiverURL">tcp://localhost:7661</property>
+ <property name="password">admin</property>
+ <property name="authenticatorURL">ssl://localhost:7761</property>
+</outputEventAdaptor>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/output-event-adaptors/JMSOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/output-event-adaptors/JMSOutputAdaptor.xml b/extensions/cep/artifacts/output-event-adaptors/JMSOutputAdaptor.xml
new file mode 100644
index 0000000..bb4d6d7
--- /dev/null
+++ b/extensions/cep/artifacts/output-event-adaptors/JMSOutputAdaptor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<outputEventAdaptor name="JMSOutputAdaptor" statistics="disable"
+ trace="enable" type="jms" xmlns="http://wso2.org/carbon/eventadaptormanager">
+ <property name="java.naming.provider.url">/home/ubuntu/packages/cep/wso2cep-3.0.0/repository/conf/jndi.properties</property>
+ <property name="java.naming.factory.initial">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</property>
+ <property name="transport.jms.ConnectionFactoryJNDIName">topicConnectionfactory</property>
+ <property name="transport.jms.DestinationType">topic</property>
+</outputEventAdaptor>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml b/extensions/cep/artifacts/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml
deleted file mode 100644
index 59ba20d..0000000
--- a/extensions/cep/artifacts/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<outputEventAdaptor name="DefaultWSO2EventOutputAdaptor"
- statistics="disable" trace="disable" type="wso2event" xmlns="http://wso2.org/carbon/eventadaptormanager">
- <property name="username">admin</property>
- <property name="receiverURL">tcp://localhost:7661</property>
- <property name="password">admin</property>
- <property name="authenticatorURL">ssl://localhost:7761</property>
-</outputEventAdaptor>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml b/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
deleted file mode 100644
index bb4d6d7..0000000
--- a/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<outputEventAdaptor name="JMSOutputAdaptor" statistics="disable"
- trace="enable" type="jms" xmlns="http://wso2.org/carbon/eventadaptormanager">
- <property name="java.naming.provider.url">/home/ubuntu/packages/cep/wso2cep-3.0.0/repository/conf/jndi.properties</property>
- <property name="java.naming.factory.initial">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</property>
- <property name="transport.jms.ConnectionFactoryJNDIName">topicConnectionfactory</property>
- <property name="transport.jms.DestinationType">topic</property>
-</outputEventAdaptor>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/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
new file mode 100755
index 0000000..f45cdd8
--- /dev/null
+++ b/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
@@ -0,0 +1,164 @@
+<streamManagerConfiguration xmlns="http://wso2.org/carbon/streammanager">
+
+ <streamDefinition name="stratos.lb.in.flight.req.count" version="1.0.0">
+ <description>cluster partition in-flight request count</description>
+ <nickName>in-flight request count</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
+ <property name="cluster_id" type="String"/>
+ <property name="partition_id" type="String"/>
+ <property name="in_flight_request_count" type="int"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="gradient_stats" version="1.0.0">
+ <description>gradient stats</description>
+ <nickName>gradient stats</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
+ <property name="cluster_id" type="String"/>
+ <property name="count" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="aggregated_requests_stats" version="1.0.0">
+ <description>aggregated requests stats</description>
+ <nickName>aggregated requests stats</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
+ <property name="cluster_id" type="String"/>
+ <property name="count" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="second_derivative_of_requests_stats" version="1.0.0">
+ <description>second derivative of requests stats</description>
+ <nickName>second derivative of requests stats</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
+ <property name="cluster_id" type="String"/>
+ <property name="count" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <!-- This section is for health stat -->
+
+ <streamDefinition name="stratos.agent.health.stats" version="1.0.0">
+ <description>agent health stats</description>
+ <nickName>agent health stats</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
+ <property name="health_description" type="String"/>
+ <property name="value" type="double"/>
+ <property name="member_id" type="String" />
+ <property name="cluster_id" type="String" />
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="average_load_average" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="average_memory_consumption" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="gradient_load_average" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="gradient_memory_consumption" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="second_derivative_memory_consumption" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="second_derivative_load_average" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="fault_message" version="1.0.0">
+ <description>fault message</description>
+ <nickName>fault message</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
+ <property name="member_id" type="String"/>
+ <property name="cluster_id" type="String" />
+ </payloadData>
+ </streamDefinition>
+
+</streamManagerConfiguration>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4b8ef109/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
deleted file mode 100755
index f45cdd8..0000000
--- a/extensions/cep/artifacts/stream_definitions/stream-manager-config.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<streamManagerConfiguration xmlns="http://wso2.org/carbon/streammanager">
-
- <streamDefinition name="stratos.lb.in.flight.req.count" version="1.0.0">
- <description>cluster partition in-flight request count</description>
- <nickName>in-flight request count</nickName>
- <metaData>
- </metaData>
- <correlationData>
- </correlationData>
- <payloadData>
- <property name="cluster_id" type="String"/>
- <property name="partition_id" type="String"/>
- <property name="in_flight_request_count" type="int"/>
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="gradient_stats" version="1.0.0">
- <description>gradient stats</description>
- <nickName>gradient stats</nickName>
- <metaData>
- </metaData>
- <correlationData>
- </correlationData>
- <payloadData>
- <property name="cluster_id" type="String"/>
- <property name="count" type="double"/>
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="aggregated_requests_stats" version="1.0.0">
- <description>aggregated requests stats</description>
- <nickName>aggregated requests stats</nickName>
- <metaData>
- </metaData>
- <correlationData>
- </correlationData>
- <payloadData>
- <property name="cluster_id" type="String"/>
- <property name="count" type="double"/>
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="second_derivative_of_requests_stats" version="1.0.0">
- <description>second derivative of requests stats</description>
- <nickName>second derivative of requests stats</nickName>
- <metaData>
- </metaData>
- <correlationData>
- </correlationData>
- <payloadData>
- <property name="cluster_id" type="String"/>
- <property name="count" type="double"/>
- </payloadData>
- </streamDefinition>
-
- <!-- This section is for health stat -->
-
- <streamDefinition name="stratos.agent.health.stats" version="1.0.0">
- <description>agent health stats</description>
- <nickName>agent health stats</nickName>
- <metaData>
- </metaData>
- <correlationData>
- </correlationData>
- <payloadData>
- <property name="health_description" type="String"/>
- <property name="value" type="double"/>
- <property name="member_id" type="String" />
- <property name="cluster_id" type="String" />
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="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="average_load_average" type="double"/>
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="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="average_memory_consumption" type="double"/>
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="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="gradient_load_average" type="double"/>
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="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="gradient_memory_consumption" type="double"/>
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="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="second_derivative_memory_consumption" type="double"/>
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="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="second_derivative_load_average" type="double"/>
- </payloadData>
- </streamDefinition>
-
- <streamDefinition name="fault_message" version="1.0.0">
- <description>fault message</description>
- <nickName>fault message</nickName>
- <metaData>
- </metaData>
- <correlationData>
- </correlationData>
- <payloadData>
- <property name="member_id" type="String"/>
- <property name="cluster_id" type="String" />
- </payloadData>
- </streamDefinition>
-
-</streamManagerConfiguration>
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/02b6b7fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/02b6b7fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/02b6b7fb
Branch: refs/heads/master
Commit: 02b6b7fb4dad8b9e28b243aa1084a63655116df2
Parents: 4b8ef10 5f2b804
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 11 21:18:24 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 11 21:18:24 2013 +0530
----------------------------------------------------------------------
.../processor/ClusterStatusEventProcessor.java | 48 ++++++-
.../execution-plans/AverageHeathRequest.xml | 7 +-
.../AverageRequestsInflightFinder.xml | 6 +-
.../execution-plans/GradientOfHealthRequest.xml | 17 ++-
.../GradientOfRequestsInFlightFinder.xml | 8 +-
.../SecondDerivativeOfHealthRequest.xml | 12 +-
...SecondDerivativeOfRequestsInFlightFinder.xml | 8 +-
.../stream-manager-config.xml | 18 +++
.../distribution/src/main/assembly/bin.xml | 8 +-
.../distribution/src/main/conf/autoscaler.drl | 81 ------------
.../distribution/src/main/conf/mincheck.drl | 73 +++++++++++
.../distribution/src/main/conf/scaling.drl | 127 +++++++++++++++++++
.../src/main/bin/health-publisher.sh | 2 +-
.../agent/health/publisher/HealthPublisher.java | 22 ++--
14 files changed, 308 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02b6b7fb/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
----------------------------------------------------------------------
diff --cc extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
index ccca3fd,0000000..75c599d
mode 100644,000000..100644
--- a/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
+++ b/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
@@@ -1,24 -1,0 +1,23 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="AverageHeathRequest" statistics="disable"
+ trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will average health stats of an instance over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
+ <stream as="healthStats1" name="stratos.agent.health.stats" version="1.0.0"/>
+ </importedStreams>
- <queryExpressions><![CDATA[define partition healthStats1Partition by member_id;
- from healthStats1 [health_description == 'port_not_open'] select member_id, cluster_id insert into fault_message partition by healthStats1Partition;
- from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select member_id, avg(value) as average_load_average insert into average_load_average_stats partition by healthStats1Partition;
- from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select member_id, avg(value) as average_memory_consumption insert into average_memory_consumption_stats partition by healthStats1Partition;]]></queryExpressions>
++ <queryExpressions><![CDATA[from healthStats1 [health_description == 'port_not_open'] select cluster_id,partition_id,member_id group by cluster_id,partition_id insert into fault_message;
++ from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select cluster_id,partition_id,member_id, avg(value) as average_load_average group by cluster_id,partition_id insert into average_load_average_stats;
++ from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select cluster_id,partition_id,member_id, avg(value) as average_memory_consumption group by cluster_id,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="average_memory_consumption_stats" passthroughFlow="disable"
+ valueOf="average_memory_consumption_stats" version="1.0.0"/>
+ <stream name="fault_message" passthroughFlow="disable"
+ valueOf="fault_message" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02b6b7fb/extensions/cep/artifacts/execution-plans/AverageRequestsInflightFinder.xml
----------------------------------------------------------------------
diff --cc extensions/cep/artifacts/execution-plans/AverageRequestsInflightFinder.xml
index 6ec19fc,0000000..4f72ece
mode 100644,000000..100644
--- a/extensions/cep/artifacts/execution-plans/AverageRequestsInflightFinder.xml
+++ b/extensions/cep/artifacts/execution-plans/AverageRequestsInflightFinder.xml
@@@ -1,19 -1,0 +1,19 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="AverageRequestsInflightFinder" statistics="disable"
+ trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will average the number of requests in flight over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
- <stream as="lbStats1" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
++ <stream as="lbStats1" name="stratos.lb.stats" version="1.0.0"/>
+ </importedStreams>
- <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
++ <queryExpressions><![CDATA[
+from lbStats1#window.timeBatch(1 min)
- select cluster_id, avg(in_flight_request_count) as count insert into aggregated_requests_stats partition by lbStats1Partition;]]></queryExpressions>
++select cluster_id,partition_id, avg(in_flight_requests) as count group by cluster_id,partition_id insert into aggregated_requests_stats;]]></queryExpressions>
+ <exportedStreams>
+ <stream name="aggregated_requests_stats"
+ valueOf="aggregated_requests_stats" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02b6b7fb/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
----------------------------------------------------------------------
diff --cc extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
index 4a5d2cb,0000000..a286c12
mode 100644,000000..100644
--- a/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
+++ b/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
@@@ -1,24 -1,0 +1,23 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="GradientOfHealthRequest" statistics="disable"
- trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
++ trace="disable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will find the gradient of the heath request over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
+ <stream as="healthStats2" name="stratos.agent.health.stats" version="1.0.0"/>
+ </importedStreams>
- <queryExpressions><![CDATA[define partition healthStats2Partition by member_id;
- from healthStats2 #window.stratos:faultHandling(1min, member_id) select member_id, cluster_id insert into fault_message partition by healthStats2Partition;
- from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_load_average insert into gradient_load_average_stats partition by healthStats2Partition;
- from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_memory_consumption insert into gradient_memory_consumption_stats partition by healthStats2Partition;]]></queryExpressions>
++ <queryExpressions><![CDATA[
++ from healthStats2 #window.stratos:faultHandling(1min, member_id) select cluster_id,partition_id,member_id group by cluster_id,partition_id insert into fault_message;
++ from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select cluster_id,partition_id, member_id, value as gradient_load_average group by cluster_id,partition_id insert into gradient_load_average_stats;
++ from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select cluster_id,partition_id,member_id, value as gradient_memory_consumption group by cluster_id,partition_id insert into gradient_memory_consumption_stats;]]></queryExpressions>
+ <exportedStreams>
- <stream name="gradient_load_average_stats" passthroughFlow="disable"
++ <stream name="gradient_load_average_stats"
+ valueOf="gradient_load_average_stats" version="1.0.0"/>
- <stream name="gradient_memory_consumption_stats" passthroughFlow="disable"
++ <stream name="gradient_memory_consumption_stats"
+ valueOf="gradient_memory_consumption_stats" version="1.0.0"/>
- <stream name="fault_message" passthroughFlow="disable"
- valueOf="fault_message" version="1.0.0"/>
++ <stream name="fault_message" valueOf="fault_message" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02b6b7fb/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --cc extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
index a8be5fa,0000000..27286fe
mode 100644,000000..100644
--- a/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
+++ b/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
@@@ -1,18 -1,0 +1,18 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="GradientOfRequestsInFlightFinder"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will find the gradient of the number of requests in flight over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
- <stream as="lbStats2" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
++ <stream as="lbStats2" name="stratos.lb.stats" version="1.0.0"/>
+ </importedStreams>
- <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
- from lbStats2#window.stratos:gradient(1 min, in_flight_request_count)
- select cluster_id, in_flight_request_count as count insert into gradient_stats partition by lbStats1Partition;]]></queryExpressions>
++ <queryExpressions><![CDATA[
++from lbStats2#window.stratos:gradient(1 min, in_flight_requests)
++select cluster_id,partition_id,in_flight_requests as count group by cluster_id,partition_id insert into gradient_stats;]]></queryExpressions>
+ <exportedStreams>
+ <stream name="gradient_stats" valueOf="gradient_stats" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02b6b7fb/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
----------------------------------------------------------------------
diff --cc extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
index fd7c8d9,0000000..f059c8a
mode 100644,000000..100644
--- a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
+++ b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
@@@ -1,21 -1,0 +1,21 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="SecondDerivativeOfHealthRequest"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
++ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will find the second derivative of health stats over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
+ <stream as="healthStats3" name="stratos.agent.health.stats" version="1.0.0"/>
+ </importedStreams>
- <queryExpressions><![CDATA[define partition healthStats3Partition by member_id;
- from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select member_id, value as second_derivative_memory_consumption insert into second_derivative_memory_consumption_stats partition by healthStats3Partition;
- from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select member_id, value as second_derivative_load_average insert into second_derivative_load_average_stats partition by healthStats3Partition;]]></queryExpressions>
++ <queryExpressions><![CDATA[
++ from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select cluster_id,partition_id,member_id, value as second_derivative_memory_consumption group by cluster_id,partition_id insert into second_derivative_memory_consumption_stats;
++ from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select cluster_id,partition_id,member_id, value as second_derivative_load_average group by cluster_id,partition_id insert into second_derivative_load_average_stats;]]></queryExpressions>
+ <exportedStreams>
- <stream name="second_derivative_memory_consumption_stats" passthroughFlow="disable"
++ <stream name="second_derivative_memory_consumption_stats"
+ valueOf="second_derivative_memory_consumption_stats" version="1.0.0"/>
- <stream name="second_derivative_load_average_stats" passthroughFlow="disable"
++ <stream name="second_derivative_load_average_stats"
+ valueOf="second_derivative_load_average_stats" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02b6b7fb/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --cc extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
index 1afde17,0000000..80863b0
mode 100644,000000..100644
--- a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
+++ b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
@@@ -1,19 -1,0 +1,19 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="SecondDerivativeOfRequestsInFlightFinder"
+ statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ <description>This will find the second derivative of the number of requests in flight over a minute.</description>
+ <siddhiConfiguration>
+ <property name="siddhi.enable.distributed.processing">false</property>
+ <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+ </siddhiConfiguration>
+ <importedStreams>
- <stream as="lbStats3" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
++ <stream as="lbStats3" name="stratos.lb.stats" version="1.0.0"/>
+ </importedStreams>
- <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
- from lbStats3#window.stratos:secondDerivative(1 min, in_flight_request_count)
- select cluster_id, in_flight_request_count as count insert into second_derivative_of_requests_stats partition by lbStats1Partition;]]></queryExpressions>
++ <queryExpressions><![CDATA[
++from lbStats3#window.stratos:secondDerivative(1 min, in_flight_requests)
++select cluster_id,partition_id,in_flight_requests as count group by cluster_id,partition_id insert into second_derivative_of_requests_stats;]]></queryExpressions>
+ <exportedStreams>
+ <stream name="second_derivative_of_requests_stats"
+ valueOf="second_derivative_of_requests_stats" version="1.0.0"/>
+ </exportedStreams>
+</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02b6b7fb/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
----------------------------------------------------------------------
diff --cc extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
index f45cdd8,0000000..d5ce719
mode 100755,000000..100755
--- a/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
+++ b/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
@@@ -1,164 -1,0 +1,182 @@@
+<streamManagerConfiguration xmlns="http://wso2.org/carbon/streammanager">
+
+ <streamDefinition name="stratos.lb.in.flight.req.count" version="1.0.0">
+ <description>cluster partition in-flight request count</description>
+ <nickName>in-flight request count</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
+ <property name="cluster_id" type="String"/>
+ <property name="partition_id" type="String"/>
+ <property name="in_flight_request_count" type="int"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="gradient_stats" version="1.0.0">
+ <description>gradient stats</description>
+ <nickName>gradient stats</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
++ <property name="partition_id" type="String"/>
+ <property name="cluster_id" type="String"/>
+ <property name="count" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="aggregated_requests_stats" version="1.0.0">
+ <description>aggregated requests stats</description>
+ <nickName>aggregated requests stats</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
++ <property name="partition_id" type="String"/>
+ <property name="cluster_id" type="String"/>
+ <property name="count" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="second_derivative_of_requests_stats" version="1.0.0">
+ <description>second derivative of requests stats</description>
+ <nickName>second derivative of requests stats</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
++ <property name="partition_id" type="String"/>
+ <property name="cluster_id" type="String"/>
+ <property name="count" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <!-- This section is for health stat -->
+
+ <streamDefinition name="stratos.agent.health.stats" version="1.0.0">
+ <description>agent health stats</description>
+ <nickName>agent health stats</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
+ <property name="health_description" type="String"/>
+ <property name="value" type="double"/>
+ <property name="member_id" type="String" />
+ <property name="cluster_id" type="String" />
++ <property name="partition_id" type="String"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="cluster_id" type="String" />
++ <property name="partition_id" type="String"/>
+ <property name="member_id" type="String"/>
+ <property name="average_load_average" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="cluster_id" type="String"/>
++ <property name="partition_id" type="String"/>
+ <property name="member_id" type="String"/>
+ <property name="average_memory_consumption" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="cluster_id" type="String" />
++ <property name="partition_id" type="String"/>
+ <property name="member_id" type="String"/>
+ <property name="gradient_load_average" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="cluster_id" type="String" />
++ <property name="partition_id" type="String"/>
+ <property name="member_id" type="String"/>
+ <property name="gradient_memory_consumption" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="cluster_id" type="String" />
++ <property name="partition_id" type="String"/>
+ <property name="member_id" type="String"/>
+ <property name="second_derivative_memory_consumption" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="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="cluster_id" type="String" />
++ <property name="partition_id" type="String"/>
+ <property name="member_id" type="String"/>
+ <property name="second_derivative_load_average" type="double"/>
+ </payloadData>
+ </streamDefinition>
+
+ <streamDefinition name="fault_message" version="1.0.0">
+ <description>fault message</description>
+ <nickName>fault message</nickName>
+ <metaData>
+ </metaData>
+ <correlationData>
+ </correlationData>
+ <payloadData>
++ <property name="cluster_id" type="String"/>
++ <property name="partition_id" type="String"/>
+ <property name="member_id" type="String"/>
+ <property name="cluster_id" type="String" />
+ </payloadData>
+ </streamDefinition>
+
+</streamManagerConfiguration>