ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject ambari git commit: AMBARI-9469. TEZ Ambari view fixes (Sreenath Somarajapuram via srimanth)
Date Fri, 06 Feb 2015 22:54:09 GMT
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 <sgunturi@hortonworks.com>
Authored: Fri Feb 6 14:53:33 2015 -0800
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
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 @@
          </execution>
        </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.vafer</groupId>
+        <artifactId>jdeb</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <execution>
+            <phase>none</phase>
+            <goals>
+              <goal>jdeb</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <skip>true</skip>
+          <submodules>false</submodules>
+        </configuration>
+      </plugin>
     </plugins>
 
     <resources>
@@ -117,7 +135,7 @@
 
       <resource>
         <directory>src/main/resources</directory>
-        <filtering>false</filtering>
+        <filtering>true</filtering>
         <includes>
           <include>WEB-INF/web.xml</include>
           <include>META-INF/**/*</include>

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
 <view>
   <name>TEZ</name>
   <label>TEZ View</label>
-  <version>0.6.0</version>
+  <version>${tez.view.version}</version>
   <parameter>
-    <name>yarn.ats.url</name>
+    <name>yarn.timeline-server.url</name>
     <description>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.</description>
-    <label>YARN ATS URL</label>
-    <placeholder>http://yarn.ats.address:8188</placeholder>
+    <label>YARN Timeline Server URL</label>
+    <placeholder>http://yarn.timeline-service.hostname:8188</placeholder>
     <required>true</required>
   </parameter>
   <parameter>
     <name>yarn.resourcemanager.url</name>
     <description>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.</description>
     <label>YARN ResourceManager URL</label>
-    <placeholder>http://yarn.resourcemanager.address:8088</placeholder>
+    <placeholder>http://yarn.resourcemanager.hostname:8088</placeholder>
     <required>true</required>
   </parameter>
   <!-- The status resource exists to show the subset of properties that any user is allowed
to see, not just an admin user. -->


Mime
View raw message