Repository: ambari Updated Branches: refs/heads/branch-2.4 91be87c28 -> ae50dab16
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/ae50dab1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae50dab1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae50dab1 Branch: refs/heads/branch-2.4 Commit: ae50dab16458cad08956a05a541c1d71f1534fd9 Parents: 91be87c Author: Sriharsha Chintalapani <har...@hortonworks.com> Authored: Tue Mar 14 15:01:05 2017 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Mon Apr 17 17:35:00 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/ae50dab1/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/ae50dab1/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>
