ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject ambari git commit: AMBARI-12773. Ranger quick link in Ambari 2.1.0 with HDP-2.2 does not track the http, https port value.(XIWANG)
Date Mon, 17 Aug 2015 19:51:43 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 f8a0c4c19 -> d5bf22f25


AMBARI-12773. Ranger quick link in Ambari 2.1.0 with HDP-2.2 does not track the http, https
port value.(XIWANG)


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

Branch: refs/heads/branch-2.1
Commit: d5bf22f25e97c1dd1dd95e43843b1aafb0ce9668
Parents: f8a0c4c
Author: Xi Wang <xiwang@apache.org>
Authored: Fri Aug 14 14:50:30 2015 -0700
Committer: Xi Wang <xiwang@apache.org>
Committed: Mon Aug 17 12:51:23 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/models/quick_links.js                | 8 ++++----
 ambari-web/app/views/common/quick_view_link_view.js | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d5bf22f2/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 24b5815..b1f95d6 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -297,13 +297,13 @@ App.QuickLinks.FIXTURES = [
   {
     id: 33,
     label:'Ranger Admin UI',
-    url:'%@://%@:6080/',
+    url:'%@://%@:%@/',
     service_id: 'RANGER',
     template:'%@://%@:%@/',
-    http_config: 'ranger.service.http.port',
-    https_config: 'ranger.service.https.port',
+    http_config: 'http.service.port',
+    https_config: 'https.service.port',
     regex: '(\\d*)+',
-    site: 'ranger-admin-site',
+    site: 'ranger-site',
     default_http_port: 6080,
     default_https_port: 6182
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/d5bf22f2/ambari-web/app/views/common/quick_view_link_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js
index 5065752..56bc0b2 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -75,7 +75,7 @@ App.QuickViewLinks = Em.View.extend({
   /**
    * list of files that contains properties for enabling/disabling ssl
    */
-  requiredSiteNames: ['hadoop-env','yarn-env','hbase-env','oozie-env','mapred-env','storm-env',
'falcon-env', 'core-site', 'hdfs-site', 'hbase-site', 'oozie-site', 'yarn-site', 'mapred-site',
'storm-site', 'spark-defaults', 'accumulo-site', 'application-properties', 'ranger-admin-site'],
+  requiredSiteNames: ['hadoop-env','yarn-env','hbase-env','oozie-env','mapred-env','storm-env',
'falcon-env', 'core-site', 'hdfs-site', 'hbase-site', 'oozie-site', 'yarn-site', 'mapred-site',
'storm-site', 'spark-defaults', 'accumulo-site', 'application-properties', 'ranger-site'],
   /**
    * Get public host name by its host name.
    *
@@ -379,8 +379,8 @@ App.QuickViewLinks = Em.View.extend({
         return "http";
         break;
       case "RANGER":
-        var rangerProperties = configProperties && configProperties.findProperty('type',
'ranger-admin-site');
-        if (rangerProperties && rangerProperties.properties && rangerProperties.properties['ranger.service.https.attrib.ssl.enabled']
== "true") {
+        var rangerProperties = configProperties && configProperties.findProperty('type',
'ranger-site');
+        if (rangerProperties && rangerProperties.properties && rangerProperties.properties['HTTP_ENABLED']
== "false") {
           return "https";
         } else {
           return "http";
@@ -433,6 +433,7 @@ App.QuickViewLinks = Em.View.extend({
       case "falcon":
       case "accumulo":
       case "atlas":
+      case "ranger":
         return "_blank";
         break;
       default:


Mime
View raw message