ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject [03/13] ambari git commit: Revert "AMBARI-16248: Create KAFKA service versions in common-services (jluniya)"
Date Fri, 06 May 2016 06:04:43 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/setup_ranger_kafka.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/setup_ranger_kafka.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/setup_ranger_kafka.py
new file mode 100644
index 0000000..3a3ecfe
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/setup_ranger_kafka.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+"""
+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.
+"""
+from resource_management.core.logger import Logger
+from resource_management.core.resources import File, Execute
+from resource_management.libraries.functions.format import format
+
+def setup_ranger_kafka():
+  import params
+
+  if params.has_ranger_admin:
+
+    from resource_management.libraries.functions.setup_ranger_plugin_xml import setup_ranger_plugin
+
+    if params.retryAble:
+      Logger.info("Kafka: Setup ranger: command retry enables thus retrying if ranger admin is down !")
+    else:
+      Logger.info("Kafka: Setup ranger: command retry not enabled thus skipping if ranger admin is down !")
+
+    if params.xml_configurations_supported and params.enable_ranger_kafka and params.xa_audit_hdfs_is_enabled:
+      if params.has_namenode:
+        params.HdfsResource("/ranger/audit",
+                           type="directory",
+                           action="create_on_execute",
+                           owner=params.hdfs_user,
+                           group=params.hdfs_user,
+                           mode=0755,
+                           recursive_chmod=True
+        )
+        params.HdfsResource("/ranger/audit/kafka",
+                           type="directory",
+                           action="create_on_execute",
+                           owner=params.kafka_user,
+                           group=params.kafka_user,
+                           mode=0700,
+                           recursive_chmod=True
+        )
+        params.HdfsResource(None, action="execute")
+
+    setup_ranger_plugin('kafka-broker', 'kafka',
+                        params.downloaded_custom_connector, params.driver_curl_source,
+                        params.driver_curl_target, params.java64_home,
+                        params.repo_name, params.kafka_ranger_plugin_repo,
+                        params.ranger_env, params.ranger_plugin_properties,
+                        params.policy_user, params.policymgr_mgr_url,
+                        params.enable_ranger_kafka, conf_dict=params.conf_dir,
+                        component_user=params.kafka_user, component_group=params.user_group, cache_service_list=['kafka'],
+                        plugin_audit_properties=params.ranger_kafka_audit, plugin_audit_attributes=params.ranger_kafka_audit_attrs,
+                        plugin_security_properties=params.ranger_kafka_security, plugin_security_attributes=params.ranger_kafka_security_attrs,
+                        plugin_policymgr_ssl_properties=params.ranger_kafka_policymgr_ssl, plugin_policymgr_ssl_attributes=params.ranger_kafka_policymgr_ssl_attrs,
+                        component_list=['kafka-broker'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
+                        credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password, 
+                        ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password,
+                        api_version = 'v2', skip_if_rangeradmin_down= not params.retryAble,
+                        is_security_enabled = params.security_enabled,
+                        is_stack_supports_ranger_kerberos = params.stack_supports_ranger_kerberos,
+                        component_user_principal=params.kafka_jaas_principal if params.security_enabled else None,
+                        component_user_keytab=params.kafka_keytab_path if params.security_enabled else None)
+    
+    if params.enable_ranger_kafka: 
+      Execute(('cp', '--remove-destination', params.setup_ranger_env_sh_source, params.setup_ranger_env_sh_target),
+        not_if=format("test -f {setup_ranger_env_sh_target}"),
+        sudo=True
+      )
+      File(params.setup_ranger_env_sh_target,
+        owner = params.kafka_user,
+        group = params.user_group,
+        mode = 0755
+      )
+  else:
+    Logger.info('Ranger admin not installed')

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/status_params.py
new file mode 100644
index 0000000..57bdf5e
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/status_params.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+"""
+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.
+
+"""
+from resource_management.libraries.functions import format
+from resource_management.libraries.script.script import Script
+
+config = Script.get_config()
+
+kafka_pid_dir = config['configurations']['kafka-env']['kafka_pid_dir']
+kafka_pid_file = format("{kafka_pid_dir}/kafka.pid")

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/upgrade.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/upgrade.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/upgrade.py
new file mode 100644
index 0000000..b6e4046
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/upgrade.py
@@ -0,0 +1,78 @@
+
+#!/usr/bin/env python
+"""
+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.
+
+"""
+import os
+
+
+from resource_management.core.resources.system import Execute
+from resource_management.libraries.functions import format
+from resource_management.libraries.functions import Direction
+from resource_management.core.exceptions import Fail
+from resource_management.core.logger import Logger
+
+def run_migration(env, upgrade_type):
+  """
+  If the acl migration script is present, then run it for either upgrade or downgrade.
+  That script was introduced in HDP 2.3.4.0 and requires stopping all Kafka brokers first.
+  Requires configs to be present.
+  :param env: Environment.
+  :param upgrade_type: "rolling" or "nonrolling
+  """
+  import params
+
+  if upgrade_type is None:
+    raise Fail('Parameter "upgrade_type" is missing.')
+
+  if params.upgrade_direction is None:
+    raise Fail('Parameter "upgrade_direction" is missing.')
+
+  if params.upgrade_direction == Direction.DOWNGRADE and params.downgrade_from_version is None:
+    raise Fail('Parameter "downgrade_from_version" is missing.')
+
+  if not params.security_enabled:
+    Logger.info("Skip running the Kafka ACL migration script since cluster security is not enabled.")
+    return
+  
+  Logger.info("Upgrade type: {0}, direction: {1}".format(str(upgrade_type), params.upgrade_direction))
+
+  # If the schema upgrade script exists in the version upgrading to, then attempt to upgrade/downgrade it while still using the present bits.
+  kafka_acls_script = None
+  command_suffix = ""
+  if params.upgrade_direction == Direction.UPGRADE:
+    kafka_acls_script = format("{stack_root}/{version}/kafka/bin/kafka-acls.sh")
+    command_suffix = "--upgradeAcls"
+  elif params.upgrade_direction == Direction.DOWNGRADE:
+    kafka_acls_script = format("{stack_root}/{downgrade_from_version}/kafka/bin/kafka-acls.sh")
+    command_suffix = "--downgradeAcls"
+
+  if kafka_acls_script is not None:
+    if os.path.exists(kafka_acls_script):
+      Logger.info("Found Kafka acls script: {0}".format(kafka_acls_script))
+      if params.zookeeper_connect is None:
+        raise Fail("Could not retrieve property kafka-broker/zookeeper.connect")
+
+      acls_command = "{0} --authorizer kafka.security.auth.SimpleAclAuthorizer --authorizer-properties zookeeper.connect={1} {2}".\
+        format(kafka_acls_script, params.zookeeper_connect, command_suffix)
+
+      Execute(acls_command,
+              user=params.kafka_user,
+              logoutput=True)
+    else:
+      Logger.info("Did not find Kafka acls script: {0}".format(kafka_acls_script))

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/utils.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/utils.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/utils.py
new file mode 100644
index 0000000..2f1fa5e
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/utils.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+"""
+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.
+
+"""
+import re
+
+def get_bare_principal(normalized_principal_name):
+    """
+    Given a normalized principal name (nimbus/c6501.ambari.apache.org@EXAMPLE.COM) returns just the
+    primary component (nimbus)
+    :param normalized_principal_name: a string containing the principal name to process
+    :return: a string containing the primary component value or None if not valid
+    """
+
+    bare_principal = None
+
+    if normalized_principal_name:
+        match = re.match(r"([^/@]+)(?:/[^@])?(?:@.*)?", normalized_principal_name)
+
+    if match:
+        bare_principal = match.group(1)
+
+    return bare_principal

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka.conf.j2 b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka.conf.j2
new file mode 100644
index 0000000..9e18e1d
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka.conf.j2
@@ -0,0 +1,35 @@
+{#
+# 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.
+#}
+
+# 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.
+
+{{kafka_user}}   - nofile   {{kafka_user_nofile_limit}}
+{{kafka_user}}   - nproc    {{kafka_user_nproc_limit}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_client_jaas.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_client_jaas.conf.j2 b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_client_jaas.conf.j2
new file mode 100644
index 0000000..7f81d85
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_client_jaas.conf.j2
@@ -0,0 +1,29 @@
+{#
+# 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.
+#}
+KafkaClient {
+   com.sun.security.auth.module.Krb5LoginModule required
+   useTicketCache=true
+   renewTicket=true
+   serviceName="{{kafka_bare_jaas_principal}}";
+};
+Client {
+   com.sun.security.auth.module.Krb5LoginModule required
+   useTicketCache=true
+   renewTicket=true
+   serviceName="zookeeper";
+};

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_jaas.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_jaas.conf.j2 b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_jaas.conf.j2
new file mode 100644
index 0000000..56c558d
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_jaas.conf.j2
@@ -0,0 +1,41 @@
+{#
+# 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.
+#}
+KafkaServer {
+   com.sun.security.auth.module.Krb5LoginModule required
+   useKeyTab=true
+   keyTab="{{kafka_keytab_path}}"
+   storeKey=true
+   useTicketCache=false
+   serviceName="{{kafka_bare_jaas_principal}}"
+   principal="{{kafka_jaas_principal}}";
+};
+KafkaClient {
+   com.sun.security.auth.module.Krb5LoginModule required
+   useTicketCache=true
+   renewTicket=true
+   serviceName="{{kafka_bare_jaas_principal}}";
+};
+Client {
+   com.sun.security.auth.module.Krb5LoginModule required
+   useKeyTab=true
+   keyTab="{{kafka_keytab_path}}"
+   storeKey=true
+   useTicketCache=false
+   serviceName="zookeeper"
+   principal="{{kafka_jaas_principal}}";
+};

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/tools-log4j.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/tools-log4j.properties.j2 b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/tools-log4j.properties.j2
new file mode 100644
index 0000000..c4ad326
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/tools-log4j.properties.j2
@@ -0,0 +1,21 @@
+# 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.
+
+log4j.rootLogger=WARN, stderr
+
+log4j.appender.stderr=org.apache.log4j.ConsoleAppender
+log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
+log4j.appender.stderr.layout.ConversionPattern=[%d] %p %m (%c)%n
+log4j.appender.stderr.Target=System.err
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/alerts.json b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/alerts.json
deleted file mode 100644
index 4c9884c..0000000
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/alerts.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "KAFKA": {
-    "service": [],
-    "KAFKA_BROKER": [
-      {
-        "name": "kafka_broker_process",
-        "label": "Kafka Broker Process",
-        "description": "This host-level alert is triggered if the Kafka Broker cannot be determined to be up.",
-        "interval": 1,
-        "scope": "HOST",
-        "source": {
-          "type": "PORT",
-          "uri": "{{kafka-broker/port}}",
-          "default_port": 6667,
-          "reporting": {
-            "ok": {
-              "text": "TCP OK - {0:.3f}s response on port {1}"
-            },
-            "warning": {
-              "text": "TCP OK - {0:.3f}s response on port {1}",
-              "value": 1.5
-            },
-            "critical": {
-              "text": "Connection failed: {0} to {1}:{2}",
-              "value": 5.0
-            }
-          }
-        }
-      }
-    ]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml
deleted file mode 100644
index 857f40e..0000000
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml
+++ /dev/null
@@ -1,357 +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>
-  <property>
-    <name>log.dirs</name>
-    <value>/kafka-logs</value>
-    <description>
-      A comma-separated list of one or more directories in which Kafka data is stored.
-      Each new partition that is created will be placed in the directory which currently has the fewest partitions.
-    </description>
-    <value-attributes>
-      <type>directories</type>
-    </value-attributes>
-  </property>
-  <property>
-    <name>port</name>
-    <value>6667</value>
-    <description>
-      The port on which the server accepts client connections.
-    </description>
-    <value-attributes>
-      <type>int</type>
-    </value-attributes>
-  </property>
-  <property>
-    <name>zookeeper.connect</name>
-    <value>localhost:2181</value>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <description>
-      Zookeeper also allows you to add a "chroot" path which will make all kafka data for this cluster appear under a particular path.
-      This is a way to setup multiple Kafka clusters or other applications on the same zookeeper cluster. To do this give a connection
-     string in the form hostname1:port1,hostname2:port2,hostname3:port3/chroot/path which would put all this cluster's data under the
-      path /chroot/path. Note that you must create this path yourself prior to starting the broker and consumers must use the
-      same connection string.
-    </description>
-  </property>
-  <property>
-    <name>message.max.bytes</name>
-    <value>1000000</value>
-    <description>
-      The maximum size of a message that the server can receive.
-      It is important that this property be in sync with the maximum fetch size your consumers use or
-      else an unruly producer will be able to publish messages too large for consumers to consume.
-    </description>
-  </property>
-  <property>
-    <name>num.network.threads</name>
-    <value>3</value>
-    <description>
-      The number of network threads that the server uses for handling network requests.
-      You probably don't need to change this.
-    </description>
-  </property>
-  <property>
-    <name>num.io.threads</name>
-    <value>8</value>
-    <description>
-      The number of I/O threads that the server uses for executing requests. You should have at least as many threads as you have disks.
-    </description>
-  </property>
-  <property>
-    <name>queued.max.requests</name>
-    <value>500</value>
-    <description>The number of requests that can be queued up for processing by the I/O threads before the network threads stop reading in new requests.</description>
-  </property>
-  <property>
-    <name>socket.send.buffer.bytes</name>
-    <value>102400</value>
-    <description>
-      The SO_SNDBUFF buffer the server prefers for socket connections.
-    </description>
-  </property>
-  <property>
-    <name>socket.receive.buffer.bytes</name>
-    <value>102400</value>
-    <description>
-      The SO_RCVBUFF buffer the server prefers for socket connections.
-    </description>
-  </property>
-  <property>
-    <name>socket.request.max.bytes</name>
-    <value>104857600</value>
-    <description>
-      The maximum request size the server will allow. This prevents the server from running out of memory and should be smaller than the Java heap size.
-    </description>
-  </property>
-  <property>
-    <name>num.partitions</name>
-    <value>1</value>
-    <description>
-        The default number of partitions per topic.
-    </description>
-  </property>
-  <property>
-    <name>log.segment.bytes</name>
-    <value>1073741824</value>
-    <description>
-      The maximum request size the server will allow.
-      This prevents the server from running out of memory and should be smaller than the Java heap size.
-    </description>
-  </property>
-  <property>
-    <name>log.roll.hours</name>
-    <value>168</value>
-    <description>
-      This setting will force Kafka to roll a new log segment even if the log.segment.bytes size has not been reached.
-    </description>
-  </property>
-  <property>
-    <name>log.retention.bytes</name>
-    <value>-1</value>
-    <description>
-      The amount of data to retain in the log for each topic-partitions. Note that this is the limit per-partition so multiply by the number of partitions to get the total data retained for the topic. Also note that if both log.retention.hours and log.retention.bytes are both set we delete a segment when either limit is exceeded.
-    </description>
-  </property>
-  <property>
-    <name>log.retention.hours</name>
-    <value>168</value>
-    <description>
-      The number of hours to keep a log segment before it is deleted, i.e. the default data retention window for all topics. Note that if both log.retention.hours and log.retention.bytes are both set we delete a segment when either limit is exceeded.
-    </description>
-  </property>
-  <property>
-    <name>log.cleanup.interval.mins</name>
-    <value>10</value>
-    <description>The frequency in minutes that the log cleaner checks whether any log segment is eligible for deletion to meet the retention policies.
-    </description>
-  </property>
-  <property>
-    <name>log.index.size.max.bytes</name>
-    <value>10485760</value>
-    <description>
-      The maximum size in bytes we allow for the offset index for each log segment. Note that we will always pre-allocate a
-      sparse file with this much space and shrink it down when the log rolls. If the index fills up we will roll a new log segment
-      even if we haven't reached the log.segment.bytes limit.
-    </description>
-  </property>
-  <property>
-    <name>log.index.interval.bytes</name>
-    <value>4096</value>
-    <description>
-      The byte interval at which we add an entry to the offset index. When executing a fetch request the server must do a linear scan for up to this many bytes to find the correct position in the log to begin and end the fetch. So setting this value to be larger will mean larger index files (and a bit more memory usage) but less scanning. However the server will never add more than one index entry per log append (even if more than log.index.interval worth of messages are appended). In general you probably don't need to mess with this value.
-    </description>
-  </property>
-  <property>
-    <name>auto.create.topics.enable</name>
-    <value>true</value>
-    <description>
-      Enable auto creation of topic on the server. If this is set to true then attempts to produce, consume, or fetch metadata for a non-existent topic will automatically create it with the default replication factor and number of partitions.
-    </description>
-  </property>
-  <property>
-    <name>controller.socket.timeout.ms</name>
-    <value>30000</value>
-    <property>The socket timeout for commands from the partition management controller to the replicas.</property>
-  </property>
-  <property>
-    <name>controller.message.queue.size</name>
-    <value>10</value>
-    <description>The buffer size for controller-to-broker-channels</description>
-  </property>
-  <property>
-    <name>default.replication.factor</name>
-    <value>1</value>
-    <description>The default replication factor for automatically created topics.</description>
-  </property>
-  <property>
-    <name>replica.lag.time.max.ms</name>
-    <value>10000</value>
-    <description>If a follower hasn't sent any fetch requests for this window of time, the leader will remove the follower from ISR (in-sync replicas) and treat it as dead.</description>
-  </property>
-  <property>
-    <name>replica.lag.max.messages</name>
-    <value>4000</value>
-    <description>
-      If a replica falls more than this many messages behind the leader, the leader will remove the follower from ISR and treat it as dead.
-    </description>
-  </property>
-  <property>
-    <name>replica.socket.timeout.ms</name>
-    <value>30000</value>
-    <description>The socket timeout for network requests to the leader for replicating data.</description>
-  </property>
-  <property>
-    <name>replica.socket.receive.buffer.bytes</name>
-    <value>65536</value>
-    <description>The socket receive buffer for network requests to the leader for replicating data.</description>
-  </property>
-  <property>
-    <name>replica.fetch.max.bytes</name>
-    <value>1048576</value>
-    <description>The number of byes of messages to attempt to fetch for each partition in the fetch requests the replicas send to the leader.</description>
-  </property>
-  <property>
-    <name>replica.fetch.wait.max.ms</name>
-    <value>500</value>
-    <description>The maximum amount of time to wait time for data to arrive on the leader in the fetch requests sent by the replicas to the leader.</description>
-  </property>
-  <property>
-    <name>replica.fetch.min.bytes</name>
-    <value>1</value>
-    <description>Minimum bytes expected for each fetch response for the fetch requests from the replica to the leader. If not enough bytes, wait up to replica.fetch.wait.max.ms for this many bytes to arrive.
-    </description>
-  </property>
-  <property>
-    <name>num.replica.fetchers</name>
-    <value>1</value>
-    <description>
-      Number of threads used to replicate messages from leaders. Increasing this value can increase the degree of I/O parallelism in the follower broker.
-    </description>
-  </property>
-  <property>
-    <name>replica.high.watermark.checkpoint.interval.ms</name>
-    <value>5000</value>
-    <description>The frequency with which each replica saves its high watermark to disk to handle recovery.</description>
-  </property>
-  <property>
-    <name>fetch.purgatory.purge.interval.requests</name>
-    <value>10000</value>
-    <description>The purge interval (in number of requests) of the fetch request purgatory.</description>
-  </property>
-  <property>
-    <name>producer.purgatory.purge.interval.requests</name>
-    <value>10000</value>
-    <description>The purge interval (in number of requests) of the producer request purgatory.</description>
-  </property>
-  <property>
-    <name>zookeeper.session.timeout.ms</name>
-    <value>30000</value>
-    <description>Zookeeper session timeout. If the server fails to heartbeat to zookeeper within this period of time it is considered dead. If you set this too low the server may be falsely considered dead; if you set it too high it may take too long to recognize a truly dead server.</description>
-  </property>
-  <property>
-    <name>zookeeper.connection.timeout.ms</name>
-    <value>25000</value>
-    <description>The maximum amount of time that the client waits to establish a connection to zookeeper.</description>
-  </property>
-  <property>
-    <name>zookeeper.sync.time.ms</name>
-    <value>2000</value>
-    <description>How far a ZK follower can be behind a ZK leader.</description>
-  </property>
-  <property>
-    <name>controlled.shutdown.enable</name>
-    <value>false</value>
-    <description>Enable controlled shutdown of the broker. If enabled, the broker will move all leaders on it to some other brokers before shutting itself down. This reduces the unavailability window during shutdown.</description>
-  </property>
-  <property>
-    <name>controlled.shutdown.max.retries</name>
-    <value>3</value>
-    <description>Number of retries to complete the controlled shutdown successfully before executing an unclean shutdown.</description>
-  </property>
-  <property>
-    <name>controlled.shutdown.retry.backoff.ms</name>
-    <value>5000</value>
-    <description>
-      Backoff time between shutdown retries.
-    </description>
-  </property>
-  <property>
-    <name>kafka.metrics.reporters</name>
-    <value></value>
-    <description>
-      kafka ganglia metrics reporter and kafka timeline metrics reporter
-    </description>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-  </property>
-  <property>
-    <name>kafka.ganglia.metrics.reporter.enabled</name>
-    <value>true</value>
-    <description>
-      kafka ganglia metrics reporter enable
-    </description>
-  </property>
-  <property>
-    <name>kafka.ganglia.metrics.host</name>
-    <value>localhost</value>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <description> Ganglia host </description>
-  </property>
-  <property>
-    <name>kafka.ganglia.metrics.port</name>
-    <value>8671</value>
-    <description> Ganglia port </description>
-  </property>
-  <property>
-    <name>kafka.ganglia.metrics.group</name>
-    <value>kafka</value>
-    <description>Ganglia group name </description>
-  </property>
-  <property>
-    <name>kafka.timeline.metrics.reporter.enabled</name>
-    <value>true</value>
-    <description>Kafka timeline metrics reporter enable</description>
-  </property>
-  <property>
-    <name>kafka.timeline.metrics.host</name>
-    <value>{{metric_collector_host}}</value>
-    <description>Timeline host</description>
-  </property>
-  <property>
-    <name>kafka.timeline.metrics.port</name>
-    <value>{{metric_collector_port}}</value>
-    <description>Timeline port</description>
-  </property>
-  <property>
-    <name>kafka.timeline.metrics.protocol</name>
-    <value>{{metric_collector_protocol}}</value>
-    <description>Timeline protocol(http or https)</description>
-  </property>
-  <property>
-    <name>kafka.timeline.metrics.truststore.path</name>
-    <value>{{metric_truststore_path}}</value>
-    <description>Location of the trust store file.</description>
-  </property>
-  <property>
-    <name>kafka.timeline.metrics.truststore.type</name>
-    <value>{{metric_truststore_type}}</value>
-    <description>Optional. Default value is "jks".</description>
-  </property>
-  <property>
-    <name>kafka.timeline.metrics.truststore.password</name>
-    <value>{{metric_truststore_password}}</value>
-    <description>Password to open the trust store file.</description>
-  </property>
-  <property>
-    <name>kafka.timeline.metrics.reporter.sendInterval</name>
-    <value>5900</value>
-    <description>Timeline metrics reporter send interval</description>
-  </property>
-    <property>
-    <name>kafka.timeline.metrics.maxRowCacheSize</name>
-    <value>10000</value>
-    <description>Timeline metrics reporter send interval</description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml
deleted file mode 100644
index 61fdc8c..0000000
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml
+++ /dev/null
@@ -1,102 +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>kafka_user</name>
-    <display-name>Kafka User</display-name>
-    <value>kafka</value>
-    <property-type>USER</property-type>
-    <description></description>
-    <value-attributes>
-      <type>user</type>
-      <overridable>false</overridable>
-    </value-attributes>
-  </property>
-  <property>
-    <name>kafka_keytab</name>
-    <description>Kafka keytab path</description>
-  </property>
-  <property>
-    <name>kafka_principal_name</name>
-    <description>Kafka principal name</description>
-  </property>
-  <property>
-    <name>kafka_log_dir</name>
-    <value>/var/log/kafka</value>
-    <description></description>
-  </property>
-  <property>
-    <name>kafka_pid_dir</name>
-    <value>/var/run/kafka</value>
-    <display-name>Kafka PID dir</display-name>
-    <description></description>
-    <value-attributes>
-      <type>directory</type>
-      <editable-only-at-install>true</editable-only-at-install>
-      <overridable>false</overridable>
-    </value-attributes>
-  </property>
-  <property>
-    <name>kafka_user_nofile_limit</name>
-    <value>128000</value>
-    <description>Max open files limit setting for KAFKA user.</description>
-  </property>
-  <property>
-    <name>kafka_user_nproc_limit</name>
-    <value>65536</value>
-    <description>Max number of processes limit setting for KAFKA user.</description>
-  </property>
-
-  <!-- kafka-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for kafka-env.sh file</description>
-    <value>
-#!/bin/bash
-
-# Set KAFKA specific environment variables here.
-
-# The java implementation to use.
-export JAVA_HOME={{java64_home}}
-export PATH=$PATH:$JAVA_HOME/bin
-export PID_DIR={{kafka_pid_dir}}
-export LOG_DIR={{kafka_log_dir}}
-export KAFKA_KERBEROS_PARAMS={{kafka_kerberos_params}}
-# Add kafka sink to classpath and related depenencies
-if [ -e "/usr/lib/ambari-metrics-kafka-sink/ambari-metrics-kafka-sink.jar" ]; then
-  export CLASSPATH=$CLASSPATH:/usr/lib/ambari-metrics-kafka-sink/ambari-metrics-kafka-sink.jar
-  export CLASSPATH=$CLASSPATH:/usr/lib/ambari-metrics-kafka-sink/lib/*
-fi
-if [ -f /etc/kafka/conf/kafka-ranger-env.sh ]; then
-. /etc/kafka/conf/kafka-ranger-env.sh
-fi
-    </value>
-    <value-attributes>
-      <type>content</type>
-    </value-attributes>
-  </property>
-  <property>
-    <name>is_supported_kafka_ranger</name>
-    <value>false</value>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-log4j.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-log4j.xml
deleted file mode 100644
index be604ed..0000000
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-log4j.xml
+++ /dev/null
@@ -1,126 +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 log4j.properties</description>
-    <value>
-#
-#
-# 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.
-#
-#
-#
-kafka.logs.dir=logs
-
-log4j.rootLogger=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.kafkaAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.kafkaAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.kafkaAppender.File=${kafka.logs.dir}/server.log
-log4j.appender.kafkaAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.kafkaAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.stateChangeAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.stateChangeAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.stateChangeAppender.File=${kafka.logs.dir}/state-change.log
-log4j.appender.stateChangeAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.stateChangeAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.requestAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.requestAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.requestAppender.File=${kafka.logs.dir}/kafka-request.log
-log4j.appender.requestAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.requestAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.cleanerAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.cleanerAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.cleanerAppender.File=${kafka.logs.dir}/log-cleaner.log
-log4j.appender.cleanerAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.cleanerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-log4j.appender.controllerAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.controllerAppender.DatePattern='.'yyyy-MM-dd-HH
-log4j.appender.controllerAppender.File=${kafka.logs.dir}/controller.log
-log4j.appender.controllerAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.controllerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
-
-# Turn on all our debugging info
-#log4j.logger.kafka.producer.async.DefaultEventHandler=DEBUG, kafkaAppender
-#log4j.logger.kafka.client.ClientUtils=DEBUG, kafkaAppender
-#log4j.logger.kafka.perf=DEBUG, kafkaAppender
-#log4j.logger.kafka.perf.ProducerPerformance$ProducerThread=DEBUG, kafkaAppender
-#log4j.logger.org.I0Itec.zkclient.ZkClient=DEBUG
-log4j.logger.kafka=INFO, kafkaAppender
-log4j.logger.kafka.network.RequestChannel$=WARN, requestAppender
-log4j.additivity.kafka.network.RequestChannel$=false
-
-#log4j.logger.kafka.network.Processor=TRACE, requestAppender
-#log4j.logger.kafka.server.KafkaApis=TRACE, requestAppender
-#log4j.additivity.kafka.server.KafkaApis=false
-log4j.logger.kafka.request.logger=WARN, requestAppender
-log4j.additivity.kafka.request.logger=false
-
-log4j.logger.kafka.controller=TRACE, controllerAppender
-log4j.additivity.kafka.controller=false
-
-log4j.logger.kafka.log.LogCleaner=INFO, cleanerAppender
-log4j.additivity.kafka.log.LogCleaner=false
-
-log4j.logger.state.change.logger=TRACE, stateChangeAppender
-log4j.additivity.state.change.logger=false
-
-   </value>
-   <value-attributes>
-      <type>content</type>
-      <show-property-name>false</show-property-name>
-   </value-attributes>
-   <depends-on>
-      <property>
-        <type>ranger-kafka-plugin-properties</type>
-        <name>ranger-kafka-plugin-enabled</name>
-      </property>
-   </depends-on>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metainfo.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metainfo.xml
deleted file mode 100644
index c1dbf43..0000000
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metainfo.xml
+++ /dev/null
@@ -1,108 +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>KAFKA</name>
-      <displayName>Kafka</displayName>
-      <comment>A high-throughput distributed messaging system</comment>
-      <version>0.8.1</version>
-      <components>
-        <component>
-          <name>KAFKA_BROKER</name>
-          <displayName>Kafka Broker</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/kafka_broker.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>1200</timeout>
-          </commandScript>
-          <logs>
-            <log>
-              <logId>kafka_server</logId>
-              <primary>true</primary>
-            </log>
-            <log>
-              <logId>kafka_controller</logId>
-            </log>
-            <log>
-              <logId>kafka_request</logId>
-            </log>
-            <log>
-              <logId>kafka_logcleaner</logId>
-            </log>
-            <log>
-              <logId>kafka_statechange</logId>
-            </log>
-          </logs>
-        </component>
-      </components>
-      <commandScript>
-        <script>scripts/service_check.py</script>
-        <scriptType>PYTHON</scriptType>
-        <timeout>300</timeout>
-      </commandScript>
-      <requiredServices>
-        <service>ZOOKEEPER</service>
-      </requiredServices>
-      <configuration-dependencies>
-        <config-type>kafka-broker</config-type>
-        <config-type>kafka-env</config-type>
-        <config-type>kafka-log4j</config-type>
-        <config-type>ranger-kafka-plugin-properties</config-type>
-        <config-type>ranger-kafka-audit</config-type>
-        <config-type>ranger-kafka-policymgr-ssl</config-type>
-        <config-type>ranger-kafka-security</config-type>
-        <config-type>zookeeper-env</config-type>
-        <config-type>zoo.cfg</config-type>
-        <config-type>ams-ssl-client</config-type>
-      </configuration-dependencies>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
-          <packages>
-            <package>
-              <name>kafka_${stack_version}</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
-          <packages>
-            <package>
-              <name>kafka-${stack_version}</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-      <restartRequiredAfterChange>true</restartRequiredAfterChange>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metrics.json b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metrics.json
deleted file mode 100644
index 58e4ecb..0000000
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/metrics.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "KAFKA_BROKER": {
-    "Component": [
-      {
-        "type": "ganglia",
-        "metrics": {
-          "default": {
-            "metrics/jvm/uptime": {
-              "metric": "jvm.uptime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/heap_usage": {
-              "metric": "jvm.heap_usage",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/non_heap_usage": {
-              "metric": "jvm.non_heap_usage",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread-states/runnable": {
-              "metric": "jvm.thread-states.runnable",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread-states/blocked": {
-              "metric": "jvm.thread-states.blocked",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread-states/timed_waiting": {
-              "metric": "jvm.thread-states.timed_waiting",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread-states/terminated": {
-              "metric": "jvm.thread-states.terminated",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/thread_count": {
-              "metric": "jvm.thread_count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/daemon_thread_count": {
-              "metric": "jvm.daemon_thread_count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/1MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsMessagesInPerSec.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/5MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsMessagesInPerSec.5MinuteRate",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/15MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsMessagesInPerSec.15MinuteRate",
-              "pointInTime": false,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/meanRate": {
-              "metric": "kafka.server.BrokerTopicMetrics/AllTopicsMessagesInPerSec/meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsMessagesInPerSec/count": {
-              "metric": "kafka.server.BrokerTopicMetrics/AllTopicsMessagesInPerSec.counte",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/1MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/5MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.5MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/15MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/meanRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesInPerSec/count": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesInPerSec.count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/1MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/5MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.5MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/15MinuteRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/meanRate": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/BrokerTopicMetrics/AllTopicsBytesOutPerSec/count": {
-              "metric": "kafka.server.BrokerTopicMetrics.AllTopicsBytesOutPerSec.count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/KafkaController/ActiveControllerCount": {
-              "metric": "kafka.controller.KafkaController.ActiveControllerCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/meanRate": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/1MinuteRate": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/5MinuteRate": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/15MinuteRate": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/log/LogFlushStats/LogFlushRateAndTimeMs/count": {
-              "metric": "kafka.log.LogFlushStats.LogFlushRateAndTimeMs.count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/meanRate": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.meanRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/1MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/5MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.5MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/15MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/LeaderElectionRateAndTimeMs/count": {
-              "metric": "kafka.controller.ControllerStats.LeaderElectionRateAndTimeMs.count",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/UncleanLeaderElectionsPerSec/1MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.UncleanLeaderElectionsPerSec.1MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/UncleanLeaderElectionsPerSec/5MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.UncleanLeaderElectionsPerSec.5MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/UncleanLeaderElectionsPerSec/15MinuteRate": {
-              "metric": "kafka.controller.ControllerStats.UncleanLeaderElectionsPerSec.15MinuteRate",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/controller/ControllerStats/OfflinePartitionsCount": {
-              "metric": "kafka.controller.ControllerStats.OfflinePartitionsCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/PartitionCount": {
-              "metric": "kafka.server.ReplicaManager.PartitionCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/LeaderCount": {
-              "metric": "kafka.server.ReplicaManager.LeaderCount",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/UnderReplicatedPartitions": {
-              "metric": "kafka.server.ReplicaManager.UnderReplicatedPartitions",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/ISRShrinksPerSec": {
-              "metric": "kafka.server.ReplicaManager.ISRShrinksPerSec",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ReplicaManager/ISRExpandsPerSec": {
-              "metric": "kafka.server.ReplicaManager.ISRExpandsPerSec",
-              "pointInTime": true,
-              "temporal": true
-            },
-
-            "metrics/kafka/server/ReplicaFetcherManager/Replica-MaxLag": {
-              "metric": "kafka.server.ReplicaFetcherManager.Replica-MaxLag",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/ProducerRequestPurgatory/PurgatorySize": {
-              "metric": "kafka.server.ProducerRequestPurgatory.PurgatorySize",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/server/FetchRequestPurgatory/PurgatorySize": {
-              "metric": "kafka.server.FetchRequestPurgatory.PurgatorySize",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/cluster/Partition/$1-UnderReplicated": {
-              "metric": "kafka.cluster.Partition.(\\w+)-UnderReplicated",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/consumer/ConsumerFetcherManager/$1-MaxLag": {
-              "metric": "kafka.consumer.ConsumerFetcherManager.(\\w+)-MaxLag",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/kafka/consumer/ConsumerFetcherManager/$1-MinFetch": {
-              "metric": "kafka.consumer.ConsumerFetcherManager.(\\w+)-MinFetch",
-              "pointInTime": true,
-              "temporal": true
-            }
-          }
-        }
-      }
-    ]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
deleted file mode 100644
index 33275f9..0000000
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka.py
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/usr/bin/env python
-"""
-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.
-
-"""
-import collections
-import os
-
-from resource_management.libraries.functions.version import format_stack_version
-from resource_management.libraries.resources.properties_file import PropertiesFile
-from resource_management.libraries.resources.template_config import TemplateConfig
-from resource_management.core.resources.system import Directory, Execute, File, Link
-from resource_management.core.source import StaticFile, Template, InlineTemplate
-from resource_management.libraries.functions import format
-from resource_management.libraries.functions.stack_features import check_stack_feature
-from resource_management.libraries.functions import StackFeature
-
-
-from resource_management.core.logger import Logger
-
-
-def kafka(upgrade_type=None):
-    import params
-    ensure_base_directories()
-
-    kafka_server_config = mutable_config_dict(params.config['configurations']['kafka-broker'])
-    # This still has an issue of hostnames being alphabetically out-of-order for broker.id in HDP-2.2.
-    # Starting in HDP 2.3, Kafka handles the generation of broker.id so Ambari doesn't have to.
-
-    effective_version = params.stack_version_formatted if upgrade_type is None else format_stack_version(params.version)
-    Logger.info(format("Effective stack version: {effective_version}"))
-
-    if effective_version is not None and effective_version != "" and \
-      check_stack_feature(StackFeature.CREATE_KAFKA_BROKER_ID, effective_version):
-      if len(params.kafka_hosts) > 0 and params.hostname in params.kafka_hosts:
-        brokerid = str(sorted(params.kafka_hosts).index(params.hostname))
-        kafka_server_config['broker.id'] = brokerid
-        Logger.info(format("Calculating broker.id as {brokerid}"))
-
-    # listeners and advertised.listeners are only added in 2.3.0.0 onwards.
-    if effective_version is not None and effective_version != "" and \
-        check_stack_feature(StackFeature.KAFKA_LISTENERS, effective_version):
-      listeners = kafka_server_config['listeners'].replace("localhost", params.hostname)
-      Logger.info(format("Kafka listeners: {listeners}"))
-
-      if params.security_enabled and params.kafka_kerberos_enabled:
-        Logger.info("Kafka kerberos security is enabled.")
-        if "SASL" not in listeners:
-          listeners = listeners.replace("PLAINTEXT", "PLAINTEXTSASL")
-
-        kafka_server_config['listeners'] = listeners
-        kafka_server_config['advertised.listeners'] = listeners
-        Logger.info(format("Kafka advertised listeners: {listeners}"))
-      else:
-        kafka_server_config['listeners'] = listeners
-
-        if 'advertised.listeners' in kafka_server_config:
-          advertised_listeners = kafka_server_config['advertised.listeners'].replace("localhost", params.hostname)
-          kafka_server_config['advertised.listeners'] = advertised_listeners
-          Logger.info(format("Kafka advertised listeners: {advertised_listeners}"))
-    else:
-      kafka_server_config['host.name'] = params.hostname
-
-    if params.has_metric_collector:
-      kafka_server_config['kafka.timeline.metrics.host'] = params.metric_collector_host
-      kafka_server_config['kafka.timeline.metrics.port'] = params.metric_collector_port
-      kafka_server_config['kafka.timeline.metrics.protocol'] = params.metric_collector_protocol
-      kafka_server_config['kafka.timeline.metrics.truststore.path'] = params.metric_truststore_path
-      kafka_server_config['kafka.timeline.metrics.truststore.type'] = params.metric_truststore_type
-      kafka_server_config['kafka.timeline.metrics.truststore.password'] = params.metric_truststore_password
-
-    kafka_data_dir = kafka_server_config['log.dirs']
-    kafka_data_dirs = filter(None, kafka_data_dir.split(","))
-    Directory(kafka_data_dirs,
-              mode=0755,
-              cd_access='a',
-              owner=params.kafka_user,
-              group=params.user_group,
-              create_parents = True,
-              recursive_ownership = True,
-    )
-
-    PropertiesFile("server.properties",
-                      dir=params.conf_dir,
-                      properties=kafka_server_config,
-                      owner=params.kafka_user,
-                      group=params.user_group,
-    )
-
-    File(format("{conf_dir}/kafka-env.sh"),
-          owner=params.kafka_user,
-          content=InlineTemplate(params.kafka_env_sh_template)
-     )
-
-    if (params.log4j_props != None):
-        File(format("{conf_dir}/log4j.properties"),
-             mode=0644,
-             group=params.user_group,
-             owner=params.kafka_user,
-             content=params.log4j_props
-         )
-
-    if params.security_enabled and params.kafka_kerberos_enabled:
-        TemplateConfig(format("{conf_dir}/kafka_jaas.conf"),
-                         owner=params.kafka_user)
-
-        TemplateConfig(format("{conf_dir}/kafka_client_jaas.conf"),
-                       owner=params.kafka_user)
-
-    # On some OS this folder could be not exists, so we will create it before pushing there files
-    Directory(params.limits_conf_dir,
-              create_parents = True,
-              owner='root',
-              group='root'
-    )
-
-    File(os.path.join(params.limits_conf_dir, 'kafka.conf'),
-         owner='root',
-         group='root',
-         mode=0644,
-         content=Template("kafka.conf.j2")
-    )
-
-    File(os.path.join(params.conf_dir, 'tools-log4j.properties'),
-         owner='root',
-         group='root',
-         mode=0644,
-         content=Template("tools-log4j.properties.j2")
-         )
-
-    setup_symlink(params.kafka_managed_pid_dir, params.kafka_pid_dir)
-    setup_symlink(params.kafka_managed_log_dir, params.kafka_log_dir)
-
-
-def mutable_config_dict(kafka_broker_config):
-    kafka_server_config = {}
-    for key, value in kafka_broker_config.iteritems():
-        kafka_server_config[key] = value
-    return kafka_server_config
-
-
-# Used to workaround the hardcoded pid/log dir used on the kafka bash process launcher
-def setup_symlink(kafka_managed_dir, kafka_ambari_managed_dir):
-  import params
-  backup_folder_path = None
-  backup_folder_suffix = "_tmp"
-  if kafka_ambari_managed_dir != kafka_managed_dir:
-    if os.path.exists(kafka_managed_dir) and not os.path.islink(kafka_managed_dir):
-
-      # Backup existing data before delete if config is changed repeatedly to/from default location at any point in time time, as there may be relevant contents (historic logs)
-      backup_folder_path = backup_dir_contents(kafka_managed_dir, backup_folder_suffix)
-
-      Directory(kafka_managed_dir,
-                action="delete",
-                create_parents = True)
-
-    elif os.path.islink(kafka_managed_dir) and os.path.realpath(kafka_managed_dir) != kafka_ambari_managed_dir:
-      Link(kafka_managed_dir,
-           action="delete")
-
-    if not os.path.islink(kafka_managed_dir):
-      Link(kafka_managed_dir,
-           to=kafka_ambari_managed_dir)
-
-  elif os.path.islink(kafka_managed_dir): # If config is changed and coincides with the kafka managed dir, remove the symlink and physically create the folder
-    Link(kafka_managed_dir,
-         action="delete")
-
-    Directory(kafka_managed_dir,
-              mode=0755,
-              cd_access='a',
-              owner=params.kafka_user,
-              group=params.user_group,
-              create_parents = True,
-              recursive_ownership = True,
-    )
-
-  if backup_folder_path:
-    # Restore backed up files to current relevant dirs if needed - will be triggered only when changing to/from default path;
-    for file in os.listdir(backup_folder_path):
-      File(os.path.join(kafka_managed_dir,file),
-           owner=params.kafka_user,
-           content = StaticFile(os.path.join(backup_folder_path,file)))
-
-    # Clean up backed up folder
-    Directory(backup_folder_path,
-              action="delete",
-              create_parents = True)
-
-
-# Uses agent temp dir to store backup files
-def backup_dir_contents(dir_path, backup_folder_suffix):
-  import params
-  backup_destination_path = params.tmp_dir + os.path.normpath(dir_path)+backup_folder_suffix
-  Directory(backup_destination_path,
-            mode=0755,
-            cd_access='a',
-            owner=params.kafka_user,
-            group=params.user_group,
-            create_parents = True,
-            recursive_ownership = True,
-  )
-  # Safely copy top-level contents to backup folder
-  for file in os.listdir(dir_path):
-    File(os.path.join(backup_destination_path, file),
-         owner=params.kafka_user,
-         content = StaticFile(os.path.join(dir_path,file)))
-
-  return backup_destination_path
-
-def ensure_base_directories():
-  import params
-  Directory([params.kafka_log_dir, params.kafka_pid_dir, params.conf_dir],
-            mode=0755,
-            cd_access='a',
-            owner=params.kafka_user,
-            group=params.user_group,
-            create_parents = True,
-            recursive_ownership = True,
-            )

http://git-wip-us.apache.org/repos/asf/ambari/blob/fdd16f3c/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
deleted file mode 100644
index 024da4a..0000000
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
+++ /dev/null
@@ -1,129 +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.
-
-"""
-from resource_management import Script
-from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute, File, Directory
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions import Direction
-from resource_management.libraries.functions.version import compare_versions, format_stack_version
-from resource_management.libraries.functions.format import format
-from resource_management.libraries.functions.check_process_status import check_process_status
-from resource_management.libraries.functions import StackFeature
-from resource_management.libraries.functions.stack_features import check_stack_feature
-from resource_management.libraries.functions.show_logs import show_logs
-from resource_management.libraries.functions.default import default
-from kafka import ensure_base_directories
-
-import upgrade
-from kafka import kafka
-from setup_ranger_kafka import setup_ranger_kafka
-
-class KafkaBroker(Script):
-
-  def get_component_name(self):
-    return "kafka-broker"
-
-  def install(self, env):
-    self.install_packages(env)
-
-  def configure(self, env, upgrade_type=None):
-    import params
-    env.set_params(params)
-    kafka(upgrade_type=upgrade_type)
-
-  def pre_upgrade_restart(self, env, upgrade_type=None):
-    import params
-    env.set_params(params)
-
-    if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, params.version):
-      stack_select.select("kafka-broker", params.version)
-
-    if params.version and check_stack_feature(StackFeature.CONFIG_VERSIONING, params.version):
-      conf_select.select(params.stack_name, "kafka", params.version)
-
-    # This is extremely important since it should only be called if crossing the HDP 2.3.4.0 boundary. 
-    if params.current_version and params.version and params.upgrade_direction:
-      src_version = dst_version = None
-      if params.upgrade_direction == Direction.UPGRADE:
-        src_version = format_stack_version(params.current_version)
-        dst_version = format_stack_version(params.version)
-      else:
-        # These represent the original values during the UPGRADE direction
-        src_version = format_stack_version(params.version)
-        dst_version = format_stack_version(params.downgrade_from_version)
-
-      # TODO: How to handle the case of crossing stack version boundary in a stack agnostic way?
-      if compare_versions(src_version, '2.3.4.0') < 0 and compare_versions(dst_version, '2.3.4.0') >= 0:
-        # Calling the acl migration script requires the configs to be present.
-        self.configure(env, upgrade_type=upgrade_type)
-        upgrade.run_migration(env, upgrade_type)
-
-  def start(self, env, upgrade_type=None):
-    import params
-    env.set_params(params)
-    self.configure(env, upgrade_type=upgrade_type)
-    if params.is_supported_kafka_ranger:
-      setup_ranger_kafka() #Ranger Kafka Plugin related call 
-    daemon_cmd = format('source {params.conf_dir}/kafka-env.sh ; {params.kafka_bin} start')
-    no_op_test = format('ls {params.kafka_pid_file} >/dev/null 2>&1 && ps -p `cat {params.kafka_pid_file}` >/dev/null 2>&1')
-    try:
-      Execute(daemon_cmd,
-              user=params.kafka_user,
-              not_if=no_op_test
-      )
-    except:
-      show_logs(params.kafka_log_dir, params.kafka_user)
-      raise
-
-  def stop(self, env, upgrade_type=None):
-    import params
-    env.set_params(params)
-    # Kafka package scripts change permissions on folders, so we have to
-    # restore permissions after installing repo version bits
-    # before attempting to stop Kafka Broker
-    ensure_base_directories()
-    daemon_cmd = format('source {params.conf_dir}/kafka-env.sh; {params.kafka_bin} stop')
-    try:
-      Execute(daemon_cmd,
-              user=params.kafka_user,
-      )
-    except:
-      show_logs(params.kafka_log_dir, params.kafka_user)
-      raise
-    File(params.kafka_pid_file,
-          action = "delete"
-    )
-
-
-  def status(self, env):
-    import status_params
-    env.set_params(status_params)
-    check_process_status(status_params.kafka_pid_file)
-    
-  def get_log_folder(self):
-    import params
-    return params.kafka_log_dir
-  
-  def get_user(self):
-    import params
-    return params.kafka_user
-
-if __name__ == "__main__":
-  KafkaBroker().execute()


Mime
View raw message