Updating metering-dashboard README, mysql script and CAppa pom files
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8dd03d52 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8dd03d52 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8dd03d52 Branch: refs/heads/stratos-4.1.x Commit: 8dd03d520fa2620c43c4fed0e440b4b66e113b5a Parents: 5c1f7ba Author: Thanuja <[email protected]> Authored: Wed Oct 21 13:10:29 2015 +0530 Committer: Thanuja <[email protected]> Committed: Wed Oct 21 13:10:29 2015 +0530 ---------------------------------------------------------------------- .../artifacts/metering-dashboard/README.md | 19 ++++++++-------- .../artifacts/metering-dashboard/capps/pom.xml | 8 +++---- .../metering-dashboard/metering-mysqlscript.sql | 24 ++++++++++++++++++++ .../metering-dashboard/mysqlscript.sql | 22 ------------------ 4 files changed, 38 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/8dd03d52/extensions/das/modules/artifacts/metering-dashboard/README.md ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/README.md b/extensions/das/modules/artifacts/metering-dashboard/README.md index 2207b8f..21ea33f 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/README.md +++ b/extensions/das/modules/artifacts/metering-dashboard/README.md @@ -1,12 +1,13 @@ # Apache Stratos Metering Dashboard -This directory contains following artifacts: -(1) capps - Includes stratos-metering-service car file which bundles all Event Stream, Event receiver, Even Store, Gadgets and Dashboard artifacts. -(2) jaggery-files -(3) ues-patch +This directory contains following artifacts: <br/> +(1) capps - Includes stratos-metering-service car file which bundles all Event Stream, Event receiver, Even Store, Gadgets, SparkScripts and Dashboard artifacts. <br/> +(2) jaggery-files <br/> +(3) ues-patch <br/> -Follow the below steps to generate the metering dashboard: -1. Add the jaggery files which can be found inside directory 'jaggery-files' to DAS server path '/jaggeryapps/portal/controllers/apis' -2. Create MySQL database and tables using queries in 'mysqlscript.sql' manually. -3. Apply ues-patch to DAS server as mentioned in its README file. -3. Add stratos-metering-service car file to DAS server to generate the metering dashboard. \ No newline at end of file +Follow the below steps to generate the metering dashboard: <br/> +1. Follow instruction given in <Stratos-SOURCE-HOME>/extensions/das/stratos-das-extension/README.md file to add stratos-das-extension jar to DAS. <br/> +2. Add jaggery files which can be found in <Stratos-DAS-Distribution>/metering-dashboard/jaggery-files/ to DAS server path <DAS_HOME/repository/deployment/server/jaggeryapps/portal/controllers/apis/ <br/> +3. Create MySQL database and tables using queries in <Stratos-DAS-Distribution>/metering-dashboard/metering-mysqlscript.sql manually. <br/> +4. Apply ues-patch files in <Stratos-DAS-Distribution>/metering-dashboard/ues-patch/ to DAS as mentioned in its README file. <br/> +5. Add stratos-metering-service car file in <Stratos-DAS-Distribution>/metering-dashboard/ to <DAS-HOME>/repository/deployment/server/carbonapps/ to generate the metering dashboard. <br/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/8dd03d52/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml b/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml index a6c062e..5e327e6 100644 --- a/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml +++ b/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml @@ -23,16 +23,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>stratos-das-extension</artifactId> <groupId>org.apache.stratos</groupId> + <artifactId>stratos-das-extension</artifactId> <version>4.1.5-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>metering-service-capps</artifactId> - <name>Apache Stratos - Metering Service Composite Applications</name> - <description>Apache Stratos Metering Service Composite Applications</description> + <artifactId>org.apache.stratos.metering.service.capps</artifactId> + <name>Apache Stratos - Metering Service CApps</name> + <description>Apache Stratos Metering Service CApps</description> <packaging>pom</packaging> <build> http://git-wip-us.apache.org/repos/asf/stratos/blob/8dd03d52/extensions/das/modules/artifacts/metering-dashboard/metering-mysqlscript.sql ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/metering-mysqlscript.sql b/extensions/das/modules/artifacts/metering-dashboard/metering-mysqlscript.sql new file mode 100644 index 0000000..c84d38f --- /dev/null +++ b/extensions/das/modules/artifacts/metering-dashboard/metering-mysqlscript.sql @@ -0,0 +1,24 @@ +/* +* 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. +*/ +CREATE DATABASE IF NOT EXISTS ANALYTICS_FS_DB; +CREATE DATABASE IF NOT EXISTS ANALYTICS_EVENT_STORE; +CREATE DATABASE IF NOT EXISTS 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.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/8dd03d52/extensions/das/modules/artifacts/metering-dashboard/mysqlscript.sql ---------------------------------------------------------------------- diff --git a/extensions/das/modules/artifacts/metering-dashboard/mysqlscript.sql b/extensions/das/modules/artifacts/metering-dashboard/mysqlscript.sql deleted file mode 100644 index f916f95..0000000 --- a/extensions/das/modules/artifacts/metering-dashboard/mysqlscript.sql +++ /dev/null @@ -1,22 +0,0 @@ -/* -* 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. -*/ -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.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));
