You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2017/03/14 23:40:53 UTC
ambari git commit: AMBARI-20451 Storm Ambari view fails with SSL
enabled Storm UI. (Sanket Shah via Sriharsha Chintalapani).
Repository: ambari
Updated Branches:
refs/heads/trunk 7e624b55c -> 3c9ebb685
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/3c9ebb68
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3c9ebb68
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3c9ebb68
Branch: refs/heads/trunk
Commit: 3c9ebb685ba4e129943f5851db10a9b2680cf1ee
Parents: 7e624b5
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Tue Mar 14 15:01:05 2017 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Tue Mar 14 16:40:46 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/3c9ebb68/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/3c9ebb68/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>