ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject [1/2] ambari git commit: AMBARI-12007. Some atlas configuration properties were added, some modified, and the quick link URI changed (Jon Maron via smohanty)
Date Fri, 19 Jun 2015 14:08:49 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 2c3545189 -> 9a50d5658


AMBARI-12007. Some atlas configuration properties were added, some modified, and the quick
link URI changed (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/a91b56b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a91b56b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a91b56b6

Branch: refs/heads/branch-2.1
Commit: a91b56b649a06a5cfb86cf671dcd67e769bfbb98
Parents: 2c35451
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Thu Jun 18 14:21:23 2015 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Fri Jun 19 07:07:19 2015 -0700

----------------------------------------------------------------------
 .../configuration/application-properties.xml    |  16 +-
 ambari-web/app/models/quick_links.js            |   4 +-
 ambari-web/app/models/quick_links.js.orig       | 348 +++++++++++++++++++
 3 files changed, 358 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a91b56b6/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 1a9eb8b..386fbdc 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
@@ -51,32 +51,32 @@
   </property>
   <property>
     <name>atlas.lineage.hive.table.type.name</name>
-    <value>Table</value>
+    <value>DataSet</value>
     <description></description>
   </property>
   <property>
-    <name>atlas.lineage.hive.column.type.name</name>
-    <value>Column</value>
+    <name>atlas.lineage.hive.table.schema.query.hive_table</name>
+    <value>hive_table where name='%s'\, columns</value>
     <description></description>
   </property>
   <property>
-    <name>atlas.lineage.hive.table.column.name</name>
-    <value>columns</value>
+    <name>atlas.lineage.hive.table.schema.query.Table</name>
+    <value>Table where name='%s'\, columns</value>
     <description></description>
   </property>
   <property>
     <name>atlas.lineage.hive.process.type.name</name>
-    <value>LoadProcess</value>
+    <value>Process</value>
     <description></description>
   </property>
   <property>
     <name>atlas.lineage.hive.process.inputs.name</name>
-    <value>inputTables</value>
+    <value>inputs</value>
     <description></description>
   </property>
   <property>
     <name>atlas.lineage.hive.process.outputs.name</name>
-    <value>outputTables</value>
+    <value>outputs</value>
     <description></description>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a91b56b6/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 4975488..24b5815 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -334,9 +334,9 @@ App.QuickLinks.FIXTURES = [
   {
     id:36,
     label:'Atlas Dashboard',
-    url:'%@://%@:%@/dashboard/index.html?user.name=%@',
+    url:'%@://%@:%@/#!/search?user.name=%@',
     service_id: 'ATLAS',
-    template:'%@://%@:%@/dashboard/index.html?user.name=%@',
+    template:'%@://%@:%@/#!/search?user.name=%@',
     http_config: 'metadata_port',
     https_config: 'metadata_port',
     site: 'atlas-env',

http://git-wip-us.apache.org/repos/asf/ambari/blob/a91b56b6/ambari-web/app/models/quick_links.js.orig
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/quick_links.js.orig b/ambari-web/app/models/quick_links.js.orig
new file mode 100644
index 0000000..4975488
--- /dev/null
+++ b/ambari-web/app/models/quick_links.js.orig
@@ -0,0 +1,348 @@
+/**
+ * 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.
+ */
+
+var App = require('app');
+var portRegex = '\\w*:(\\d+)';
+
+App.QuickLinks = DS.Model.extend({
+  label: DS.attr('string'),
+  url: DS.attr('string'),
+  service_id: DS.attr('string'),
+  template: DS.attr('string'),
+  http_config: DS.attr('string'),
+  https_config: DS.attr('string'),
+  site: DS.attr('string'),
+  regex: DS.attr('string'),
+  default_http_port: DS.attr('number'),
+  default_https_port: DS.attr('number')
+});
+
+
+App.QuickLinks.FIXTURES = [
+  {
+    id:1,
+    label:'NameNode UI',
+    url:'%@://%@:%@',
+    service_id: 'HDFS',
+    template:'%@://%@:%@',
+    http_config: 'dfs.namenode.http-address',
+    https_config: 'dfs.namenode.https-address',
+    site: 'hdfs-site',
+    regex: portRegex,
+    default_http_port: 50070,
+    default_https_port: 50470
+  },
+  {
+    id:2,
+    label:'NameNode logs',
+    url:'%@://%@:%@/logs',
+    service_id: 'HDFS',
+    template:'%@://%@:%@/logs',
+    http_config: 'dfs.namenode.http-address',
+    https_config: 'dfs.namenode.https-address',
+    site: 'hdfs-site',
+    regex: portRegex,
+    default_http_port: 50070,
+    default_https_port: 50470
+  },
+  {
+    id:3,
+    label:'NameNode JMX',
+    url:'%@://%@:%@/jmx',
+    service_id: 'HDFS',
+    template:'%@://%@:%@/jmx',
+    http_config: 'dfs.namenode.http-address',
+    https_config: 'dfs.namenode.https-address',
+    site: 'hdfs-site',
+    regex: portRegex,
+    default_http_port: 50070,
+    default_https_port: 50470
+  },
+  {
+    id:4,
+    label:'Thread Stacks',
+    url:'%@://%@:%@/stacks',
+    service_id: 'HDFS',
+    template:'%@://%@:%@/stacks',
+    http_config: 'dfs.namenode.http-address',
+    https_config: 'dfs.namenode.https-address',
+    site: 'hdfs-site',
+    regex: portRegex,
+    default_http_port: 50070,
+    default_https_port: 50470
+  },
+  {
+    id:13,
+    label:'HBase Master UI',
+    url:'%@://%@:%@/master-status',
+    service_id: 'HBASE',
+    template:'%@://%@:%@/master-status',
+    http_config: 'hbase.master.info.port',
+    site: 'hbase-site',
+    regex: '^(\\d+)$',
+    default_http_port: 60010
+  },
+  {
+    id:14,
+    label:'HBase Logs',
+    url:'%@://%@:60010/logs',
+    service_id: 'HBASE',
+    template:'%@://%@:%@/logs',
+    http_config: 'hbase.master.info.port',
+    site: 'hbase-site',
+    regex: '^(\\d+)$',
+    default_http_port: 60010
+  },
+  {
+    id:15,
+    label:'Zookeeper Info',
+    url:'%@://%@:60010/zk.jsp',
+    service_id: 'HBASE',
+    template:'%@://%@:%@/zk.jsp',
+    http_config: 'hbase.master.info.port',
+    site: 'hbase-site',
+    regex: '^(\\d+)$',
+    default_http_port: 60010
+  },
+  {
+    id:16,
+    label:'HBase Master JMX',
+    url:'%@://%@:60010/jmx',
+    service_id: 'HBASE',
+    template:'%@://%@:%@/jmx',
+    http_config: 'hbase.master.info.port',
+    site: 'hbase-site',
+    regex: '^(\\d+)$',
+    default_http_port: 60010
+  },
+  {
+    id:17,
+    label:'Debug Dump',
+    url:'%@://%@:%@/dump',
+    service_id: 'HBASE',
+    template:'%@://%@:%@/dump',
+    http_config: 'hbase.master.info.port',
+    site: 'hbase-site',
+    regex: '^(\\d+)$',
+    default_http_port: 60010
+  },
+  {
+    id:18,
+    label:'Thread Stacks',
+    url:'%@://%@:%@/stacks',
+    service_id: 'HBASE',
+    template:'%@://%@:%@/stacks',
+    http_config: 'hbase.master.info.port',
+    site: 'hbase-site',
+    regex: '^(\\d+)$',
+    default_http_port: 60010
+  },
+  {
+    id:19,
+    label:'Oozie Web UI',
+    url:'%@://%@:%@/oozie?user.name=%@',
+    service_id: 'OOZIE',
+    template:'%@://%@:%@/oozie?user.name=%@',
+    http_config: 'oozie.base.url',
+    site: 'oozie-site',
+    regex: portRegex,
+    default_http_port: 11000
+  },
+  {
+    id:20,
+    label:'Ganglia Web UI',
+    url:'%@://%@/ganglia',
+    service_id: 'GANGLIA',
+    template:'%@://%@/ganglia'
+
+  },
+  {
+    id:23,
+    label:'ResourceManager UI',
+    url:'%@://%@:%@',
+    service_id: 'YARN',
+    template:'%@://%@:%@',
+    http_config: 'yarn.resourcemanager.webapp.address',
+    https_config: 'yarn.resourcemanager.webapp.https.address',
+    site: 'yarn-site',
+    regex: portRegex,
+    default_http_port: 8088,
+    default_https_port: 8090
+
+  },
+  {
+    id:24,
+    label:'ResourceManager logs',
+    url:'%@://%@:%@/logs',
+    service_id: 'YARN',
+    template:'%@://%@:%@/logs',
+    http_config: 'yarn.resourcemanager.webapp.address',
+    https_config: 'yarn.resourcemanager.webapp.https.address',
+    site: 'yarn-site',
+    regex: portRegex,
+    default_http_port: 8088,
+    default_https_port: 8090
+  },
+  {
+    id:25,
+    label:'ResourceManager JMX',
+    url:'%@://%@:%@/jmx',
+    service_id: 'YARN',
+    template:'%@://%@:%@/jmx',
+    http_config: 'yarn.resourcemanager.webapp.address',
+    https_config: 'yarn.resourcemanager.webapp.https.address',
+    site: 'yarn-site',
+    regex: portRegex,
+    default_http_port: 8088,
+    default_https_port: 8090
+  },
+  {
+    id:26,
+    label:'Thread Stacks',
+    url:'%@://%@:%@/stacks',
+    service_id: 'YARN',
+    template:'%@://%@:%@/stacks',
+    http_config: 'yarn.resourcemanager.webapp.address',
+    https_config: 'yarn.resourcemanager.webapp.https.address',
+    site: 'yarn-site',
+    regex: portRegex,
+    default_http_port: 8088,
+    default_https_port: 8090
+  },
+  {
+    id:27,
+    label:'JobHistory UI',
+    url:'%@://%@:%@',
+    service_id: 'MAPREDUCE2',
+    template:'%@://%@:%@',
+    http_config: 'mapreduce.jobhistory.webapp.address',
+    https_config: 'mapreduce.jobhistory.webapp.https.address',
+    site: 'mapred-site',
+    regex: portRegex,
+    default_http_port: 19888
+  },
+  {
+    id:28,
+    label:'JobHistory logs',
+    url:'%@://%@:%@/logs',
+    service_id: 'MAPREDUCE2',
+    template:'%@://%@:%@/logs',
+    http_config: 'mapreduce.jobhistory.webapp.address',
+    https_config: 'mapreduce.jobhistory.webapp.https.address',
+    site: 'mapred-site',
+    regex: portRegex,
+    default_http_port: 19888
+  },
+  {
+    id:29,
+    label:'JobHistory JMX',
+    url:'%@://%@:%@/jmx',
+    service_id: 'MAPREDUCE2',
+    template:'%@://%@:%@/jmx',
+    http_config: 'mapreduce.jobhistory.webapp.address',
+    https_config: 'mapreduce.jobhistory.webapp.https.address',
+    site: 'mapred-site',
+    regex: portRegex,
+    default_http_port: 19888
+  },
+  {
+    id:30,
+    label:'Thread Stacks',
+    url:'%@://%@:%@/stacks',
+    service_id: 'MAPREDUCE2',
+    template:'%@://%@:%@/stacks',
+    http_config: 'mapreduce.jobhistory.webapp.address',
+    https_config: 'mapreduce.jobhistory.webapp.https.address',
+    site: 'mapred-site',
+    regex: portRegex,
+    default_http_port: 19888
+  },
+  {
+    id:31,
+    label:'Storm UI',
+    url:'%@://%@:%@/',
+    service_id: 'STORM',
+    template:'%@://%@:%@/',
+    http_config: 'ui.port',
+    site: 'storm-site',
+    regex: '^(\\d+)$',
+    default_http_port: 8744
+  },
+  {
+    id:32,
+    label:'Falcon Web UI',
+    url:'%@://%@:%@/index.html?user.name=%@',
+    service_id: 'FALCON',
+    template:'%@://%@:%@/index.html?user.name=%@',
+    http_config: 'falcon_port',
+    site: 'falcon-env',
+    regex: '^(\\d+)$',
+    default_http_port: 15000
+  },
+  {
+    id: 33,
+    label:'Ranger Admin UI',
+    url:'%@://%@:6080/',
+    service_id: 'RANGER',
+    template:'%@://%@:%@/',
+    http_config: 'ranger.service.http.port',
+    https_config: 'ranger.service.https.port',
+    regex: '(\\d*)+',
+    site: 'ranger-admin-site',
+    default_http_port: 6080,
+    default_https_port: 6182
+  },
+  {
+    id: 34,
+    label:'Spark History Server UI',
+    url:'%@://%@:%@/',
+    service_id: 'SPARK',
+    template:'%@://%@:%@/',
+    http_config: 'spark.history.ui.port',
+    site: 'spark-defaults',
+    regex: '^(\\d+)$',
+    default_http_port: 18080
+  },
+  {
+    id:35,
+    label:'Accumulo Monitor UI',
+    url:'%@://%@:%@/',
+    service_id: 'ACCUMULO',
+    template:'%@://%@:%@/',
+    http_config: 'monitor.port.client',
+    https_config: 'monitor.port.client',
+    site: 'accumulo-site',
+    regex: '^(\\d+)$',
+    default_http_port: 50095,
+    default_https_port: 50095
+  },
+  {
+    id:36,
+    label:'Atlas Dashboard',
+    url:'%@://%@:%@/dashboard/index.html?user.name=%@',
+    service_id: 'ATLAS',
+    template:'%@://%@:%@/dashboard/index.html?user.name=%@',
+    http_config: 'metadata_port',
+    https_config: 'metadata_port',
+    site: 'atlas-env',
+    regex: '^(\\d+)$',
+    default_http_port: 21000,
+    default_https_port: 21443
+  }
+
+];


Mime
View raw message