Make logs view work with all pods, not only ones coming from RCs (#875)

Fixes #771

Author: bryk

src/app/backend/handler/apihandler.go

@@ -191,6 +191,18 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 		apiV1Ws.GET("/pod/{namespace}/{pod}").
 			To(apiHandler.handleGetPodDetail).
 			Writes(pod.PodDetail{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/pod/{namespace}/{pod}/container").
+			To(apiHandler.handleGetPodContainers).
+			Writes(pod.PodDetail{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/pod/{namespace}/{pod}/log").
+			To(apiHandler.handleLogs).
+			Writes(Logs{}))
+	apiV1Ws.Route(
+		apiV1Ws.GET("/pod/{namespace}/{pod}/log/{container}").
+			To(apiHandler.handleLogs).
+			Writes(Logs{}))
 
 	apiV1Ws.Route(
 		apiV1Ws.GET("/deployment").
@@ -244,15 +256,6 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient,
 			To(apiHandler.handleGetNamespaces).
 			Writes(NamespaceList{}))
 
-	apiV1Ws.Route(
-		apiV1Ws.GET("/log/{namespace}/{podId}").
-			To(apiHandler.handleLogs).
-			Writes(Logs{}))
-	apiV1Ws.Route(
-		apiV1Ws.GET("/log/{namespace}/{podId}/{container}").
-			To(apiHandler.handleLogs).
-			Writes(Logs{}))
-
 	apiV1Ws.Route(
 		apiV1Ws.GET("/event/{namespace}/{replicationController}").
 			To(apiHandler.handleEvents).
@@ -780,7 +783,7 @@ func (apiHandler *ApiHandler) handleGetSecrets(request *restful.Request, respons
 // Handles log API call.
 func (apiHandler *ApiHandler) handleLogs(request *restful.Request, response *restful.Response) {
 	namespace := request.PathParameter("namespace")
-	podId := request.PathParameter("podId")
+	podId := request.PathParameter("pod")
 	container := request.PathParameter("container")
 
 	result, err := GetPodLogs(apiHandler.client, namespace, podId, container)
@@ -791,6 +794,18 @@ func (apiHandler *ApiHandler) handleLogs(request *restful.Request, response *res
 	response.WriteHeaderAndEntity(http.StatusCreated, result)
 }
 
+func (apiHandler *ApiHandler) handleGetPodContainers(request *restful.Request, response *restful.Response) {
+	namespace := request.PathParameter("namespace")
+	podId := request.PathParameter("pod")
+
+	result, err := GetPodContainers(apiHandler.client, namespace, podId)
+	if err != nil {
+		handleInternalError(response, err)
+		return
+	}
+	response.WriteHeaderAndEntity(http.StatusCreated, result)
+}
+
 // Handles event API call.
 func (apiHandler *ApiHandler) handleEvents(request *restful.Request, response *restful.Response) {
 	namespace := request.PathParameter("namespace")

src/app/backend/resource/container/containerlogs.go

@@ -39,6 +39,29 @@ type Logs struct {
 	Container string `json:"container"`
 }
 
+// PodContainerList is a list of containers of a pod.
+type PodContainerList struct {
+	Containers []string `json:"containers"`
+}
+
+// GetPodContainers returns containers that a pod has.
+func GetPodContainers(client *client.Client, namespace, podId string) (*PodContainerList, error) {
+	log.Printf("Getting containers from %s pod in %s namespace", podId, namespace)
+
+	pod, err := client.Pods(namespace).Get(podId)
+	if err != nil {
+		return nil, err
+	}
+
+	containers := &PodContainerList{Containers: make([]string, 0)}
+
+	for _, container := range pod.Spec.Containers {
+		containers.Containers = append(containers.Containers, container.Name)
+	}
+
+	return containers, nil
+}
+
 // GetPodLogs returns logs for particular pod and container or error when occurred. When container
 // is null, logs for the first one are returned.
 func GetPodLogs(client *client.Client, namespace, podId string, container string) (*Logs, error) {

src/app/frontend/common/resource/resourcedetail.js

@@ -16,7 +16,6 @@
  * Parameters for this state.
  *
  * All properties are @exported and in sync with URL param names.
- * @final
  */
 export class StateParams {
   /**

src/app/frontend/logs/logs_state.js

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import {StateParams as ResourceStateParams} from 'common/resource/resourcedetail';
+
 /** Name of the state. Can be used in, e.g., $state.go method. */
 export const stateName = 'log';
 
@@ -21,22 +23,14 @@ export const stateName = 'log';
  * All properties are @exported and in sync with URL param names.
  * @final
  */
-export class StateParams {
+export class StateParams extends ResourceStateParams {
   /**
-   * @param {string} rcNamespace
-   * @param {string} replicationController
-   * @param {string} podId
+   * @param {string} objectNamespace
+   * @param {string} objectName
    * @param {string=} opt_container
    */
-  constructor(rcNamespace, replicationController, podId, opt_container) {
-    /** @export {string} Namespace of this Replication Controller. */
-    this.rcNamespace = rcNamespace;
-
-    /** @export {string} Name of this Replication Controller. */
-    this.replicationController = replicationController;
-
-    /** @export {string} Id of this Pod. */
-    this.podId = podId;
+  constructor(objectNamespace, objectName, opt_container) {
+    super(objectNamespace, objectName);
 
     /** @export {string|undefined} Name of this pod container. */
     this.container = opt_container;

src/app/frontend/logs/logs_stateconfig.js

@@ -17,6 +17,7 @@ import {stateName} from './logs_state';
 import LogsToolbarController from './logstoolbar/logstoolbar_controller';
 import {toolbarViewName} from '../chrome/chrome_state';
 
+import {appendDetailParamsToUrl} from 'common/resource/resourcedetail';
 import {stateName as chromeStateName} from 'chrome/chrome_state';
 
 /**
@@ -40,10 +41,10 @@ export default function stateConfig($stateProvider) {
   };
 
   $stateProvider.state(stateName, {
-    url: '/log/:rcNamespace/:replicationController/:podId/:container',
+    url: `${appendDetailParamsToUrl('/log')}/:container`,
     parent: chromeStateName,
     resolve: {
-      'replicationControllerPods': resolveReplicationControllerPods,
+      'podContainers': resolvePodContainers,
       'podLogs': resolvePodLogs,
     },
     views: views,
@@ -56,12 +57,13 @@ export default function stateConfig($stateProvider) {
  * @return {!angular.$q.Promise}
  * @ngInject
  */
-function resolveReplicationControllerPods($stateParams, $resource) {
-  let namespace = $stateParams.rcNamespace;
-  let rc = $stateParams.replicationController;
+function resolvePodLogs($stateParams, $resource) {
+  let namespace = $stateParams.objectNamespace;
+  let podId = $stateParams.objectName;
+  let container = $stateParams.container || '';
 
-  /** @type {!angular.Resource<!backendApi.ReplicationControllerPods>} */
-  let resource = $resource(`api/v1/replicationcontroller/pod/${namespace}/${rc}`);
+  /** @type {!angular.Resource<!backendApi.Logs>} */
+  let resource = $resource(`api/v1/pod/${namespace}/${podId}/log/${container}`);
 
   return resource.get().$promise;
 }
@@ -72,13 +74,12 @@ function resolveReplicationControllerPods($stateParams, $resource) {
  * @return {!angular.$q.Promise}
  * @ngInject
  */
-function resolvePodLogs($stateParams, $resource) {
-  let namespace = $stateParams.rcNamespace;
-  let podId = $stateParams.podId;
-  let container = $stateParams.container;
+function resolvePodContainers($stateParams, $resource) {
+  let namespace = $stateParams.objectNamespace;
+  let podId = $stateParams.objectName;
 
-  /** @type {!angular.Resource<!backendApi.Logs>} */
-  let resource = $resource(`api/v1/log/${namespace}/${podId}/${container}`);
+  /** @type {!angular.Resource<!backendApi.PodContainerList>} */
+  let resource = $resource(`api/v1/pod/${namespace}/${podId}/container`);
 
   return resource.get().$promise;
 }

src/app/frontend/logs/logstoolbar/logstoolbar.html

@@ -16,33 +16,17 @@
 
 <div layout="row" hide show-gt-sm layout-margin layout-align="center center"
      class="kd-logs-toolbar">
-  <span class="kd-logs-toolbar-text">Pod:</span>
-  <md-select class="kd-logs-toolbar-select" aria-label="Logs from pod" ng-model="ctrl.pod"
-             md-on-close="ctrl.onPodChange(ctrl.pod.name)"
-             required>
-    <md-option ng-repeat="item in ctrl.pods" ng-value="item">
-      <span class="kd-logs-toolbar-text">{{item.name}}</span>
-    </md-option>
-  </md-select>
+  <span class="kd-logs-toolbar-text">Pod: {{::ctrl.stateParams.objectName}}</span>
 
   <span class="kd-logs-toolbar-text">Container:</span>
   <md-select class="kd-logs-toolbar-select" aria-label="Containers" ng-model="ctrl.container"
-             md-on-close="ctrl.onContainerChange(ctrl.container.name)"
+             md-on-close="ctrl.onContainerChange(ctrl.container)"
              required>
     <md-option ng-repeat="item in ctrl.containers" ng-value="item">
-      <span class="kd-logs-toolbar-text">{{item.name}}</span>
+      <span class="kd-logs-toolbar-text">{{::item}}</span>
     </md-option>
   </md-select>
 
-  <span class="kd-logs-toolbar-text" flex="auto">
-    <span ng-if="ctrl.podCreationTime">
-      Running since {{ctrl.podCreationTime | date:'d/M/yy HH:mm':'UTC'}} UTC
-    </span>
-    <span ng-if="!ctrl.podCreationTime">
-      Not running
-    </span>
-  </span>
-
   <span flex="auto"></span>
   <md-button ng-click="ctrl.onTextColorChange()">
     <md-icon md-font-library="material-icons"
@@ -51,44 +35,3 @@
     </md-icon>
   </md-button>
 </div>
-
-<div layout="row" hide-gt-sm layout-no-wrap layout-margin layout-align="center center"
-     class="kd-logs-toolbar">
-  <md-menu-bar class="kd-logs-toolbar-menu-bar">
-    <md-menu>
-      <button ng-click="$mdOpenMenu()" class="kd-logs-toolbar-menu-button">
-        Logs source
-      </button>
-      <md-menu-content width="3">
-        <md-menu-item>
-          <md-menu>
-            <md-button ng-click="$mdOpenMenu()">Pods</md-button>
-            <md-menu-content width="4">
-              <md-button ng-repeat="item in ctrl.pods"
-                         ng-click="ctrl.onPodChange(item.name)">{{item.name}}
-              </md-button>
-            </md-menu-content>
-          </md-menu>
-        </md-menu-item>
-        <md-menu-item>
-          <md-menu>
-            <md-button ng-click="$mdOpenMenu()">Containers</md-button>
-            <md-menu-content width="4">
-              <md-button ng-repeat="item in ctrl.containers"
-                         ng-click="ctrl.onContainerChange(item.name)">{{item.name}}
-              </md-button>
-            </md-menu-content>
-          </md-menu>
-        </md-menu-item>
-      </md-menu-content>
-    </md-menu>
-  </md-menu-bar>
-
-  <span flex="auto"></span>
-  <md-button class="kd-logs-toolbar-icon" ng-click="ctrl.onTextColorChange()">
-    <md-icon md-font-library="material-icons"
-             ng-class="ctrl.getStyleClass()">
-      format_color_text
-    </md-icon>
-  </md-button>
-</div>

src/app/frontend/logs/logstoolbar/logstoolbar_controller.js

@@ -22,12 +22,11 @@ export default class LogsToolbarController {
   /**
    * @param {!ui.router.$state} $state
    * @param {!StateParams} $stateParams
-   * @param {!backendApi.ReplicationControllerPods} replicationControllerPods
    * @param {!backendApi.Logs} podLogs
    * @param {!../logs_service.LogColorInversionService} logsColorInversionService
    * @ngInject
    */
-  constructor($state, $stateParams, replicationControllerPods, podLogs, logsColorInversionService) {
+  constructor($state, $stateParams, podLogs, podContainers, logsColorInversionService) {
     /** @private {!ui.router.$state} */
     this.state_ = $state;
 
@@ -37,38 +36,16 @@ export default class LogsToolbarController {
      */
     this.logsColorInversionService_ = logsColorInversionService;
 
-    /** @export {!Array<!backendApi.ReplicationControllerPodWithContainers>} */
-    this.pods = replicationControllerPods.pods;
+    /** @export {!Array<string>} */
+    this.containers = podContainers.containers;
 
-    /**
-     * Currently chosen pod.
-     * @export {!backendApi.ReplicationControllerPodWithContainers|undefined}
-     */
-    this.pod = this.findPodByName_(this.pods, $stateParams.podId);
-
-    /** @export {!Array<!backendApi.PodContainer>} */
-    this.containers = this.pod.podContainers;
-
-    /** @export {!backendApi.PodContainer} */
-    this.container = this.initializeContainer_(this.containers, podLogs.container);
-
-    /**
-     * Pod creation time.
-     * @export {?string}
-     */
-    this.podCreationTime = this.pod.startTime;
-
-    /**
-     * Namespace.
-     * @private {string}
-     */
-    this.namespace_ = $stateParams.rcNamespace;
+    /** @export {string} */
+    this.container = $stateParams.container || this.containers[0];
 
     /**
-     * Replication Controller name.
-     * @private {string}
+     * @export {../logs_state.StateParams}
      */
-    this.replicationControllerName_ = $stateParams.replicationController;
+    this.stateParams = $stateParams;
   }
 
   /**
@@ -79,28 +56,16 @@ export default class LogsToolbarController {
    */
   isTextColorInverted() { return this.logsColorInversionService_.getInverted(); }
 
-  /**
-   * Execute a code when a user changes the selected option of a pod element.
-   * @param {string} podId
-   * @return {string}
-   * @export
-   */
-  onPodChange(podId) {
-    return this.state_.transitionTo(
-        logs, new StateParams(
-                  this.namespace_, this.replicationControllerName_, podId, this.container.name));
-  }
-
   /**
    * Execute a code when a user changes the selected option of a container element.
    * @param {string} container
    * @return {string}
    * @export
    */
   onContainerChange(container) {
-    return this.state_.transitionTo(
-        logs, new StateParams(
-                  this.namespace_, this.replicationControllerName_, this.pod.name, container));
+    return this.state_.go(
+        logs,
+        new StateParams(this.stateParams.objectNamespace, this.stateParams.objectName, container));
   }
 
   /**