Repository: stratos Updated Branches: refs/heads/tenant-isolation 02eafdf53 -> c2abc57af
adding missing changes for monitoring service Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c2abc57a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c2abc57a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c2abc57a Branch: refs/heads/tenant-isolation Commit: c2abc57af45b67acb5581d6e69653e04a04318e3 Parents: 02eafdf Author: Thanuja <[email protected]> Authored: Fri Aug 21 16:07:19 2015 +0530 Committer: Thanuja <[email protected]> Committed: Fri Aug 21 16:07:19 2015 +0530 ---------------------------------------------------------------------- .../publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java | 2 +- .../publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java | 2 +- .../outputeventadaptors/DASDefaultWSO2EventOutputAdaptor.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c2abc57a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java index 33cf0b5..9d095ba 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPHealthStatisticsPublisher.java @@ -54,7 +54,7 @@ public class WSO2CEPHealthStatisticsPublisher extends ThriftStatisticsPublisher // Set payload definition List<Attribute> payloadData = new ArrayList<Attribute>(); - payloadData.add(new Attribute("time_stamp", AttributeType.LONG)); + payloadData.add(new Attribute("timestamp", AttributeType.LONG)); payloadData.add(new Attribute("cluster_id", AttributeType.STRING)); payloadData.add(new Attribute("cluster_instance_id", AttributeType.STRING)); payloadData.add(new Attribute("network_partition_id", AttributeType.STRING)); http://git-wip-us.apache.org/repos/asf/stratos/blob/c2abc57a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java index f853f23..bfd645c 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java @@ -56,7 +56,7 @@ public class WSO2CEPInFlightRequestPublisher extends ThriftStatisticsPublisher i List<Attribute> payloadData = new ArrayList<Attribute>(); // Set payload definition - payloadData.add(new Attribute("time_stamp", AttributeType.LONG)); + payloadData.add(new Attribute("timestamp", AttributeType.LONG)); payloadData.add(new Attribute("cluster_id", AttributeType.STRING)); payloadData.add(new Attribute("cluster_instance_id", AttributeType.STRING)); payloadData.add(new Attribute("network_partition_id", AttributeType.STRING)); http://git-wip-us.apache.org/repos/asf/stratos/blob/c2abc57a/extensions/cep/artifacts/outputeventadaptors/DASDefaultWSO2EventOutputAdaptor.xml ---------------------------------------------------------------------- diff --git a/extensions/cep/artifacts/outputeventadaptors/DASDefaultWSO2EventOutputAdaptor.xml b/extensions/cep/artifacts/outputeventadaptors/DASDefaultWSO2EventOutputAdaptor.xml index 5cec300..6dad7a0 100755 --- a/extensions/cep/artifacts/outputeventadaptors/DASDefaultWSO2EventOutputAdaptor.xml +++ b/extensions/cep/artifacts/outputeventadaptors/DASDefaultWSO2EventOutputAdaptor.xml @@ -23,7 +23,7 @@ statistics="disable" trace="disable" type="wso2event" xmlns="http://wso2.org/carbon/eventadaptormanager";> <property name="username">admin</property> - <property name="receiverURL">tcp://localhost:7612</property> + <property name="receiverURL">tcp://localhost:7611</property> <property name="password">admin</property> - <property name="authenticatorURL">ssl://localhost:7712</property> + <property name="authenticatorURL">ssl://localhost:7711</property> </outputEventAdaptor>
