Merge pull request #1968 from jcantrill/bz1480988_fix_ops_kibana

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/directives/logViewer.js

@@ -431,7 +431,7 @@ angular.module('openshiftConsole')
             // Kibana archives -------------------------------------------------
 
             APIDiscovery
-              .getLoggingURL()
+              .getLoggingURL($scope.context.project)
               .then(function(url) {
                 var projectName = _.get($scope.context, 'project.metadata.name');
                 var containerName = _.get($scope.options, 'container');

app/scripts/services/discovery.js

@@ -1,12 +1,18 @@
 'use strict';
 
 angular.module('openshiftConsole')
-  .factory('APIDiscovery', ['LOGGING_URL', 'METRICS_URL', '$q', function(LOGGING_URL, METRICS_URL, $q) {
+  .factory('APIDiscovery', ['LOGGING_URL', 'METRICS_URL', '$q', '$filter', function(LOGGING_URL, METRICS_URL, $q, $filter) {
     return {
       // Simulate asynchronous requests for now. If these are ever updated to call to a discovery
       // endpoint, we need to make sure to trigger a digest loop using (or update all callers).
-      getLoggingURL: function() {
-        return $q.when(LOGGING_URL);
+      getLoggingURL: function(project) {
+        var loggingURL = LOGGING_URL;
+        var loggingUIHostname = $filter('annotation')(project, 'loggingUIHostname');
+        if(loggingUIHostname) {
+           loggingURL = 'https://' + loggingUIHostname;
+        }
+
+        return $q.when(loggingURL);
       },
       getMetricsURL: function() {
         return $q.when(METRICS_URL);

dist/scripts/scripts.js

@@ -1274,10 +1274,11 @@ loadJSON: function(t, n) {
 return JSON.parse(e[t].getItem("openshift/" + n) || "{}");
 }
 };
-} ]), angular.module("openshiftConsole").factory("APIDiscovery", [ "LOGGING_URL", "METRICS_URL", "$q", function(e, t, n) {
+} ]), angular.module("openshiftConsole").factory("APIDiscovery", [ "LOGGING_URL", "METRICS_URL", "$q", "$filter", function(e, t, n, a) {
 return {
-getLoggingURL: function() {
-return n.when(e);
+getLoggingURL: function(t) {
+var r = e, o = a("annotation")(t, "loggingUIHostname");
+return o && (r = "https://" + o), n.when(r);
 },
 getMetricsURL: function() {
 return n.when(t);
@@ -11338,7 +11339,7 @@ autoScrollActive: !1
 });
 });
 };
-if (s.getLoggingURL().then(function(a) {
+if (s.getLoggingURL(t.context.project).then(function(a) {
 var r = _.get(t.context, "project.metadata.name"), i = _.get(t.options, "container");
 r && i && C && a && (angular.extend(t, {
 kibanaAuthUrl: e.trustAsResourceUrl(URI(a).segment("auth").segment("token").normalizePathname().toString()),