Sfoglia il codice sorgente

AMBARI-9530. After upgrade to 1.7, Ambari is not longer honor ganglia/nagios with https (jaimin via srimanth)

Srimanth Gunturi 10 anni fa
parent
commit
b9a06522ef

+ 1 - 1
ambari-web/app/views/common/quick_view_link_view.js

@@ -298,7 +298,7 @@ App.QuickViewLinks = Em.View.extend({
     }
     switch (service_id) {
       case "GANGLIA":
-        return (ambariProperties && ambariProperties['ganglia.https'] == true) ? "https" : "http";
+        return (ambariProperties && ambariProperties['ganglia.https'] == "true") ? "https" : "http";
         break;
       case "YARN":
         var yarnProperties = configProperties && configProperties.findProperty('type', 'yarn-site');

+ 2 - 2
ambari-web/test/views/common/quick_link_view_test.js

@@ -25,8 +25,8 @@ describe('App.QuickViewLinks', function () {
 
   describe('#setProtocol', function() {
     var tests = [
-      { serviceName: "GANGLIA", ambariProperties: { 'ganglia.https': true }, m: "https for ganglia", result: "https" },
-      { serviceName: "GANGLIA", ambariProperties: { 'ganglia.https': false }, m: "http for ganglia 1", result: "http" },
+      { serviceName: "GANGLIA", ambariProperties: { 'ganglia.https': 'true' }, m: "https for ganglia", result: "https" },
+      { serviceName: "GANGLIA", ambariProperties: { 'ganglia.https': 'false' }, m: "http for ganglia 1", result: "http" },
       { serviceName: "GANGLIA", m: "http for ganglia 2", result: "http" },
       { serviceName: "YARN", configProperties: [
         { type: 'yarn-site', properties: { 'yarn.http.policy': 'HTTPS_ONLY' }}