ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-11909. Update atlas service definition to account for atlas implementation changes (Jon Maron via smohanty)
Date Sat, 13 Jun 2015 21:35:16 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk a1c0a4643 -> a8d8e1235


AMBARI-11909. Update atlas service definition to account for atlas implementation changes
(Jon Maron via smohanty)


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

Branch: refs/heads/trunk
Commit: a8d8e12350afc009e6e30d66505c1e2e5d61f560
Parents: a1c0a46
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Sat Jun 13 14:32:59 2015 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Sat Jun 13 14:32:59 2015 -0700

----------------------------------------------------------------------
 .../common-services/ATLAS/0.1.0.2.3/alerts.json | 10 +--
 .../configuration/application-properties.xml    | 44 ++++-----
 .../ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 94 ++++++++++++++++++++
 .../0.1.0.2.3/configuration/metadata-env.xml    | 94 --------------------
 .../ATLAS/0.1.0.2.3/kerberos.json               | 16 ++--
 .../ATLAS/0.1.0.2.3/metainfo.xml                |  6 +-
 .../ATLAS/0.1.0.2.3/package/files/log4j.xml     |  7 +-
 .../ATLAS/0.1.0.2.3/package/scripts/metadata.py |  4 +-
 .../package/scripts/metadata_server.py          | 30 +++----
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   | 24 ++---
 .../0.1.0.2.3/package/scripts/status_params.py  |  6 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  | 14 +--
 .../stacks/2.3/ATLAS/test_metadata_server.py    | 16 ++--
 .../test/python/stacks/2.3/configs/default.json | 44 ++++-----
 ambari-web/app/models/quick_links.js            |  2 +-
 15 files changed, 205 insertions(+), 206 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json
index 95d8295..f324707 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/alerts.json
@@ -10,7 +10,7 @@
         "scope": "ANY",
         "source": {
           "type": "PORT",
-          "uri": "{{metadata-env/metadata_port}}",
+          "uri": "{{atlas-env/metadata_port}}",
           "default_port": 21000,
           "reporting": {
             "ok": {
@@ -37,13 +37,13 @@
         "source": {
           "type": "WEB",
           "uri": {
-            "http": "{{hostname}}:{{metadata-env/metadata_port}}",
+            "http": "{{hostname}}:{{atlas-env/metadata_port}}",
             "https": "{{hostname}}:21443",
-            "https_property": "{{application-properties/enableTLS}}",
+            "https_property": "{{application-properties/atlas.enableTLS}}",
             "https_property_value": "true",
             "default_port": 21000,
-            "kerberos_keytab": "{{application-properties/http_authentication_kerberos_keytab}}",
-            "kerberos_principal": "{{application-properties/http_authentication_kerberos_principal}}",
+            "kerberos_keytab": "{{application-properties/atlas.http.authentication.kerberos.keytab}}",
+            "kerberos_principal": "{{application-properties/atlas.http.authentication.kerberos.principal}}",
             "connection_timeout": 5.0
           },
           "reporting": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
index db5ffd1..1a9eb8b 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
@@ -20,112 +20,112 @@
 -->
 <configuration supports_final="false">
   <property>
-    <name>metadata.graph.storage.backend</name>
+    <name>atlas.graph.storage.backend</name>
     <value>berkeleyje</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.graph.storage.directory</name>
+    <name>atlas.graph.storage.directory</name>
     <value>/var/lib/atlas/data/berkeley</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.graph.index.search.backend</name>
+    <name>atlas.graph.index.search.backend</name>
     <value>elasticsearch</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.graph.index.search.directory</name>
+    <name>atlas.graph.index.search.directory</name>
     <value>/var/lib/atlas/data/es</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.graph.index.search.elasticsearch.client-only</name>
+    <name>atlas.graph.index.search.elasticsearch.client-only</name>
     <value>false</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.graph.index.search.elasticsearch.local-mode</name>
+    <name>atlas.graph.index.search.elasticsearch.local-mode</name>
     <value>true</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.lineage.hive.table.type.name</name>
+    <name>atlas.lineage.hive.table.type.name</name>
     <value>Table</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.lineage.hive.column.type.name</name>
+    <name>atlas.lineage.hive.column.type.name</name>
     <value>Column</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.lineage.hive.table.column.name</name>
+    <name>atlas.lineage.hive.table.column.name</name>
     <value>columns</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.lineage.hive.process.type.name</name>
+    <name>atlas.lineage.hive.process.type.name</name>
     <value>LoadProcess</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.lineage.hive.process.inputs.name</name>
+    <name>atlas.lineage.hive.process.inputs.name</name>
     <value>inputTables</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.lineage.hive.process.outputs.name</name>
+    <name>atlas.lineage.hive.process.outputs.name</name>
     <value>outputTables</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.enableTLS</name>
+    <name>atlas.enableTLS</name>
     <value>false</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.authentication.method</name>
+    <name>atlas.authentication.method</name>
     <value>simple</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.authentication.principal</name>
+    <name>atlas.authentication.principal</name>
     <value>atlas</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.authentication.keytab</name>
+    <name>atlas.authentication.keytab</name>
     <value>/etc/security/keytabs/atlas.service.keytab</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.server.bind.address</name>
+    <name>atlas.server.bind.address</name>
     <value>localhost</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.http.authentication.enabled</name>
+    <name>atlas.http.authentication.enabled</name>
     <value>false</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.http.authentication.type</name>
+    <name>atlas.http.authentication.type</name>
     <value>simple</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.http.authentication.kerberos.principal</name>
+    <name>atlas.http.authentication.kerberos.principal</name>
     <value>HTTP/_HOST@EXAMPLE.COM</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.http.authentication.kerberos.keytab</name>
+    <name>atlas.http.authentication.kerberos.keytab</name>
     <value>/etc/security/keytabs/spnego.service.keytab</value>
     <description></description>
   </property>
   <property>
-    <name>metadata.http.authentication.kerberos.name.rules</name>
+    <name>atlas.http.authentication.kerberos.name.rules</name>
     <value>RULE:[1:$1@$0](.*@EXAMPLE.COM)s/@.*//
       DEFAULT</value>
     <description></description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
new file mode 100644
index 0000000..aed76ff
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
@@ -0,0 +1,94 @@
+<?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 require-input="false">
+    <name>metadata_port</name>
+    <value>21000</value>
+    <description>Listening port of the Atlas server.</description>
+  </property>
+  <property require-input="false">
+    <name>metadata_log_dir</name>
+    <value>/var/log/atlas</value>
+    <description>Atlas log directory.</description>
+  </property>
+  <property require-input="false">
+    <name>metadata_pid_dir</name>
+    <value>/var/run/atlas</value>
+    <description>Atlas pid-file directory.</description>
+  </property>
+  <property>
+    <name>metadata_user</name>
+    <value>atlas</value>
+    <property-type>USER</property-type>
+    <description>Metadata User Name.</description>
+  </property>
+  <property>
+    <name>metadata_opts</name>
+    <value> </value>
+    <description>Metadata Server command line options.</description>
+  </property>
+  <property>
+    <name>metadata_classpath</name>
+    <value> </value>
+    <description>Metadata Server additional classpath.</description>
+  </property>
+  <property require-input="false">
+    <name>metadata_data_dir</name>
+    <value>/var/lib/atlas/data</value>
+    <description>Atlas data directory.</description>
+  </property>
+  <property require-input="false">
+    <name>metadata_expanded_war_dir</name>
+    <value>./server/webapp</value>
+    <description>Atlas expanded WAR directory.</description>
+  </property>
+
+  <!-- metadata-env.sh -->
+  <property>
+    <name>content</name>
+    <description>This is the jinja template for metadata-env.sh file</description>
+    <value>
+# The java implementation to use. If JAVA_HOME is not found we expect java and jar to be
in path
+export JAVA_HOME={{java64_home}}
+
+# any additional java opts you want to set. This will apply to both client and server operations
+export METADATA_OPTS={{metadata_opts}}
+
+# metadata configuration directory 
+export METADATA_CONF={{conf_dir}}
+
+# Where log files are stored. Defatult is logs directory under the base install location
+export METADATA_LOG_DIR={{log_dir}}
+
+# additional classpath entries
+export METADATACPPATH={{metadata_classpath}}
+
+# data dir
+export METADATA_DATA_DIR={{data_dir}}
+
+# pid dir
+export METADATA_PID_DIR={{pid_dir}}
+
+# Where do you want to expand the war file. By Default it is in /server/webapp dir under
the base install dir.
+export METADATA_EXPANDED_WEBAPP_DIR={{expanded_war_dir}}
+    </value>
+  </property>  
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/metadata-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/metadata-env.xml
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/metadata-env.xml
deleted file mode 100644
index aed76ff..0000000
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/metadata-env.xml
+++ /dev/null
@@ -1,94 +0,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 require-input="false">
-    <name>metadata_port</name>
-    <value>21000</value>
-    <description>Listening port of the Atlas server.</description>
-  </property>
-  <property require-input="false">
-    <name>metadata_log_dir</name>
-    <value>/var/log/atlas</value>
-    <description>Atlas log directory.</description>
-  </property>
-  <property require-input="false">
-    <name>metadata_pid_dir</name>
-    <value>/var/run/atlas</value>
-    <description>Atlas pid-file directory.</description>
-  </property>
-  <property>
-    <name>metadata_user</name>
-    <value>atlas</value>
-    <property-type>USER</property-type>
-    <description>Metadata User Name.</description>
-  </property>
-  <property>
-    <name>metadata_opts</name>
-    <value> </value>
-    <description>Metadata Server command line options.</description>
-  </property>
-  <property>
-    <name>metadata_classpath</name>
-    <value> </value>
-    <description>Metadata Server additional classpath.</description>
-  </property>
-  <property require-input="false">
-    <name>metadata_data_dir</name>
-    <value>/var/lib/atlas/data</value>
-    <description>Atlas data directory.</description>
-  </property>
-  <property require-input="false">
-    <name>metadata_expanded_war_dir</name>
-    <value>./server/webapp</value>
-    <description>Atlas expanded WAR directory.</description>
-  </property>
-
-  <!-- metadata-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for metadata-env.sh file</description>
-    <value>
-# The java implementation to use. If JAVA_HOME is not found we expect java and jar to be
in path
-export JAVA_HOME={{java64_home}}
-
-# any additional java opts you want to set. This will apply to both client and server operations
-export METADATA_OPTS={{metadata_opts}}
-
-# metadata configuration directory 
-export METADATA_CONF={{conf_dir}}
-
-# Where log files are stored. Defatult is logs directory under the base install location
-export METADATA_LOG_DIR={{log_dir}}
-
-# additional classpath entries
-export METADATACPPATH={{metadata_classpath}}
-
-# data dir
-export METADATA_DATA_DIR={{data_dir}}
-
-# pid dir
-export METADATA_PID_DIR={{pid_dir}}
-
-# Where do you want to expand the war file. By Default it is in /server/webapp dir under
the base install dir.
-export METADATA_EXPANDED_WEBAPP_DIR={{expanded_war_dir}}
-    </value>
-  </property>  
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
index 778b23c..ff82d52 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
@@ -5,14 +5,14 @@
       "configurations": [
         {
           "application-properties": {
-            "metadata.authentication.method": "kerberos",
-            "metadata.http.authentication.enabled": "true",
-            "metadata.http.authentication.type": "kerberos"
+            "atlas.authentication.method": "kerberos",
+            "atlas.http.authentication.enabled": "true",
+            "atlas.http.authentication.type": "kerberos"
           }
         }
       ],
       "auth_to_local_properties" : [
-        "application-properties/metadata.http.authentication.kerberos.name.rules"
+        "application-properties/atlas.http.authentication.kerberos.name.rules"
       ],
       "components": [
         {
@@ -23,7 +23,7 @@
               "principal": {
                 "value": "atlas/_HOST@${realm}",
                 "type" : "service",
-                "configuration": "application-properties/metadata.authentication.principal",
+                "configuration": "application-properties/atlas.authentication.principal",
                 "local_username" : "${metadata-env/metadata_user}"
               },
               "keytab": {
@@ -36,17 +36,17 @@
                   "name": "${cluster-env/user_group}",
                   "access": ""
                 },
-                "configuration": "application-properties/metadata.authentication.keytab"
+                "configuration": "application-properties/atlas.authentication.keytab"
               }
             },
             {
               "name": "/spnego",
               "principal": {
                 "value": "HTTP/_HOST@${realm}",
-                "configuration": "application-properties/http_authentication_kerberos_principal"
+                "configuration": "application-properties/atlas.http.authentication.kerberos.principal"
               },
               "keytab": {
-                "configuration": "application-properties/http_authentication_kerberos_keytab"
+                "configuration": "application-properties/atlas.http.authentication.kerberos.keytab"
               }
             }
           ]

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml
index 290a69f..a77bad3 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/metainfo.xml
@@ -44,8 +44,8 @@
           </configFile>
           <configFile>
             <type>env</type>
-            <fileName>metadata_env.sh</fileName>
-            <dictionaryName>metadata-env</dictionaryName>
+            <fileName>atlas-env.sh</fileName>
+            <dictionaryName>atlas-env</dictionaryName>
           </configFile>
         </component>
       </components>
@@ -70,7 +70,7 @@
 
       <configuration-dependencies>
         <config-type>application-properties</config-type>
-        <config-type>metadata-env</config-type>
+        <config-type>atlas-env</config-type>
       </configuration-dependencies>
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/log4j.xml
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/log4j.xml
index c80b10f..42d3c47 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/log4j.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/files/log4j.xml
@@ -28,7 +28,7 @@
     </appender>
 
     <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="${metadata.log.dir}/application.log"/>
+        <param name="File" value="${atlas.log.dir}/application.log"/>
         <param name="Append" value="true"/>
         <param name="Threshold" value="debug"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -37,7 +37,7 @@
     </appender>
 
     <appender name="AUDIT" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="${metadata.log.dir}/audit.log"/>
+        <param name="File" value="${atlas.log.dir}/audit.log"/>
         <param name="Append" value="true"/>
         <param name="Threshold" value="debug"/>
         <layout class="org.apache.log4j.PatternLayout">
@@ -45,9 +45,8 @@
         </layout>
     </appender>
 
-    <logger name="org.apache.hadoop.metadata" additivity="false">
+    <logger name="org.apache.atlas" additivity="false">
         <level value="debug"/>
-        <appender-ref ref="console"/>
         <appender-ref ref="FILE"/>
     </logger>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
index dc9daa9..2eae71b 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
@@ -67,7 +67,7 @@ def metadata():
               recursive=True
     )
 
-    metadata_war_file = format('{params.metadata_home}/server/webapp/metadata.war')
+    metadata_war_file = format('{params.metadata_home}/server/webapp/atlas.war')
     if not os.path.isfile(metadata_war_file):
         raise Fail("Unable to copy {0} because it does not exist".format(metadata_war_file))
 
@@ -81,7 +81,7 @@ def metadata():
          group=params.user_group
     )
 
-    File(format("{conf_dir}/metadata-env.sh"),
+    File(format("{conf_dir}/atlas-env.sh"),
          owner=params.metadata_user,
          group=params.user_group,
          mode=0755,

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
index c07961d..6c5a87e 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
@@ -46,7 +46,7 @@ class MetadataServer(Script):
     env.set_params(params)
     self.configure(env)
 
-    daemon_cmd = format('source {params.conf_dir}/metadata-env.sh ; {params.metadata_start_script}
--port {params.metadata_port}')
+    daemon_cmd = format('source {params.conf_dir}/atlas-env.sh ; {params.metadata_start_script}
--port {params.metadata_port}')
     no_op_test = format('ls {params.pid_file} >/dev/null 2>&1 && ps -p
`cat {params.pid_file}` >/dev/null 2>&1')
     Execute(daemon_cmd,
             user=params.metadata_user,
@@ -56,7 +56,7 @@ class MetadataServer(Script):
   def stop(self, env, rolling_restart=False):
     import params
     env.set_params(params)
-    daemon_cmd = format('source {params.conf_dir}/metadata-env.sh; {params.metadata_stop_script}')
+    daemon_cmd = format('source {params.conf_dir}/atlas-env.sh; {params.metadata_stop_script}')
     Execute(daemon_cmd,
             user=params.metadata_user,
     )
@@ -73,15 +73,15 @@ class MetadataServer(Script):
 
     env.set_params(status_params)
 
-    props_value_check = {'metadata.authentication.method': 'kerberos',
-                         'metadata.http.authentication.enabled': 'true',
-                         'metadata.http.authentication.type': 'kerberos'}
-    props_empty_check = ['metadata.authentication.principal',
-                         'metadata.authentication.keytab',
-                         'metadata.http.authentication.kerberos.principal',
-                         'metadata.http.authentication.kerberos.keytab']
-    props_read_check = ['metadata.authentication.keytab',
-                        'metadata.http.authentication.kerberos.keytab']
+    props_value_check = {'atlas.authentication.method': 'kerberos',
+                         'atlas.http.authentication.enabled': 'true',
+                         'atlas.http.authentication.type': 'kerberos'}
+    props_empty_check = ['atlas.authentication.principal',
+                         'atlas.authentication.keytab',
+                         'atlas.http.authentication.kerberos.principal',
+                         'atlas.http.authentication.kerberos.keytab']
+    props_read_check = ['atlas.authentication.keytab',
+                        'atlas.http.authentication.kerberos.keytab']
     atlas_site_expectations = build_expectations('application-properties',
                                                     props_value_check,
                                                     props_empty_check,
@@ -97,16 +97,16 @@ class MetadataServer(Script):
       try:
         # Double check the dict before calling execute
         if ( 'application-properties' not in security_params
-             or 'metadata.authentication.keytab' not in security_params['application-properties']
-             or 'metadata.authentication.principal' not in security_params['application-properties']):
+             or 'atlas.authentication.keytab' not in security_params['application-properties']
+             or 'atlas.authentication.principal' not in security_params['application-properties']):
           self.put_structured_out({"securityState": "UNSECURED"})
           self.put_structured_out(
             {"securityIssuesFound": "Atlas service keytab file or principal are not set property."})
           return
 
         if ( 'application-properties' not in security_params
-             or 'metadata.http.authentication.kerberos.keytab' not in security_params['application-properties']
-             or 'metadata.http.authentication.kerberos.principal' not in security_params['application-properties']):
+             or 'atlas.http.authentication.kerberos.keytab' not in security_params['application-properties']
+             or 'atlas.http.authentication.kerberos.principal' not in security_params['application-properties']):
           self.put_structured_out({"securityState": "UNSECURED"})
           self.put_structured_out(
             {"securityIssuesFound": "HTTP Authentication keytab file or principal are not
set property."})

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index c77083b..a7c6d7a 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -38,11 +38,11 @@ metadata_home = os.environ['METADATA_HOME_DIR'] if 'METADATA_HOME_DIR'
in os.env
 metadata_bin = format("{metadata_home}/bin")
 
 python_binary = os.environ['PYTHON_EXE'] if 'PYTHON_EXE' in os.environ else sys.executable
-metadata_start_script = format("{metadata_bin}/metadata_start.py")
-metadata_stop_script = format("{metadata_bin}/metadata_stop.py")
+metadata_start_script = format("{metadata_bin}/atlas_start.py")
+metadata_stop_script = format("{metadata_bin}/atlas_stop.py")
 
 # metadata local directory structure
-log_dir = config['configurations']['metadata-env']['metadata_log_dir']
+log_dir = config['configurations']['atlas-env']['metadata_log_dir']
 conf_dir = status_params.conf_dir # "/etc/metadata/conf"
 
 # service locations
@@ -52,29 +52,29 @@ hadoop_conf_dir = os.path.join(os.environ["HADOOP_HOME"], "conf") if 'HADOOP_HOM
 metadata_user = status_params.metadata_user
 user_group = config['configurations']['cluster-env']['user_group']
 pid_dir = status_params.pid_dir
-pid_file = format("{pid_dir}/metadata.pid")
+pid_file = format("{pid_dir}/atlas.pid")
 
 # metadata env
 java64_home = config['hostLevelParams']['java_home']
-env_sh_template = config['configurations']['metadata-env']['content']
+env_sh_template = config['configurations']['atlas-env']['content']
 
 # credential provider
 credential_provider = format( "jceks://file@{conf_dir}/atlas-site.jceks")
 
 # command line args
-metadata_port = config['configurations']['metadata-env']['metadata_port']
+metadata_port = config['configurations']['atlas-env']['metadata_port']
 metadata_host = config['hostname']
 
 # application properties
 application_properties = dict(config['configurations']['application-properties'])
-application_properties['metadata.http.authentication.kerberos.name.rules'] = ' \\ \n'.join(application_properties['metadata.http.authentication.kerberos.name.rules'].splitlines())
-application_properties['metadata.server.bind.address'] = metadata_host
+application_properties['atlas.http.authentication.kerberos.name.rules'] = ' \\ \n'.join(application_properties['atlas.http.authentication.kerberos.name.rules'].splitlines())
+application_properties['atlas.server.bind.address'] = metadata_host
 
-metadata_env_content = config['configurations']['metadata-env']['content']
+metadata_env_content = config['configurations']['atlas-env']['content']
 
-metadata_opts = config['configurations']['metadata-env']['metadata_opts']
-metadata_classpath = config['configurations']['metadata-env']['metadata_classpath']
-data_dir = config['configurations']['metadata-env']['metadata_data_dir']
+metadata_opts = config['configurations']['atlas-env']['metadata_opts']
+metadata_classpath = config['configurations']['atlas-env']['metadata_classpath']
+data_dir = config['configurations']['atlas-env']['metadata_data_dir']
 expanded_war_dir = os.environ['METADATA_EXPANDED_WEBAPP_DIR'] if 'METADATA_EXPANDED_WEBAPP_DIR'
in os.environ else '/var/lib/atlas/server/webapp'
 
 # smoke test

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
index db295c4..c402721 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
@@ -26,9 +26,9 @@ from resource_management.libraries.functions.default import default
 config = Script.get_config()
 
 conf_dir = os.environ['METADATA_CONF'] if 'METADATA_CONF' in os.environ else '/etc/atlas/conf'
-pid_dir = config['configurations']['metadata-env']['metadata_pid_dir']
-pid_file = format("{pid_dir}/metadata.pid")
-metadata_user = config['configurations']['metadata-env']['metadata_user']
+pid_dir = config['configurations']['atlas-env']['metadata_pid_dir']
+pid_file = format("{pid_dir}/atlas.pid")
+metadata_user = config['configurations']['atlas-env']['metadata_user']
 
 # Security related/required params
 hostname = config['hostname']

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 14c413f..2c231d1 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -361,9 +361,9 @@ else:
   # hive-site
   hive_site_config['hive.cluster.name'] = config['clusterName']
   atlas_config = config['configurations']['application-properties']
-  metadata_port = config['configurations']['metadata-env']['metadata_port']
+  metadata_port = config['configurations']['atlas-env']['metadata_port']
   metadata_host = atlas_hosts[0]
-  tls_enabled = config['configurations']['application-properties']['metadata.enableTLS']
+  tls_enabled = config['configurations']['application-properties']['atlas.enableTLS']
   if tls_enabled:
     scheme = "https"
   else:
@@ -371,18 +371,18 @@ else:
   hive_site_config['hive.hook.dgi.url'] = format('{scheme}://{metadata_host}:{metadata_port}')
 
   if not 'hive.exec.post.hooks' in hive_site_config:
-    hive_site_config['hive.exec.post.hooks'] = 'org.apache.hadoop.metadata.hive.hook.HiveHook'
+    hive_site_config['hive.exec.post.hooks'] = 'org.apache.atlas.hive.hook.HiveHook'
   else:
     current_hook = hive_site_config['hive.exec.post.hooks']
-    hive_site_config['hive.exec.post.hooks'] =  format('{current_hook}, org.apache.hadoop.metadata.hive.hook.HiveHook')
+    hive_site_config['hive.exec.post.hooks'] =  format('{current_hook}, org.apache.atlas.hive.hook.HiveHook')
 
   # client.properties
   atlas_client_props = {}
   auth_enabled = config['configurations']['application-properties'].get(
-    'metadata.http.authentication.enabled', False)
-  atlas_client_props['metadata.http.authentication.enabled'] = auth_enabled
+    'atlas.http.authentication.enabled', False)
+  atlas_client_props['atlas.http.authentication.enabled'] = auth_enabled
   if auth_enabled:
-    atlas_client_props['metadata.http.authentication.type'] = config['configurations']['application-properties'].get('metadata.http.authentication.type',
'simple')
+    atlas_client_props['atlas.http.authentication.type'] = config['configurations']['application-properties'].get('atlas.http.authentication.type',
'simple')
 
 ########################################################
 ########### WebHCat related params #####################

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
index 81ee91b..8d72faf 100644
--- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
@@ -66,8 +66,8 @@ class TestMetadataServer(RMFTestCase):
       )
       appprops =  dict(self.getConfig()['configurations'][
           'application-properties'])
-      appprops['metadata.http.authentication.kerberos.name.rules'] = ' \\ \n'.join(appprops['metadata.http.authentication.kerberos.name.rules'].splitlines())
-      appprops['metadata.server.bind.address'] = 'c6401.ambari.apache.org'
+      appprops['atlas.http.authentication.kerberos.name.rules'] = ' \\ \n'.join(appprops['atlas.http.authentication.kerberos.name.rules'].splitlines())
+      appprops['atlas.server.bind.address'] = 'c6401.ambari.apache.org'
 
       self.assertResourceCalled('PropertiesFile',
                                 '/etc/atlas/conf/application.properties',
@@ -76,10 +76,10 @@ class TestMetadataServer(RMFTestCase):
                                 group='hadoop',
                                 mode=0644,
       )
-      self.assertResourceCalled('File', '/etc/atlas/conf/metadata-env.sh',
+      self.assertResourceCalled('File', '/etc/atlas/conf/atlas-env.sh',
                                 content=InlineTemplate(
                                     self.getConfig()['configurations'][
-                                        'metadata-env']['content']),
+                                        'atlas-env']['content']),
                                 owner='atlas',
                                 group='hadoop',
                                 mode=0755,
@@ -120,8 +120,8 @@ class TestMetadataServer(RMFTestCase):
                        target = RMFTestCase.TARGET_COMMON_SERVICES
     )
     self.configureResourcesCalled()
-    self.assertResourceCalled('Execute', 'source /etc/atlas/conf/metadata-env.sh ; /usr/hdp/current/atlas-server/bin/metadata_start.py
--port 21000',
-                              not_if = 'ls /var/run/atlas/metadata.pid >/dev/null 2>&1
&& ps -p `cat /var/run/atlas/metadata.pid` >/dev/null 2>&1',
+    self.assertResourceCalled('Execute', 'source /etc/atlas/conf/atlas-env.sh ; /usr/hdp/current/atlas-server/bin/atlas_start.py
--port 21000',
+                              not_if = 'ls /var/run/atlas/atlas.pid >/dev/null 2>&1
&& ps -p `cat /var/run/atlas/atlas.pid` >/dev/null 2>&1',
                               user = 'atlas',
     )
 
@@ -133,8 +133,8 @@ class TestMetadataServer(RMFTestCase):
                        hdp_stack_version = self.STACK_VERSION,
                        target = RMFTestCase.TARGET_COMMON_SERVICES
     )
-    self.assertResourceCalled('Execute', 'source /etc/atlas/conf/metadata-env.sh; /usr/hdp/current/atlas-server/bin/metadata_stop.py',
+    self.assertResourceCalled('Execute', 'source /etc/atlas/conf/atlas-env.sh; /usr/hdp/current/atlas-server/bin/atlas_stop.py',
                               user = 'atlas',
     )
-    self.assertResourceCalled('Execute', 'rm -f /var/run/atlas/metadata.pid',
+    self.assertResourceCalled('Execute', 'rm -f /var/run/atlas/atlas.pid',
     )

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-server/src/test/python/stacks/2.3/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.json b/ambari-server/src/test/python/stacks/2.3/configs/default.json
index 1df1643..688065c 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/default.json
@@ -161,29 +161,29 @@
         "log.retention.hours": "168"
       },
       "application-properties": {
-        "metadata.graph.storage.backend": "berkeleyje",
-        "metadata.graph.storage.directory": "data/berkley",
-        "metadata.graph.index.search.backend": "elasticsearch",
-        "metadata.graph.index.search.directory": "data/es",
-        "metadata.graph.index.search.elasticsearch.client-only": false,
-        "metadata.graph.index.search.elasticsearch.local-mode": true,
-        "metadata.lineage.hive.table.type.name": "Table",
-        "metadata.lineage.hive.column.type.name": "Column",
-        "metadata.lineage.hive.table.column.name": "columns",
-        "metadata.lineage.hive.process.type.name": "LoadProcess",
-        "metadata.lineage.hive.process.inputs.name": "inputTables",
-        "metadata.lineage.hive.process.outputs.name": "outputTables",
-        "metadata.enableTLS": false,
-        "metadata.authentication.method": "simple",
-        "metadata.authentication.principal": "atlas",
-        "metadata.authentication.keytab": "/etc/security/keytabs/atlas.service.keytab",
-        "metadata.http.authentication.enabled": false,
-        "metadata.http.authentication.type": "simple",
-        "metadata.http.authentication.kerberos.principal": "HTTP/_HOST@EXAMPLE.COM",
-        "metadata.http.authentication.kerberos.keytab": "/etc/security/keytabs/spnego.service.keytab",
-        "metadata.http.authentication.kerberos.name.rules": "DEFAULT"
+        "atlas.graph.storage.backend": "berkeleyje",
+        "atlas.graph.storage.directory": "data/berkley",
+        "atlas.graph.index.search.backend": "elasticsearch",
+        "atlas.graph.index.search.directory": "data/es",
+        "atlas.graph.index.search.elasticsearch.client-only": false,
+        "atlas.graph.index.search.elasticsearch.local-mode": true,
+        "atlas.lineage.hive.table.type.name": "Table",
+        "atlas.lineage.hive.column.type.name": "Column",
+        "atlas.lineage.hive.table.column.name": "columns",
+        "atlas.lineage.hive.process.type.name": "LoadProcess",
+        "atlas.lineage.hive.process.inputs.name": "inputTables",
+        "atlas.lineage.hive.process.outputs.name": "outputTables",
+        "atlas.enableTLS": false,
+        "atlas.authentication.method": "simple",
+        "atlas.authentication.principal": "atlas",
+        "atlas.authentication.keytab": "/etc/security/keytabs/atlas.service.keytab",
+        "atlas.http.authentication.enabled": false,
+        "atlas.http.authentication.type": "simple",
+        "atlas.http.authentication.kerberos.principal": "HTTP/_HOST@EXAMPLE.COM",
+        "atlas.http.authentication.kerberos.keytab": "/etc/security/keytabs/spnego.service.keytab",
+        "atlas.http.authentication.kerberos.name.rules": "DEFAULT"
       },
-      "metadata-env": {
+      "atlas-env": {
         "content": "# The java implementation to use. If JAVA_HOME is not found we expect
java and jar to be in path\nexport JAVA_HOME={{java64_home}}\n# any additional java opts you
want to set. This will apply to both client and server operations\nexport METADATA_OPTS={{metadata_opts}}\n#
metadata configuration directory\nexport METADATA_CONF={{conf_dir}}\n# Where log files are
stored. Defatult is logs directory under the base install location\nexport METADATA_LOG_DIR={{log_dir}}\n#
additional classpath entries\nexport METADATACPPATH={{metadata_classpath}}\n# data dir\nexport
METADATA_DATA_DIR={{data_dir}}\n# Where do you want to expand the war file. By Default it
is in /server/webapp dir under the base install dir.\nexport METADATA_EXPANDED_WEBAPP_DIR={{expanded_war_dir}}",
         "metadata_user": "atlas",
         "metadata_port": 21000,

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8d8e123/ambari-web/app/models/quick_links.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js
index f4a86d4..9426423 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -333,7 +333,7 @@ App.QuickLinks.FIXTURES = [
     template:'%@://%@:%@/dashboard/index.html?user.name=%@',
     http_config: 'metadata_port',
     https_config: 'metadata_port',
-    site: 'metadata-env',
+    site: 'atlas-env',
     regex: '^(\\d+)$',
     default_http_port: 21000,
     default_https_port: 21443


Mime
View raw message