You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/10/09 21:26:49 UTC

[6/8] stratos git commit: Removing scaling decision events data from stratos-metering-service capp

Removing scaling decision events data from stratos-metering-service capp


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e4284e28
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e4284e28
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e4284e28

Branch: refs/heads/stratos-4.1.x
Commit: e4284e28b12ab54bdd33c5f9ded0467c6eeb2b04
Parents: 166f589
Author: Thanuja <th...@wso2.com>
Authored: Wed Oct 7 14:20:57 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sat Oct 10 00:51:09 2015 +0530

----------------------------------------------------------------------
 .../das/metering-service/capps/mysqlscript.sql  |   1 -
 .../ScalingDecisionEventReceiver.xml            |  29 ----
 .../EventReceiver_ScalingDecision/artifact.xml  |  24 ---
 .../EventStore_ScalingDecision/artifact.xml     |  24 ---
 .../scaling_decision.xml                        | 155 -------------------
 .../EventStream_ScalingDecision/artifact.xml    |  24 ---
 .../scaling_decision_1.0.0.json                 |  80 ----------
 .../SaprkScript_ScalingDecision/artifact.xml    |  24 ---
 .../scaling_details.xml                         |  39 -----
 .../stratos-metering-service/artifacts.xml      |   8 -
 10 files changed, 408 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/mysqlscript.sql
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/mysqlscript.sql b/extensions/das/metering-service/capps/mysqlscript.sql
index 7e783a9..71e7dc9 100644
--- a/extensions/das/metering-service/capps/mysqlscript.sql
+++ b/extensions/das/metering-service/capps/mysqlscript.sql
@@ -1,5 +1,4 @@
 CREATE DATABASE ANALYTICS_PROCESSED_DATA_STORE;
 CREATE TABLE ANALYTICS_PROCESSED_DATA_STORE.MEMBER_STATUS(Time long, ApplicationId VARCHAR(150), ClusterAlias VARCHAR(150), MemberId VARCHAR(150), MemberStatus VARCHAR(50));
 CREATE TABLE ANALYTICS_PROCESSED_DATA_STORE.MEMBER_COUNT(Time long, ApplicationId VARCHAR(150), ClusterAlias VARCHAR(150), CreatedInstanceCount int, InitializedInstanceCount int, ActiveInstanceCount int, TerminatedInstanceCount int);
-CREATE TABLE ANALYTICS_PROCESSED_DATA_STORE.SCALING_DETAILS(Time VARCHAR(50), ScalingDecisionId VARCHAR(150), ClusterId VARCHAR(150), MinInstanceCount INT, MaxInstanceCount INT, RIFPredicted INT, RIFThreshold INT ,RIFRequiredInstances INT, MCPredicted INT, MCThreshold INT, MCRequiredInstances INT ,LAPredicted INT, LAThreshold INT,LARequiredInstances INT,RequiredInstanceCount INT ,ActiveInstanceCount INT, AdditionalInstanceCount INT, ScalingReason VARCHAR(150));
 CREATE TABLE ANALYTICS_PROCESSED_DATA_STORE.MEMBER_INFORMATION(MemberId VARCHAR(150), InstanceType VARCHAR(150), ImageId VARCHAR(150), HostName VARCHAR(150), PrivateIPAddresses VARCHAR(150), PublicIPAddresses VARCHAR(150), Hypervisor VARCHAR(150), CPU VARCHAR(10) , RAM VARCHAR(10), OSName VARCHAR(150), OSVersion VARCHAR(150));

http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_ScalingDecision/ScalingDecisionEventReceiver.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_ScalingDecision/ScalingDecisionEventReceiver.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_ScalingDecision/ScalingDecisionEventReceiver.xml
deleted file mode 100644
index 0e0b8f8..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_ScalingDecision/ScalingDecisionEventReceiver.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<eventReceiver name="ScalingDecisionEventReceiver" statistics="disable"
-               trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
-    <from eventAdapterType="wso2event">
-        <property name="events.duplicated.in.cluster">false</property>
-    </from>
-    <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="scaling_decision" version="1.0.0"/>
-</eventReceiver>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_ScalingDecision/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_ScalingDecision/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_ScalingDecision/artifact.xml
deleted file mode 100644
index 09d92a2..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_ScalingDecision/artifact.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<artifact name="EventReceiver_ScalingDecision" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>ScalingDecisionEventReceiver.xml</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/stratos-metering-service/EventStore_ScalingDecision/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_ScalingDecision/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventStore_ScalingDecision/artifact.xml
deleted file mode 100644
index 554a0a6..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_ScalingDecision/artifact.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<artifact name="EventStore_ScalingDecision" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
-    <file>scaling_decision.xml</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/stratos-metering-service/EventStore_ScalingDecision/scaling_decision.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_ScalingDecision/scaling_decision.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventStore_ScalingDecision/scaling_decision.xml
deleted file mode 100644
index 49c07ac..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_ScalingDecision/scaling_decision.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<EventStoreConfiguration>
-    <TableSchema>
-        <ColumnDefinition>
-            <Name>timestamp</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>LONG</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>scaling_decision_id</Name>
-            <EnableIndexing>true</EnableIndexing>
-            <IsPrimaryKey>true</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>cluster_id</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>min_instance_count</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>max_instance_count</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>rif_predicted</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>rif_threshold</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>rif_required_instances</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>mc_predicted</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>mc_threshold</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>mc_required_instances</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>la_predicted</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>la_threshold</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>la_required_instances</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>required_instance_count</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>active_instance_count</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>additional_instance_count</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>scaling_reason</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-    </TableSchema>
-    <Source>
-        <StreamId>scaling_decision:1.0.0</StreamId>
-    </Source>
-    <RecordStoreName>EVENT_STORE</RecordStoreName>
-</EventStoreConfiguration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/stratos-metering-service/EventStream_ScalingDecision/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_ScalingDecision/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventStream_ScalingDecision/artifact.xml
deleted file mode 100644
index 6785af1..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_ScalingDecision/artifact.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<artifact name="EventStream_ScalingDecision" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-    <file>scaling_decision_1.0.0.json</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/stratos-metering-service/EventStream_ScalingDecision/scaling_decision_1.0.0.json
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_ScalingDecision/scaling_decision_1.0.0.json b/extensions/das/metering-service/capps/stratos-metering-service/EventStream_ScalingDecision/scaling_decision_1.0.0.json
deleted file mode 100644
index fbda1ef..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_ScalingDecision/scaling_decision_1.0.0.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "name": "scaling_decision",
-  "version": "1.0.0",
-  "nickName": "Member Information",
-  "description": "Member Information",
-  "payloadData": [
-    {
-      "name": "timestamp",
-      "type": "LONG"
-    },
-    {
-      "name": "scaling_decision_id",
-      "type": "STRING"
-    },
-    {
-      "name": "cluster_id",
-      "type": "STRING"
-    },
-    {
-      "name": "min_instance_count",
-      "type": "INT"
-    },
-    {
-      "name": "max_instance_count",
-      "type": "INT"
-    },
-    {
-      "name": "rif_predicted",
-      "type": "INT"
-    },
-    {
-      "name": "rif_threshold",
-      "type": "INT"
-    },
-    {
-      "name": "rif_required_instances",
-      "type": "INT"
-    },
-    {
-      "name": "mc_predicted",
-      "type": "INT"
-    },
-    {
-      "name": "mc_threshold",
-      "type": "INT"
-    },
-    {
-      "name": "mc_required_instances",
-      "type": "INT"
-    },
-    {
-      "name": "la_predicted",
-      "type": "INT"
-    },
-    {
-      "name": "la_threshold",
-      "type": "INT"
-    },
-    {
-      "name": "la_required_instances",
-      "type": "INT"
-    },
-    {
-      "name": "required_instance_count",
-      "type": "INT"
-    },
-    {
-      "name": "active_instance_count",
-      "type": "INT"
-    },
-    {
-      "name": "additional_instance_count",
-      "type": "INT"
-    },
-    {
-      "name": "scaling_reason",
-      "type": "STRING"
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/stratos-metering-service/SaprkScript_ScalingDecision/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/SaprkScript_ScalingDecision/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/SaprkScript_ScalingDecision/artifact.xml
deleted file mode 100644
index 85a5157..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/SaprkScript_ScalingDecision/artifact.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<artifact name="SparkScript_ScalingDecision" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
-    <file>scaling_details.xml</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/stratos-metering-service/SaprkScript_ScalingDecision/scaling_details.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/SaprkScript_ScalingDecision/scaling_details.xml b/extensions/das/metering-service/capps/stratos-metering-service/SaprkScript_ScalingDecision/scaling_details.xml
deleted file mode 100644
index 13ef83e..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/SaprkScript_ScalingDecision/scaling_details.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<Analytics>
-    <Name>scaling_details</Name>
-    <Script>
-        CREATE TEMPORARY TABLE scaling_decision
-        USING CarbonAnalytics
-        OPTIONS (tableName "SCALING_DECISION");
-
-        create temporary table scaling_details
-        using CarbonJDBC options (dataSource "WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB", tableName "SCALING_DETAILS");
-
-        INSERT OVERWRITE TABLE scaling_details select time(timestamp),scaling_decision_id, cluster_id,
-        min_instance_count, max_instance_count, rif_predicted, rif_threshold,rif_required_instances, mc_predicted,
-        mc_threshold, mc_required_instances,la_predicted, la_threshold ,la_required_instances,required_instance_count
-        ,active_instance_count, additional_instance_count, scaling_reason from scaling_decision;
-
-    </Script>
-    <CronExpression>29 * * * * ?</CronExpression>
-</Analytics>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/e4284e28/extensions/das/metering-service/capps/stratos-metering-service/artifacts.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/artifacts.xml b/extensions/das/metering-service/capps/stratos-metering-service/artifacts.xml
index 94f46c8..6a097e8 100644
--- a/extensions/das/metering-service/capps/stratos-metering-service/artifacts.xml
+++ b/extensions/das/metering-service/capps/stratos-metering-service/artifacts.xml
@@ -24,24 +24,16 @@
         <dependency artifact="EventStream_MemberInfo" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
         <dependency artifact="EventStream_MemberLifecycle" version="1.0.0" include="true"
                     serverRole="DataAnalyticsServer"/>
-        <dependency artifact="EventStream_ScalingDecision" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
         <dependency artifact="EventStore_MemberInfo" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
         <dependency artifact="EventStore_MemberLifecycle" version="1.0.0" include="true"
                     serverRole="DataAnalyticsServer"/>
-        <dependency artifact="EventStore_ScalingDecision" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
         <dependency artifact="EventReceiver_MemberInfo" version="1.0.0" include="true"
                     serverRole="DataAnalyticsServer"/>
         <dependency artifact="EventReceiver_MemberLifecycle" version="1.0.0" include="true"
                     serverRole="DataAnalyticsServer"/>
-        <dependency artifact="EventReceiver_ScalingDecision" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
         <dependency artifact="SparkScript_MemberInfo" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
         <dependency artifact="SparkScript_MemberLifecycle" version="1.0.0" include="true"
                     serverRole="DataAnalyticsServer"/>
-        <dependency artifact="SparkScript_ScalingDecision" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
         <dependency artifact="Gadget_Member_Count" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
         <dependency artifact="Gadget_Member_Information" version="1.0.0" include="true"
                     serverRole="DataAnalyticsServer"/>