Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A75717DC1 for ; Fri, 6 Feb 2015 22:54:09 +0000 (UTC) Received: (qmail 15726 invoked by uid 500); 6 Feb 2015 22:54:09 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 15692 invoked by uid 500); 6 Feb 2015 22:54:09 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 15681 invoked by uid 99); 6 Feb 2015 22:54:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Feb 2015 22:54:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 036DCE01CE; Fri, 6 Feb 2015 22:54:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: srimanth@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-9469. TEZ Ambari view fixes (Sreenath Somarajapuram via srimanth) Date: Fri, 6 Feb 2015 22:54:09 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk bb28c88d9 -> 655e1e81b AMBARI-9469. TEZ Ambari view fixes (Sreenath Somarajapuram via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/655e1e81 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/655e1e81 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/655e1e81 Branch: refs/heads/trunk Commit: 655e1e81b7054824f0a308fe890a4ba3b27040c1 Parents: bb28c88 Author: Srimanth Gunturi Authored: Fri Feb 6 14:53:33 2015 -0800 Committer: Srimanth Gunturi Committed: Fri Feb 6 14:53:33 2015 -0800 ---------------------------------------------------------------------- contrib/views/tez/pom.xml | 20 +++++++++++++++++++- contrib/views/tez/readme.md | 4 ++-- .../apache/ambari/view/tez/ViewController.java | 2 +- .../resources/ui/scripts/init-ambari-view.js | 2 +- contrib/views/tez/src/main/resources/view.xml | 10 +++++----- 5 files changed, 28 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/655e1e81/contrib/views/tez/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/tez/pom.xml b/contrib/views/tez/pom.xml index cd1f1b2..9ad8aa7 100644 --- a/contrib/views/tez/pom.xml +++ b/contrib/views/tez/pom.xml @@ -103,6 +103,24 @@ + + + org.vafer + jdeb + 1.0.1 + + + none + + jdeb + + + + + true + false + + @@ -117,7 +135,7 @@ src/main/resources - false + true WEB-INF/web.xml META-INF/**/* http://git-wip-us.apache.org/repos/asf/ambari/blob/655e1e81/contrib/views/tez/readme.md ---------------------------------------------------------------------- diff --git a/contrib/views/tez/readme.md b/contrib/views/tez/readme.md index 1a53a3b..99ef53c 100644 --- a/contrib/views/tez/readme.md +++ b/contrib/views/tez/readme.md @@ -81,8 +81,8 @@ From the Ambari Administration interface, create a TEZ view instance. | Details: Instance Name | TEZUI | | Details: Display Name | TEZ | | Details: Description | A web interface for TEZ | -| Properties: yarn.ats.url | http://yarn.ats.address:8188 | -| Properties: yarn.resourcemanager.url | http://yarn.resourcemanager.address:8088 | +| Properties: yarn.timeline-server.url | http://yarn.timeline-service.hostname:8188 | +| Properties: yarn.resourcemanager.url | http://yarn.resourcemanager.hostname:8088 | Login to Ambari as **"admin"** and browse to the view instance. http://git-wip-us.apache.org/repos/asf/ambari/blob/655e1e81/contrib/views/tez/src/main/java/org/apache/ambari/view/tez/ViewController.java ---------------------------------------------------------------------- diff --git a/contrib/views/tez/src/main/java/org/apache/ambari/view/tez/ViewController.java b/contrib/views/tez/src/main/java/org/apache/ambari/view/tez/ViewController.java index a72e9ce..70876db 100644 --- a/contrib/views/tez/src/main/java/org/apache/ambari/view/tez/ViewController.java +++ b/contrib/views/tez/src/main/java/org/apache/ambari/view/tez/ViewController.java @@ -26,7 +26,7 @@ import com.google.inject.ImplementedBy; @ImplementedBy(ViewControllerImpl.class) public interface ViewController { - public static final String PARAM_YARN_ATS_URL = "yarn.ats.url"; + public static final String PARAM_YARN_ATS_URL = "yarn.timeline-server.url"; public static final String PARAM_YARN_RESOURCEMANAGER_URL = "yarn.resourcemanager.url"; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/655e1e81/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js ---------------------------------------------------------------------- diff --git a/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js b/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js index 8c242b1..8c4856f 100644 --- a/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js +++ b/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js @@ -40,7 +40,7 @@ App.Helpers.ambari = (function () { /** * Key for the property representing ATS url. */ - TIMELINE_URL: 'yarn.ats.url', + TIMELINE_URL: 'yarn.timeline-server.url', RM_URL: 'yarn.resourcemanager.url', /** http://git-wip-us.apache.org/repos/asf/ambari/blob/655e1e81/contrib/views/tez/src/main/resources/view.xml ---------------------------------------------------------------------- diff --git a/contrib/views/tez/src/main/resources/view.xml b/contrib/views/tez/src/main/resources/view.xml index 94af8f1..33a1c40 100644 --- a/contrib/views/tez/src/main/resources/view.xml +++ b/contrib/views/tez/src/main/resources/view.xml @@ -17,19 +17,19 @@ limitations under the License. Kerberos, LDAP, Custom. Binary/Htt TEZ TEZ View - 0.6.0 + ${tez.view.version} - yarn.ats.url + yarn.timeline-server.url The URL to the YARN Application Timeline Server, used to provide TEZ information. Typically this is the yarn.timeline-service.webapp.address property in the yarn-site.xml configuration. Url must be accessible from Ambari server. - YARN ATS URL - http://yarn.ats.address:8188 + YARN Timeline Server URL + http://yarn.timeline-service.hostname:8188 true yarn.resourcemanager.url The URL to the YARN ResourceManager, used to provide YARN Application data. Typically this is the yarn.resourcemanager.webapp.address property in the yarn-site.xml configuration. Url must be accessible from Ambari server. YARN ResourceManager URL - http://yarn.resourcemanager.address:8088 + http://yarn.resourcemanager.hostname:8088 true