Revert "AMBARI-16250: Create STORM service versions in common-services 
(jluniya)"

This reverts commit f1c7514d60cb5ea46647bc759343b20e1a1920e4.


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

Branch: refs/heads/trunk
Commit: d216c12832bf65e226cb482cec327dc91f1650d9
Parents: fdd16f3
Author: Jayush Luniya <[email protected]>
Authored: Thu May 5 23:03:29 2016 -0700
Committer: Jayush Luniya <[email protected]>
Committed: Thu May 5 23:03:29 2016 -0700

----------------------------------------------------------------------
 .../ambari/server/stack/ServiceModule.java      |   24 +-
 .../apache/ambari/server/stack/StackModule.java |    4 +-
 .../0.10.0/configuration/ranger-storm-audit.xml |  178 ---
 .../ranger-storm-plugin-properties.xml          |  148 ---
 .../ranger-storm-policymgr-ssl.xml              |   67 --
 .../configuration/ranger-storm-security.xml     |   59 -
 .../configuration/storm-cluster-log4j.xml       |  113 --
 .../STORM/0.10.0/configuration/storm-env.xml    |   55 -
 .../STORM/0.10.0/configuration/storm-site.xml   |   60 -
 .../0.10.0/configuration/storm-worker-log4j.xml |  114 --
 .../common-services/STORM/0.10.0/metainfo.xml   |   57 -
 .../common-services/STORM/0.10.0/metrics.json   | 1088 ------------------
 .../common-services/STORM/0.10.0/widgets.json   |  127 --
 .../common-services/STORM/0.9.1.2.1/alerts.json |  194 ++++
 .../STORM/0.9.1.2.1/configuration/storm-env.xml |  139 +++
 .../0.9.1.2.1/configuration/storm-site.xml      |  740 ++++++++++++
 .../STORM/0.9.1.2.1/kerberos.json               |  120 ++
 .../STORM/0.9.1.2.1/metainfo.xml                |  181 +++
 .../STORM/0.9.1.2.1/metrics.json                |  829 +++++++++++++
 .../alerts/check_supervisor_process_win.py      |   50 +
 .../STORM/0.9.1.2.1/package/files/wordCount.jar |  Bin 0 -> 690588 bytes
 .../0.9.1.2.1/package/scripts/drpc_server.py    |  139 +++
 .../STORM/0.9.1.2.1/package/scripts/nimbus.py   |  157 +++
 .../0.9.1.2.1/package/scripts/nimbus_prod.py    |   81 ++
 .../0.9.1.2.1/package/scripts/pacemaker.py      |  138 +++
 .../STORM/0.9.1.2.1/package/scripts/params.py   |   29 +
 .../0.9.1.2.1/package/scripts/params_linux.py   |  351 ++++++
 .../0.9.1.2.1/package/scripts/params_windows.py |   60 +
 .../STORM/0.9.1.2.1/package/scripts/rest_api.py |   81 ++
 .../STORM/0.9.1.2.1/package/scripts/service.py  |   97 ++
 .../0.9.1.2.1/package/scripts/service_check.py  |   79 ++
 .../package/scripts/setup_atlas_storm.py        |   45 +
 .../package/scripts/setup_ranger_storm.py       |  101 ++
 .../0.9.1.2.1/package/scripts/status_params.py  |   83 ++
 .../STORM/0.9.1.2.1/package/scripts/storm.py    |  162 +++
 .../0.9.1.2.1/package/scripts/storm_upgrade.py  |  177 +++
 .../package/scripts/storm_yaml_utils.py         |   53 +
 .../0.9.1.2.1/package/scripts/supervisor.py     |  113 ++
 .../package/scripts/supervisor_prod.py          |   84 ++
 .../package/scripts/supervisord_service.py      |   33 +
 .../0.9.1.2.1/package/scripts/ui_server.py      |  180 +++
 .../package/templates/client_jaas.conf.j2       |   24 +
 .../0.9.1.2.1/package/templates/config.yaml.j2  |   68 ++
 .../templates/storm-metrics2.properties.j2      |   26 +
 .../0.9.1.2.1/package/templates/storm.conf.j2   |   35 +
 .../package/templates/storm_jaas.conf.j2        |   57 +
 .../package/templates/worker-launcher.cfg.j2    |   19 +
 .../STORM/0.9.1.2.1/quicklinks/quicklinks.json  |   28 +
 .../common-services/STORM/0.9.1/alerts.json     |  194 ----
 .../STORM/0.9.1/configuration/storm-env.xml     |  139 ---
 .../STORM/0.9.1/configuration/storm-site.xml    |  740 ------------
 .../common-services/STORM/0.9.1/kerberos.json   |  120 --
 .../common-services/STORM/0.9.1/metainfo.xml    |  181 ---
 .../common-services/STORM/0.9.1/metrics.json    |  829 -------------
 .../alerts/check_supervisor_process_win.py      |   50 -
 .../STORM/0.9.1/package/files/wordCount.jar     |  Bin 690588 -> 0 bytes
 .../STORM/0.9.1/package/scripts/drpc_server.py  |  139 ---
 .../STORM/0.9.1/package/scripts/nimbus.py       |  157 ---
 .../STORM/0.9.1/package/scripts/nimbus_prod.py  |   81 --
 .../STORM/0.9.1/package/scripts/pacemaker.py    |  138 ---
 .../STORM/0.9.1/package/scripts/params.py       |   29 -
 .../STORM/0.9.1/package/scripts/params_linux.py |  351 ------
 .../0.9.1/package/scripts/params_windows.py     |   60 -
 .../STORM/0.9.1/package/scripts/rest_api.py     |   81 --
 .../STORM/0.9.1/package/scripts/service.py      |   97 --
 .../0.9.1/package/scripts/service_check.py      |   79 --
 .../0.9.1/package/scripts/setup_atlas_storm.py  |   45 -
 .../0.9.1/package/scripts/setup_ranger_storm.py |  101 --
 .../0.9.1/package/scripts/status_params.py      |   83 --
 .../STORM/0.9.1/package/scripts/storm.py        |  162 ---
 .../0.9.1/package/scripts/storm_upgrade.py      |  177 ---
 .../0.9.1/package/scripts/storm_yaml_utils.py   |   53 -
 .../STORM/0.9.1/package/scripts/supervisor.py   |  113 --
 .../0.9.1/package/scripts/supervisor_prod.py    |   84 --
 .../package/scripts/supervisord_service.py      |   33 -
 .../STORM/0.9.1/package/scripts/ui_server.py    |  180 ---
 .../0.9.1/package/templates/client_jaas.conf.j2 |   24 -
 .../0.9.1/package/templates/config.yaml.j2      |   68 --
 .../templates/storm-metrics2.properties.j2      |   26 -
 .../STORM/0.9.1/package/templates/storm.conf.j2 |   35 -
 .../0.9.1/package/templates/storm_jaas.conf.j2  |   57 -
 .../package/templates/worker-launcher.cfg.j2    |   19 -
 .../STORM/0.9.1/quicklinks/quicklinks.json      |   28 -
 .../ranger-storm-plugin-properties.xml          |  263 -----
 .../STORM/0.9.3/configuration/storm-env.xml     |   43 -
 .../STORM/0.9.3/configuration/storm-site.xml    |  123 --
 .../common-services/STORM/0.9.3/metainfo.xml    |   53 -
 .../common-services/STORM/0.9.3/metrics.json    | 1087 -----------------
 .../1.0.1/configuration/ranger-storm-audit.xml  |   58 -
 .../STORM/1.0.1/configuration/storm-site.xml    |   67 --
 .../common-services/STORM/1.0.1/kerberos.json   |  120 --
 .../common-services/STORM/1.0.1/metainfo.xml    |   28 -
 .../stacks/HDP/2.1/services/STORM/metainfo.xml  |    3 +-
 .../ranger-storm-plugin-properties.xml          |  263 +++++
 .../services/STORM/configuration/storm-env.xml  |   43 +
 .../services/STORM/configuration/storm-site.xml |   62 +
 .../stacks/HDP/2.2/services/STORM/metainfo.xml  |   25 +-
 .../stacks/HDP/2.2/services/STORM/metrics.json  | 1087 +++++++++++++++++
 .../STORM/configuration/ranger-storm-audit.xml  |  178 +++
 .../ranger-storm-plugin-properties.xml          |  148 +++
 .../ranger-storm-policymgr-ssl.xml              |   32 +
 .../configuration/ranger-storm-security.xml     |   30 +
 .../STORM/configuration/storm-cluster-log4j.xml |  113 ++
 .../services/STORM/configuration/storm-env.xml  |   55 +
 .../services/STORM/configuration/storm-site.xml |   56 +-
 .../STORM/configuration/storm-worker-log4j.xml  |  114 ++
 .../stacks/HDP/2.3/services/STORM/metainfo.xml  |   32 +-
 .../stacks/HDP/2.3/services/STORM/metrics.json  | 1088 ++++++++++++++++++
 .../stacks/HDP/2.3/services/STORM/widgets.json  |  127 ++
 .../STORM/configuration/ranger-storm-audit.xml  |   58 +
 .../ranger-storm-policymgr-ssl.xml              |   35 -
 .../configuration/ranger-storm-security.xml     |   29 -
 .../services/STORM/configuration/storm-site.xml |   69 +-
 .../stacks/HDP/2.5/services/STORM/kerberos.json |  120 ++
 .../stacks/HDP/2.5/services/STORM/metainfo.xml  |    1 -
 .../HDPWIN/2.1/services/STORM/alerts.json       |    2 +-
 .../HDPWIN/2.1/services/STORM/metainfo.xml      |    2 +-
 .../python/stacks/2.1/STORM/test_storm_base.py  |    2 +-
 .../python/stacks/2.3/STORM/test_storm_base.py  |    2 +-
 .../stacks/2.3/STORM/test_storm_upgrade.py      |    2 +-
 .../stacks/2.3/configs/storm_default.json       |    2 +-
 .../2.3/configs/storm_default_secure.json       |    2 +-
 122 files changed, 8405 insertions(+), 8819 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
index 989c9ba..b7e09a9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
@@ -34,7 +34,6 @@ import 
org.apache.ambari.server.state.QuickLinksConfigurationInfo;
 import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.ServicePropertyInfo;
 import org.apache.ambari.server.state.ThemeInfo;
-import org.apache.commons.lang.StringUtils;
 
 import javax.annotation.Nullable;
 
@@ -150,28 +149,9 @@ public class ServiceModule extends 
BaseModule<ServiceModule, ServiceInfo> implem
   public void resolve(
       ServiceModule parentModule, Map<String, StackModule> allStacks, 
Map<String, ServiceModule> commonServices)
       throws AmbariException {
-    resolveInternal(parentModule, allStacks, commonServices, false);
-  }
-
-  public void resolveExplicit(
-      ServiceModule parentModule, Map<String, StackModule> allStacks, 
Map<String, ServiceModule> commonServices)
-      throws AmbariException {
-    resolveInternal(parentModule, allStacks, commonServices, true);
-  }
 
-  public void resolveInternal(
-      ServiceModule parentModule, Map<String, StackModule> allStacks, 
Map<String, ServiceModule> commonServices,
-      boolean resolveExplicit)
-      throws AmbariException {
-    if (!serviceInfo.isValid() || !parentModule.isValid()) {
+    if (!serviceInfo.isValid() || !parentModule.isValid())
       return;
-    }
-
-    // If resolving against parent stack service module (stack inheritance), 
do not merge if an
-    // explicit parent is specified
-    if(!StringUtils.isBlank(serviceInfo.getParent()) && !resolveExplicit) {
-      return;
-    }
 
     ServiceInfo parent = parentModule.getModuleInfo();
     
@@ -306,7 +286,7 @@ public class ServiceModule extends 
BaseModule<ServiceModule, ServiceInfo> implem
           //todo: provide more information to user about cycle
           throw new AmbariException("Cycle detected while parsing common 
service");
         }
-        resolveExplicit(baseService, allStacks, commonServices);
+        resolve(baseService, allStacks, commonServices);
       } else {
         throw new AmbariException("Common service cannot inherit from a non 
common service");
       }

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
index 7674a2b..5c8556f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java
@@ -337,7 +337,7 @@ public class StackModule extends BaseModule<StackModule, 
StackInfo> implements V
       stackInfo.setErrors(error);
     } else {
       if (baseService.isValid()) {
-        service.resolveExplicit(baseService, allStacks, commonServices);
+        service.resolve(baseService, allStacks, commonServices);
       } else {
         setValid(false);
         stackInfo.setValid(false);
@@ -386,7 +386,7 @@ public class StackModule extends BaseModule<StackModule, 
StackInfo> implements V
       throw new AmbariException("The service '" + serviceInfo.getName() + "' 
in stack '" + stackInfo.getName() + ":"
           + stackInfo.getVersion() + "' extends a non-existent service: '" + 
parent + "'");
       }
-    service.resolveExplicit(baseService, allStacks, commonServices);
+    service.resolve(baseService, allStacks, commonServices);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-audit.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-audit.xml
 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-audit.xml
deleted file mode 100644
index 60ab1378c..0000000
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-audit.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.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.
- */
--->
-<configuration>
-
-  <property>
-    <name>xasecure.audit.is.enabled</name>
-    <value>true</value>
-    <description>Is Audit enabled?</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db</name>
-    <value>false</value>
-    <display-name>Audit to DB</display-name>
-    <description>Is Audit to DB enabled?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.db</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.jdbc.url</name>
-    <value>{{audit_jdbc_url}}</value>
-    <description>Audit DB JDBC URL</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.user</name>
-    <value>{{xa_audit_db_user}}</value>
-    <description>Audit DB JDBC User</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.password</name>
-    <value>crypted</value>
-    <property-type>PASSWORD</property-type>
-    <description>Audit DB JDBC Password</description>
-    <value-attributes>
-      <type>password</type>
-    </value-attributes>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.jdbc.driver</name>
-    <value>{{jdbc_driver}}</value>
-    <description>Audit DB JDBC Driver</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.credential.provider.file</name>
-    <value>jceks://file{{credential_file}}</value>
-    <description>Credential file store</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.batch.filespool.dir</name>
-    <value>/var/log/storm/audit/db/spool</value>
-    <description>/var/log/storm/audit/db/spool</description>
-  </property>  
-
-  <property>
-    <name>xasecure.audit.destination.hdfs</name>
-    <value>true</value>
-    <display-name>Audit to HDFS</display-name>
-    <description>Is Audit to HDFS enabled?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.hdfs</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.hdfs.dir</name>
-    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
-    <description>HDFS folder to write audit to, make sure the service user has 
requried permissions</description>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.hdfs.dir</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
-    <value>/var/log/storm/audit/hdfs/spool</value>
-    <description>/var/log/storm/audit/hdfs/spool</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr</name>
-    <value>false</value>
-    <display-name>Audit to SOLR</display-name>
-    <description>Is Solr audit enabled?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.solr</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr.urls</name>
-    <value></value>
-    <description>Solr URL</description>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-admin-site</type>
-        <name>ranger.audit.solr.urls</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr.zookeepers</name>
-    <value>NONE</value>
-    <description>Solr Zookeeper string</description>
-    <depends-on>
-      <property>
-        <type>ranger-admin-site</type>
-        <name>ranger.audit.solr.zookeepers</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
-    <value>/var/log/storm/audit/solr/spool</value>
-    <description>/var/log/storm/audit/solr/spool</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.provider.summary.enabled</name>
-    <value>false</value>
-    <display-name>Audit provider summary enabled</display-name>
-    <description>Enable Summary audit?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-  </property>  
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml
 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml
deleted file mode 100644
index f2bf888..0000000
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml
+++ /dev/null
@@ -1,148 +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.
- */
--->
-<configuration supports_final="true">
-
-  <property>
-    <name>XAAUDIT.DB.IS_ENABLED</name>
-    <deleted>true</deleted>
-  </property> 
-
-  <property>
-    <name>XAAUDIT.HDFS.IS_ENABLED</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_FILE</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_KEYSTORE_FILE_PATH</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_KEYSTORE_PASSWORD</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_TRUSTSTORE_FILE_PATH</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_TRUSTSTORE_PASSWORD</name>
-    <deleted>true</deleted>
-  </property>
-  
-  <property>
-    <name>POLICY_MGR_URL</name>
-    <deleted>true</deleted>  
-  </property> 
-  
-  <property>
-    <name>SQL_CONNECTOR_JAR</name>
-    <deleted>true</deleted>    
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.FLAVOUR</name>
-    <deleted>true</deleted>    
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.DATABASE_NAME</name>
-    <deleted>true</deleted>    
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.USER_NAME</name>
-    <deleted>true</deleted>    
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.PASSWORD</name>
-    <deleted>true</deleted>    
-  </property>
-  
-  <property>
-    <name>XAAUDIT.DB.HOSTNAME</name>
-    <deleted>true</deleted>    
-  </property>
-  
-  <property>
-    <name>REPOSITORY_NAME</name>
-    <deleted>true</deleted>   
-  </property>
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-policymgr-ssl.xml
 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-policymgr-ssl.xml
deleted file mode 100644
index af43d75..0000000
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-policymgr-ssl.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.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.
- */
--->
-<configuration>
-  
-  <property>
-    <name>xasecure.policymgr.clientssl.keystore</name>
-    <value>hadoopdev-clientcert.jks</value>
-    <description>Java Keystore files</description>
-  </property>
-
-  <property>
-    <name>xasecure.policymgr.clientssl.keystore.password</name>
-    <value>myKeyFilePassword</value>
-    <property-type>PASSWORD</property-type>
-    <description>password for keystore</description>
-    <value-attributes>
-      <type>password</type>
-    </value-attributes>
-  </property>
-
-  <property>
-    <name>xasecure.policymgr.clientssl.truststore</name>
-    <value>cacerts-xasecure.jks</value>
-    <description>java truststore file</description>
-  </property>
-
-  <property>
-    <name>xasecure.policymgr.clientssl.truststore.password</name>
-    <value>changeit</value>
-    <property-type>PASSWORD</property-type>
-    <description>java truststore password</description>
-    <value-attributes>
-      <type>password</type>
-    </value-attributes>
-  </property>
-
-    <property>
-    <name>xasecure.policymgr.clientssl.keystore.credential.file</name>
-    <value>jceks://file{{credential_file}}</value>
-    <description>java keystore credential file</description>
-  </property>
-
-  <property>
-    <name>xasecure.policymgr.clientssl.truststore.credential.file</name>
-    <value>jceks://file{{credential_file}}</value>
-    <description>java truststore credential file</description>
-  </property>
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-security.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-security.xml
 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-security.xml
deleted file mode 100644
index 538f147..0000000
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-security.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.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.
- */
--->
-<configuration>
-  
-  <property>
-    <name>ranger.plugin.storm.service.name</name>
-    <value>{{repo_name}}</value>
-    <description>Name of the Ranger service containing policies for this Storm 
instance</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.storm.policy.source.impl</name>
-    <value>org.apache.ranger.admin.client.RangerAdminRESTClient</value>
-    <description>Class to retrieve policies from the source</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.storm.policy.rest.url</name>
-    <value>{{policymgr_mgr_url}}</value>
-    <description>URL to Ranger Admin</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.storm.policy.rest.ssl.config.file</name>
-    <value>/etc/storm/conf/ranger-policymgr-ssl.xml</value>
-    <description>Path to the file containing SSL details to contact Ranger 
Admin</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.storm.policy.pollIntervalMs</name>
-    <value>30000</value>
-    <description>How often to poll for changes in policies?</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.storm.policy.cache.dir</name>
-    <value>/etc/ranger/{{repo_name}}/policycache</value>
-    <description>Directory where Ranger policies are cached after successful 
retrieval from the source</description>
-  </property>
-  
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-cluster-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-cluster-log4j.xml
 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-cluster-log4j.xml
deleted file mode 100644
index 1114ae9..0000000
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-cluster-log4j.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * 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.
- */
--->
-
-<configuration supports_final="false" supports_adding_forbidden="true">
-
-  <property>
-    <name>content</name>
-    <description>Custom cluster.xml</description>
-    <value>
-    <![CDATA[
-<!--
- 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.
--->
-
-<configuration monitorInterval="60">
-<properties>
-    <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] 
%msg%n</property>
-    <property name="patternMetris">%d %-8r %m%n</property>
-</properties>
-<appenders>
-    <RollingFile name="A1"
-                 fileName="${sys:storm.log.dir}/${sys:logfile.name}"
-                 filePattern="${sys:storm.log.dir}/${sys:logfile.name}.%i">
-        <PatternLayout>
-            <pattern>${pattern}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <RollingFile name="ACCESS"
-                 fileName="${sys:storm.log.dir}/access.log"
-                 filePattern="${sys:storm.log.dir}/access.log.%i">
-        <PatternLayout>
-            <pattern>${pattern}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <RollingFile name="METRICS"
-                 fileName="${sys:storm.log.dir}/metrics.log"
-                 filePattern="${sys:storm.log.dir}/metrics.log.%i">
-        <PatternLayout>
-            <pattern>${patternMetris}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="2 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <Syslog name="syslog" format="RFC5424" host="localhost" port="514"
-            protocol="UDP" appName="[${sys:daemon.name}]" mdcId="mdc" 
includeMDC="true"
-            facility="LOCAL5" enterpriseNumber="18060" newLine="true" 
exceptionPattern="%rEx{full}"
-            messageId="[${sys:user.name}:S0]" id="storm"/>
-</appenders>
-<loggers>
-
-    <Logger name="backtype.storm.security.auth.authorizer" level="info">
-        <AppenderRef ref="ACCESS"/>
-    </Logger>
-    <Logger name="backtype.storm.metric.LoggingMetricsConsumer" level="info">
-        <AppenderRef ref="METRICS"/>
-    </Logger>
-    <root level="info"> <!-- We log everything -->
-        <appender-ref ref="A1"/>
-        <appender-ref ref="syslog"/>
-    </root>
-</loggers>
-</configuration>
-    ]]>
-    </value>
-    <value-attributes>
-      <type>content</type>
-      <show-property-name>false</show-property-name>
-    </value-attributes>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml
 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml
deleted file mode 100644
index 8d2da69..0000000
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-env.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * 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.
- */
--->
-
-<configuration supports_adding_forbidden="true">
-  <property>
-    <name>nimbus_seeds_supported</name>
-    <value>true</value>
-    <description></description>
-  </property>
-  <property>
-    <name>storm_logs_supported</name>
-    <value>true</value>
-    <description></description>
-  </property>
-  <!-- storm-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for storm-env.sh file</description>
-    <value>
-      #!/bin/bash
-
-      # Set Storm specific environment variables here.
-
-      # The java implementation to use.
-      export JAVA_HOME={{java64_home}}
-
-      export STORM_CONF_DIR={{conf_dir}}
-      export STORM_HOME={{storm_component_home_dir}}
-
-      export STORM_JAR_JVM_OPTS={{jar_jvm_opts}}
-    </value>
-    <value-attributes>
-      <type>content</type>
-    </value-attributes>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml
 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml
deleted file mode 100644
index 6a5e6db..0000000
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!--
- censed 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.
- */
--->
-
-<configuration supports_final="true" 
xmlns:xi="http://www.w3.org/2001/XInclude";>
-  <property>
-    <name>nimbus.seeds</name>
-    <value>localhost</value>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <description>Comma-delimited list of the hosts running nimbus 
server.</description>
-    <value-attributes>
-      <type>componentHosts</type>
-      <editable-only-at-install>true</editable-only-at-install>
-      <overridable>false</overridable>
-    </value-attributes>
-  </property>
-  <property>
-    <name>topology.min.replication.count.default</name>
-    <value>1</value>
-    <description>Default minimum number of nimbus hosts where the code must be 
replicated before leader nimbus can mark the topology as active and create 
assignments. </description>
-  </property>
-  <property>
-    <name>topology.min.replication.count</name>
-    <value>{{actual_topology_min_replication_count}}</value>
-    <description>Calculated minimum number of nimbus hosts where the code must 
be replicated before leader nimbus can mark the topology as active and create 
assignments. </description>
-  </property>  
-  <property>
-      <name>topology.max.replication.wait.time.sec.default</name>
-      <value>60</value>
-      <description>Default maximum wait time for the nimbus host replication 
to achieve the nimbus.min.replication.count. Once this time is elapsed nimbus 
will go ahead and perform topology activation tasks even if required 
nimbus.min.replication.count is not achieved</description>
-  </property>
-  <property>
-      <name>topology.max.replication.wait.time.sec</name>
-      <value>{{actual_topology_max_replication_wait_time_sec}}</value>
-      <description>Calculated maximum wait time for the nimbus host 
replication to achieve the nimbus.min.replication.count. Once this time is 
elapsed nimbus will go ahead and perform topology activation tasks even if 
required nimbus.min.replication.count is not achieved</description>
-  </property>  
-   <property>
-    <name>nimbus.host</name>
-    <value>localhost</value>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <description>Deprecated config in favor of nimbus.seeds used during non HA 
mode.</description>
-    <deleted>true</deleted>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-worker-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-worker-log4j.xml
 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-worker-log4j.xml
deleted file mode 100644
index eae2d3a..0000000
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-worker-log4j.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * 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.
- */
--->
-
-<configuration supports_final="false" supports_adding_forbidden="true">
-
-  <property>
-    <name>content</name>
-    <description>Custom worker.xml</description>
-    <value>
-    <![CDATA[
-<!--
- 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.
--->
-
-<configuration monitorInterval="60">
-<properties>
-    <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] 
%msg%n</property>
-    <property name="patternNoTime">%msg%n</property>
-</properties>
-<appenders>
-    <RollingFile name="A1"
-                 fileName="${sys:storm.log.dir}/${sys:logfile.name}"
-                 filePattern="${sys:storm.log.dir}/${sys:logfile.name}.%i.gz">
-        <PatternLayout>
-            <pattern>${pattern}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="9"/>
-    </RollingFile>
-    <RollingFile name="STDOUT"
-                 fileName="${sys:storm.log.dir}/${sys:logfile.name}.out"
-                 
filePattern="${sys:storm.log.dir}/${sys:logfile.name}.out.%i.gz">
-        <PatternLayout>
-            <pattern>${patternNoTime}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="4"/>
-    </RollingFile>
-    <RollingFile name="STDERR"
-                 fileName="${sys:storm.log.dir}/${sys:logfile.name}.err"
-                 
filePattern="${sys:storm.log.dir}/${sys:logfile.name}.err.%i.gz">
-        <PatternLayout>
-            <pattern>${patternNoTime}</pattern>
-        </PatternLayout>
-        <Policies>
-            <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-        </Policies>
-        <DefaultRolloverStrategy max="4"/>
-    </RollingFile>
-    <Syslog name="syslog" format="RFC5424" host="localhost" port="514"
-        protocol="UDP" appName="[${sys:storm.id}:${sys:worker.port}]" 
mdcId="mdc" includeMDC="true"
-        facility="LOCAL5" enterpriseNumber="18060" newLine="true" 
exceptionPattern="%rEx{full}"
-        messageId="[${sys:user.name}:${sys:logging.sensitivity}]" id="storm"/>
-</appenders>
-<loggers>
-    <root level="info"> <!-- We log everything -->
-        <appender-ref ref="A1"/>
-        <appender-ref ref="syslog"/>
-    </root>
-    <Logger name="STDERR" level="INFO">
-        <appender-ref ref="STDERR"/>
-        <appender-ref ref="syslog"/>
-    </Logger>
-    <Logger name="STDOUT" level="INFO">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="syslog"/>
-    </Logger>
-</loggers>
-</configuration>
-    ]]>
-    </value>
-    <value-attributes>
-      <type>content</type>
-      <show-property-name>false</show-property-name>
-    </value-attributes>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/metainfo.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/metainfo.xml 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/metainfo.xml
deleted file mode 100644
index 7fc63b3..0000000
--- a/ambari-server/src/main/resources/common-services/STORM/0.10.0/metainfo.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.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.
--->
-
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>STORM</name>
-      <version>0.10.0</version>
-      <extends>common-services/STORM/0.9.3</extends>
-      <components>
-        <component>
-          <name>NIMBUS</name>
-          <displayName>Nimbus</displayName>
-          <category>MASTER</category>
-          <cardinality>1+</cardinality>
-          <versionAdvertised>true</versionAdvertised>
-          <dependencies>
-            <dependency>
-              <name>ZOOKEEPER/ZOOKEEPER_SERVER</name>
-              <scope>cluster</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-          </dependencies>
-          <commandScript>
-            <script>scripts/nimbus.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>1200</timeout>
-          </commandScript>
-          <logs>
-            <log>
-              <logId>storm_nimbus</logId>
-              <primary>true</primary>
-            </log>
-          </logs>
-        </component>
-      </components>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d216c128/ambari-server/src/main/resources/common-services/STORM/0.10.0/metrics.json
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/metrics.json 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/metrics.json
deleted file mode 100644
index 3d0fdd3..0000000
--- a/ambari-server/src/main/resources/common-services/STORM/0.10.0/metrics.json
+++ /dev/null
@@ -1,1088 +0,0 @@
-{
-  "STORM_UI_SERVER": {
-    "Component": [
-      {
-        "type": 
"org.apache.ambari.server.controller.metrics.RestMetricsPropertyProvider",
-        "properties": {
-          "default_port": "8744",
-          "port_config_type": "storm-site",
-          "port_property_name": "storm.port",
-          "protocol": "http"
-        },
-        "metrics": {
-          "default": {
-            "metrics/api/v1/cluster/summary/tasksTotal": {
-              "metric": "/api/v1/cluster/summary##tasksTotal",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/topology/summary": {
-              "metric": 
"/api/v1/topology/summary?field=topologies##topologies",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/slotsTotal": {
-              "metric": "/api/v1/cluster/summary##slotsTotal",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/slotsFree": {
-              "metric": "/api/v1/cluster/summary##slotsFree",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/supervisors": {
-              "metric": "/api/v1/cluster/summary##supervisors",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/executorsTotal": {
-              "metric": "/api/v1/cluster/summary##executorsTotal",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/slotsUsed": {
-              "metric": "/api/v1/cluster/summary##slotsUsed",
-              "pointInTime": true,
-              "temporal": false
-            },
-              "metrics/api/v1/nimbus/summary": {
-              "metric": "/api/v1/nimbus/summary?field=nimbuses##nimbuses",
-              "pointInTime": true,
-              "temporal": false
-          }
-
-          }
-        }
-      }
-    ],
-    "HostComponent": [
-      {
-        "type": 
"org.apache.ambari.server.controller.metrics.RestMetricsPropertyProvider",
-        "properties": {
-          "default_port": "8744",
-          "port_config_type": "storm-site",
-          "port_property_name": "storm.port",
-          "protocol": "http"
-        },
-        "metrics": {
-          "default": {
-            "metrics/api/v1/cluster/summary/tasksTotal": {
-              "metric": "/api/v1/cluster/summary##tasksTotal",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/topology/summary": {
-              "metric": 
"/api/v1/topology/summary?field=topologies##topologies",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/slotsTotal": {
-              "metric": "/api/v1/cluster/summary##slotsTotal",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/slotsFree": {
-              "metric": "/api/v1/cluster/summary##slotsFree",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/supervisors": {
-              "metric": "/api/v1/cluster/summary##supervisors",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/executorsTotal": {
-              "metric": "/api/v1/cluster/summary##executorsTotal",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/slotsUsed": {
-              "metric": "/api/v1/cluster/summary##slotsUsed",
-              "pointInTime": true,
-              "temporal": false
-            },
-            "metrics/api/v1/cluster/summary/nimbusUptime": {
-              "metric": "/api/v1/cluster/summary##nimbusUptime",
-              "pointInTime": true,
-              "temporal": false
-            }
-          }
-        }
-      }
-    ]
-  },
-  "NIMBUS": {
-    "Component": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/boottime": {
-              "metric": "boottime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_aidle": {
-              "metric": "cpu_aidle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_nice": {
-              "metric": "cpu_nice",
-              "pointInTime": true,
-              "temporal": true
-            },
-
-            "metrics/cpu/cpu_num": {
-              "metric": "cpu_num",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_speed": {
-              "metric": "cpu_speed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_system": {
-              "metric": "cpu_system",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_user": {
-              "metric": "cpu_user",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_wio": {
-              "metric": "cpu_wio",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_free": {
-              "metric": "disk_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_total": {
-              "metric": "disk_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_one": {
-              "metric": "load_one",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_cached": {
-              "metric": "mem_cached",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_free": {
-              "metric": "mem_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_shared": {
-              "metric": "mem_shared",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_total": {
-              "metric": "mem_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/part_max_used": {
-              "metric": "part_max_used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_free": {
-              "metric": "swap_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/heap/committed": {
-              "metric": "Nimbus.JVM.Memory.Heap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/heap/init": {
-              "metric": "Nimbus.JVM.Memory.Heap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/heap/max": {
-              "metric": "Nimbus.JVM.Memory.Heap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/heap/used": {
-              "metric": "Nimbus.JVM.Memory.Heap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/nonheap/committed": {
-              "metric": "Nimbus.JVM.Memory.NonHeap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/nonheap/init": {
-              "metric": "Nimbus.JVM.Memory.NonHeap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/nonheap/max": {
-              "metric": "Nimbus.JVM.Memory.NonHeap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/nonheap/used": {
-              "metric": "Nimbus.JVM.Memory.NonHeap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/os/processcputime": {
-              "metric": "Nimbus.JVM.OS.ProcessCpuTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/threading/daemonthreadcount": {
-              "metric": "Nimbus.JVM.Threading.DaemonThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/threading/threadcount": {
-              "metric": "Nimbus.JVM.Threading.ThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-
-            "metrics/storm/nimbus/freeslots": {
-              "metric": "Free Slots",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/supervisors": {
-              "metric": "Supervisors",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/topologies": {
-              "metric": "Topologies",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/totalexecutors": {
-              "metric": "Total Executors",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/totalslots": {
-              "metric": "Total Slots",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/totaltasks": {
-              "metric": "Total Tasks",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/usedslots": {
-              "metric": "Used Slots",
-              "pointInTime": true,
-              "temporal": true
-            }
-          }
-        }
-      }
-    ],
-    "HostComponent": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/boottime": {
-              "metric": "boottime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_aidle": {
-              "metric": "cpu_aidle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_nice": {
-              "metric": "cpu_nice",
-              "pointInTime": true,
-              "temporal": true
-            },
-
-            "metrics/cpu/cpu_num": {
-              "metric": "cpu_num",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_speed": {
-              "metric": "cpu_speed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_system": {
-              "metric": "cpu_system",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_user": {
-              "metric": "cpu_user",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_wio": {
-              "metric": "cpu_wio",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_free": {
-              "metric": "disk_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_total": {
-              "metric": "disk_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_one": {
-              "metric": "load_one",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_cached": {
-              "metric": "mem_cached",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_free": {
-              "metric": "mem_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_shared": {
-              "metric": "mem_shared",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_total": {
-              "metric": "mem_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/part_max_used": {
-              "metric": "part_max_used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_free": {
-              "metric": "swap_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/heap/committed": {
-              "metric": "Nimbus.JVM.Memory.Heap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/heap/init": {
-              "metric": "Nimbus.JVM.Memory.Heap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/heap/max": {
-              "metric": "Nimbus.JVM.Memory.Heap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/heap/used": {
-              "metric": "Nimbus.JVM.Memory.Heap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/nonheap/committed": {
-              "metric": "Nimbus.JVM.Memory.NonHeap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/nonheap/init": {
-              "metric": "Nimbus.JVM.Memory.NonHeap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/nonheap/max": {
-              "metric": "Nimbus.JVM.Memory.NonHeap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/memory/nonheap/used": {
-              "metric": "Nimbus.JVM.Memory.NonHeap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/os/processcputime": {
-              "metric": "Nimbus.JVM.OS.ProcessCpuTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/threading/daemonthreadcount": {
-              "metric": "Nimbus.JVM.Threading.DaemonThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/nimbus/jvm/threading/threadcount": {
-              "metric": "Nimbus.JVM.Threading.ThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            }
-
-          }
-        }
-      }
-    ]
-  },
-  "SUPERVISOR": {
-    "Component": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/boottime": {
-              "metric": "boottime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_aidle": {
-              "metric": "cpu_aidle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_nice": {
-              "metric": "cpu_nice",
-              "pointInTime": true,
-              "temporal": true
-            },
-
-            "metrics/cpu/cpu_num": {
-              "metric": "cpu_num",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_speed": {
-              "metric": "cpu_speed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_system": {
-              "metric": "cpu_system",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_user": {
-              "metric": "cpu_user",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_wio": {
-              "metric": "cpu_wio",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_free": {
-              "metric": "disk_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_total": {
-              "metric": "disk_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_one": {
-              "metric": "load_one",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_cached": {
-              "metric": "mem_cached",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_free": {
-              "metric": "mem_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_shared": {
-              "metric": "mem_shared",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_total": {
-              "metric": "mem_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/part_max_used": {
-              "metric": "part_max_used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_free": {
-              "metric": "swap_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/heap/committed": {
-              "metric": "Supervisor.JVM.Memory.Heap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/heap/init": {
-              "metric": "Supervisor.JVM.Memory.Heap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/heap/max": {
-              "metric": "Supervisor.JVM.Memory.Heap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/heap/used": {
-              "metric": "Supervisor.JVM.Memory.Heap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/nonheap/committed": {
-              "metric": "Supervisor.JVM.Memory.NonHeap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/nonheap/init": {
-              "metric": "Supervisor.JVM.Memory.NonHeap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/nonheap/max": {
-              "metric": "Supervisor.JVM.Memory.NonHeap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/nonheap/used": {
-              "metric": "Supervisor.JVM.Memory.NonHeap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/os/processcputime": {
-              "metric": "Supervisor.JVM.OS.ProcessCpuTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/threading/daemonthreadcount": {
-              "metric": "Supervisor.JVM.Threading.DaemonThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/threading/threadcount": {
-              "metric": "Supervisor.JVM.Threading.ThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/heap/committed": {
-              "metric": "Worker.(.+).JVM.Memory.Heap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/heap/init": {
-              "metric": "Worker.(.+).JVM.Memory.Heap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/heap/max": {
-              "metric": "Worker.(.+).JVM.Memory.Heap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/heap/used": {
-              "metric": "Worker.(.+).JVM.Memory.Heap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/nonheap/committed": {
-              "metric": "Worker.(.+).JVM.Memory.NonHeap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/nonheap/init": {
-              "metric": "Worker.(.+).JVM.Memory.NonHeap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/nonheap/max": {
-              "metric": "Worker.(.+).JVM.Memory.NonHeap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/nonheap/used": {
-              "metric": "Worker.(.+).JVM.Memory.NonHeap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/os/processcputime": {
-              "metric": "Worker.(.+).JVM.OS.ProcessCpuTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/threading/daemonthreadcount": {
-              "metric": "Worker.(.+).JVM.Threading.DaemonThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/threading/threadcount": {
-              "metric": "Worker.(.+).JVM.Threading.ThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            }
-
-
-          }
-        }
-      }
-    ],
-    "HostComponent": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/boottime": {
-              "metric": "boottime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_aidle": {
-              "metric": "cpu_aidle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_nice": {
-              "metric": "cpu_nice",
-              "pointInTime": true,
-              "temporal": true
-            },
-
-            "metrics/cpu/cpu_num": {
-              "metric": "cpu_num",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_speed": {
-              "metric": "cpu_speed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_system": {
-              "metric": "cpu_system",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_user": {
-              "metric": "cpu_user",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/cpu/cpu_wio": {
-              "metric": "cpu_wio",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_free": {
-              "metric": "disk_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/disk_total": {
-              "metric": "disk_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load_one": {
-              "metric": "load_one",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_cached": {
-              "metric": "mem_cached",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_free": {
-              "metric": "mem_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_shared": {
-              "metric": "mem_shared",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/mem_total": {
-              "metric": "mem_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/disk/part_max_used": {
-              "metric": "part_max_used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_free": {
-              "metric": "swap_free",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/heap/committed": {
-              "metric": "Supervisor.JVM.Memory.Heap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/heap/init": {
-              "metric": "Supervisor.JVM.Memory.Heap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/heap/max": {
-              "metric": "Supervisor.JVM.Memory.Heap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/heap/used": {
-              "metric": "Supervisor.JVM.Memory.Heap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/nonheap/committed": {
-              "metric": "Supervisor.JVM.Memory.NonHeap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/nonheap/init": {
-              "metric": "Supervisor.JVM.Memory.NonHeap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/nonheap/max": {
-              "metric": "Supervisor.JVM.Memory.NonHeap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/memory/nonheap/used": {
-              "metric": "Supervisor.JVM.Memory.NonHeap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/os/processcputime": {
-              "metric": "Supervisor.JVM.OS.ProcessCpuTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/threading/daemonthreadcount": {
-              "metric": "Supervisor.JVM.Threading.DaemonThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/supervisor/jvm/threading/threadcount": {
-              "metric": "Supervisor.JVM.Threading.ThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/heap/committed": {
-              "metric": "Worker.(.+).JVM.Memory.Heap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/heap/init": {
-              "metric": "Worker.(.+).JVM.Memory.Heap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/heap/max": {
-              "metric": "Worker.(.+).JVM.Memory.Heap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/heap/used": {
-              "metric": "Worker.(.+).JVM.Memory.Heap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/nonheap/committed": {
-              "metric": "Worker.(.+).JVM.Memory.NonHeap.committed",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/nonheap/init": {
-              "metric": "Worker.(.+).JVM.Memory.NonHeap.init",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/nonheap/max": {
-              "metric": "Worker.(.+).JVM.Memory.NonHeap.max",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/memory/nonheap/used": {
-              "metric": "Worker.(.+).JVM.Memory.NonHeap.used",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/os/processcputime": {
-              "metric": "Worker.(.+).JVM.OS.ProcessCpuTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/threading/daemonthreadcount": {
-              "metric": "Worker.(.+).JVM.Threading.DaemonThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/storm/worker/$1/jvm/threading/threadcount": {
-              "metric": "Worker.(.+).JVM.Threading.ThreadCount",
-              "pointInTime": true,
-              "temporal": true
-            }
-          }
-        }
-      }
-    ]
-  }
-}

Reply via email to