Truncate beginning of S3 log filenames

SingularityService/src/main/java/com/hubspot/singularity/config/UIConfiguration.java

@@ -5,6 +5,7 @@
 import java.util.Locale;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
 import org.hibernate.validator.constraints.NotEmpty;
@@ -52,14 +53,6 @@ public static RootUrlMode parse(String value) {
   @NotEmpty
   private String finishedTaskLogPath = "stdout";
 
-  public String getRunningTaskLogPath() {
-    return runningTaskLogPath;
-  }
-
-  public String getFinishedTaskLogPath() {
-    return finishedTaskLogPath;
-  }
-
   private boolean hideNewDeployButton = false;
   private boolean hideNewRequestButton = false;
 
@@ -70,6 +63,9 @@ public String getFinishedTaskLogPath() {
   @JsonProperty
   private String rootUrlMode = RootUrlMode.INDEX_CATCHALL.name();
 
+  @NotNull
+  private String taskS3LogOmitPrefix = "";
+
   public boolean isHideNewDeployButton() {
     return hideNewDeployButton;
   }
@@ -137,4 +133,20 @@ public void setRunningTaskLogPath(String runningTaskLogPath) {
   public void setFinishedTaskLogPath(String finishedTaskLogPath) {
     this.finishedTaskLogPath = finishedTaskLogPath;
   }
+
+  public String getRunningTaskLogPath() {
+    return runningTaskLogPath;
+  }
+
+  public String getFinishedTaskLogPath() {
+    return finishedTaskLogPath;
+  }
+
+  public String getTaskS3LogOmitPrefix() {
+    return taskS3LogOmitPrefix;
+  }
+
+  public void setTaskS3LogOmitPrefix(String taskS3LogOmitPrefix) {
+    this.taskS3LogOmitPrefix = taskS3LogOmitPrefix;
+  }
 }

SingularityService/src/main/java/com/hubspot/singularity/views/IndexView.java

@@ -35,6 +35,8 @@ public class IndexView extends View {
 
   private final String commonHostnameSuffixToOmit;
 
+  private final String taskS3LogOmitPrefix;
+
   public IndexView(String singularityUriBase, String appRoot, SingularityConfiguration configuration) {
     super("index.mustache");
 
@@ -68,6 +70,8 @@ public IndexView(String singularityUriBase, String appRoot, SingularityConfigura
     this.finishedTaskLogPath = configuration.getUiConfiguration().getFinishedTaskLogPath();
 
     this.commonHostnameSuffixToOmit = configuration.getCommonHostnameSuffixToOmit().or("");
+
+    this.taskS3LogOmitPrefix = configuration.getUiConfiguration().getTaskS3LogOmitPrefix();
   }
 
   public String getAppRoot() {
@@ -142,6 +146,10 @@ public String getCommonHostnameSuffixToOmit() {
     return commonHostnameSuffixToOmit;
   }
 
+  public String getTaskS3LogOmitPrefix() {
+    return taskS3LogOmitPrefix;
+  }
+
   @Override
   public String toString() {
     return "IndexView[" +

SingularityUI/app/assets/_index.mustache

@@ -34,6 +34,7 @@
             runningTaskLogPath: "{{{ runningTaskLogPath }}}",
             finishedTaskLogPath: "{{{ finishedTaskLogPath }}}",
             commonHostnameSuffixToOmit: "{{{ commonHostnameSuffixToOmit }}}",
+            taskS3LogOmitPrefix: "{{{ taskS3LogOmitPrefix }}}",
             slaveHttpPort: {{{slaveHttpPort}}},
             {{#slaveHttpsPort}}
             slaveHttpsPort: {{{slaveHttpsPort}}}

SingularityUI/app/collections/TaskS3Logs.coffee

@@ -3,11 +3,16 @@ S3Log = require '../models/S3Log'
 PaginableCollection = require './PaginableCollection'
 
 class TaskS3Logs extends PaginableCollection
-    
+
     model: S3Log
 
     url: -> "#{ config.apiRoot }/logs/task/#{ @taskId }"
 
     initialize: (models, { @taskId }) =>
 
+    parse: (model) ->
+        for m in model
+            m.taskId = @taskId
+        model
+
 module.exports = TaskS3Logs

SingularityUI/app/handlebarsHelpers.coffee

@@ -120,3 +120,11 @@ Handlebars.registerHelper 'getLabelClass', (state) ->
             'danger'
         else
             'default'
+
+Handlebars.registerHelper 'trimS3File', (filename, taskId) ->
+    unless config.taskS3LogOmitPrefix
+        return filename
+
+    finalRegex = config.taskS3LogOmitPrefix.replace('%taskId', taskId.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')).replace('%index', '[0-9]+').replace('%s', '[0-9]+')
+
+    return filename.replace(new RegExp(finalRegex), '')

SingularityUI/app/templates/taskDetail/taskS3Logs.hbs

@@ -18,7 +18,7 @@
                         <tr>
                             <td>
                                 <a class="long-link" href="{{ getUrl }}" target="_blank" title="{{ key }}">
-                                    {{ shortKey }}
+                                    {{ trimS3File shortKey taskId }}
                                 </a>
                             </td>
                             <td>

SingularityUI/config.coffee

@@ -53,6 +53,7 @@ exports.config =
             runningTaskLogPath:  process.env.SINGULARITY_RUNNING_TASK_LOG_PATH ? "stdout"
             finishedTaskLogPath: process.env.SINGULARITY_FINISHED_TASK_LOG_PATH ? "stdout"
             commonHostnameSuffixToOmit: process.env.SINGULARITY_COMMON_HOSTNAME_SUFFIX_TO_OMIT ? ""
+            taskS3LogOmitPrefix: process.env.SINGULARITY_TASK_S3_LOG_OMIT_PREFIX ? ''
 
         compiledTemplate = handlebars.compile(indexTemplate)(templateData)
         fs.writeFileSync destination, compiledTemplate