UI Updates for default config

SingularityService/src/main/docker/start.sh

@@ -8,9 +8,6 @@ if [ ${DOCKER_HOST} ]; then
     SINGULARITY_HOSTNAME="${SINGULARITY_HOSTNAME:=$DEFAULT_HOSTNAME}"
 fi
 
-DEFAULT_URI_BASE="http://${SINGULARITY_HOSTNAME:=localhost}:${SINGULARITY_PORT:=7099}${SINGULARITY_UI_BASE:=/singularity}"
-
-
 [[ ! ${SINGULARITY_PORT:-} ]] || args+=( -Ddw.server.connector.port="$SINGULARITY_PORT" )
 [[ ! ${LOAD_BALANCER_URI:-} ]] || args+=( -Ddw.loadBalancerUri="$LOAD_BALANCER_URI")
 
@@ -19,7 +16,7 @@ args+=( -Djava.net.preferIPv4Stack=true )
 args+=( -Ddw.mesos.master="${SINGULARITY_MESOS_MASTER:=zk://localhost:2181/mesos}" )
 args+=( -Ddw.zookeeper.quorum="${SINGULARITY_ZK:=localhost:2181}" )
 args+=( -Ddw.zookeeper.zkNamespace="${SINGULARITY_ZK_NAMESPACE:=singularity}" )
-args+=( -Ddw.ui.baseUrl="${SINGULARITY_URI_BASE:=$DEFAULT_URI_BASE}" )
+args+=( -Ddw.ui.baseUrl="${SINGULARITY_UI_BASE:=/singularity}" )
 
 [[ ! ${SINGULARITY_DB_USER:-} ]] || args+=( -Ddw.database.user="${SINGULARITY_DB_USER}" )
 [[ ! ${SINGULARITY_DB_PASSWORD:-} ]] || args+=( -Ddw.database.password="${SINGULARITY_DB_PASSWORD}" )

SingularityUI/app/actions/api/logs.es6

@@ -2,7 +2,8 @@ import { buildApiAction } from './base';
 
 export const FetchTaskS3Logs = buildApiAction(
   'FETCH_TASK_S3_LOGS',
-  (taskId) => ({
-    url: `/logs/task/${taskId}`
+  (taskId, catchStatusCodes) => ({
+    url: `/logs/task/${taskId}`,
+    catchStatusCodes
   })
 );

SingularityUI/app/actions/api/tasks.es6

@@ -57,8 +57,9 @@ export const FetchTaskCleanups = buildApiAction(
 
 export const FetchTaskStatistics = buildApiAction(
   'FETCH_TASK_STATISTICS',
-  (taskId) => ({
-    url: `/tasks/task/${taskId}/statistics`
+  (taskId, catchStatusCodes) => ({
+    url: `/tasks/task/${taskId}/statistics`,
+    catchStatusCodes
   })
 );
 

SingularityUI/app/components/taskDetail/TaskDetail.jsx

@@ -92,6 +92,7 @@ class TaskDetail extends Component {
       memMappedFileBytes: PropTypes.number,
       timestamp: PropTypes.number
     }),
+    resourceUsageNotFound: PropTypes.bool.isRequired,
     taskCleanups: PropTypes.arrayOf(PropTypes.shape({
       taskId: PropTypes.shape({
         id: PropTypes.string
@@ -317,8 +318,16 @@ class TaskDetail extends Component {
       <span className="label label-danger">CPU usage > 110% allocated</span>
     );
 
-    return (
-      <CollapsableSection title="Resource Usage">
+    let maybeResourceUsage;
+
+    if (this.props.resourceUsageNotFound) {
+      maybeResourceUsage = (
+        <div className="empty-table-message">
+          Could not establish communication with the slave to find resource usage.
+        </div>
+      );
+    } else {
+      maybeResourceUsage = (
         <div className="row">
           <div className="col-md-3">
             <UsageInfo
@@ -354,6 +363,12 @@ class TaskDetail extends Component {
             </ul>
           </div>
         </div>
+      );
+    }
+
+    return (
+      <CollapsableSection title="Resource Usage">
+        {maybeResourceUsage}
       </CollapsableSection>
     );
   }
@@ -443,6 +458,7 @@ function mapStateToProps(state, ownProps) {
     currentFilePath: _.isUndefined(ownProps.params.splat) ? ownProps.params.taskId : ownProps.params.splat,
     taskCleanups: state.api.taskCleanups.data,
     files: state.api.taskFiles,
+    resourceUsageNotFound: state.api.taskResourceUsage.statusCode === 404,
     resourceUsage: state.api.taskResourceUsage.data,
     cpuTimestamp: state.api.taskResourceUsage.data.timestamp,
     s3Logs: state.api.taskS3Logs.data,
@@ -457,12 +473,12 @@ function mapDispatchToProps(dispatch) {
   return {
     runCommandOnTask: (taskId, commandName) => dispatch(RunCommandOnTask.trigger(taskId, commandName)),
     fetchTaskHistory: (taskId) => dispatch(FetchTaskHistory.trigger(taskId, true)),
-    fetchTaskStatistics: (taskId) => dispatch(FetchTaskStatistics.trigger(taskId)),
+    fetchTaskStatistics: (taskId) => dispatch(FetchTaskStatistics.trigger(taskId, [404])),
     fetchTaskFiles: (taskId, path, catchStatusCodes = []) => dispatch(FetchTaskFiles.trigger(taskId, path, catchStatusCodes.concat([404]))),
     fetchDeployForRequest: (taskId, deployId) => dispatch(FetchDeployForRequest.trigger(taskId, deployId)),
     fetchTaskCleanups: () => dispatch(FetchTaskCleanups.trigger()),
     fetchPendingDeploys: () => dispatch(FetchPendingDeploys.trigger()),
-    fechS3Logs: (taskId) => dispatch(FetchTaskS3Logs.trigger(taskId)),
+    fechS3Logs: (taskId) => dispatch(FetchTaskS3Logs.trigger(taskId, [404])),
   };
 }