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-20451 Storm Ambari view fails with SSL enabled Storm UI. (Sanket Shah via Sriharsha Chintalapani).
Date Thu, 16 Mar 2017 17:18:41 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 5148141a5 -> b992fc8b4


AMBARI-20451 Storm Ambari view fails with SSL enabled Storm UI. (Sanket
Shah via Sriharsha Chintalapani).


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

Branch: refs/heads/branch-2.5
Commit: b992fc8b4bc1dd04966b3aa380d8275ed5a5e6ee
Parents: 5148141
Author: Sriharsha Chintalapani <harsha@hortonworks.com>
Authored: Tue Mar 14 15:01:05 2017 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Thu Mar 16 10:17:05 2017 -0700

----------------------------------------------------------------------
 contrib/views/storm/src/main/resources/scripts/utils/Utils.js | 2 +-
 contrib/views/storm/src/main/resources/view.xml               | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b992fc8b/contrib/views/storm/src/main/resources/scripts/utils/Utils.js
----------------------------------------------------------------------
diff --git a/contrib/views/storm/src/main/resources/scripts/utils/Utils.js b/contrib/views/storm/src/main/resources/scripts/utils/Utils.js
index 8b329c5..05f992b 100644
--- a/contrib/views/storm/src/main/resources/scripts/utils/Utils.js
+++ b/contrib/views/storm/src/main/resources/scripts/utils/Utils.js
@@ -38,7 +38,7 @@ define(['require',
             success: function(response){
                 var props = response.ViewInstanceInfo.properties;
                 if(props['storm.host'] && props['storm.port']){
-                    url += "http://"+props['storm.host']+":"+props['storm.port'];
+                    url += (props['storm.sslEnabled'] === "true" ? "https://" : "http://")+props['storm.host']+":"+props['storm.port'];
                 } else {
                     Utils.notifyError("Failed to get storm hostname and port.");
                 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/b992fc8b/contrib/views/storm/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/contrib/views/storm/src/main/resources/view.xml b/contrib/views/storm/src/main/resources/view.xml
index e2c1a3c..0e83ec2 100644
--- a/contrib/views/storm/src/main/resources/view.xml
+++ b/contrib/views/storm/src/main/resources/view.xml
@@ -34,4 +34,11 @@ limitations under the License. Kerberos, LDAP, Custom. Binary/Htt
 	<placeholder>8744</placeholder>
 	<required>true</required>
   </parameter>
+  <parameter>
+	<name>storm.sslEnabled</name>
+	<description>Enter true if SSL is enabled for Storm else false.</description>
+	<label>SSL Enabled</label>
+	<default-value>false</default-value>
+	<required>true</required>
+  </parameter>
 </view>


Mime
View raw message