Merge pull request #50 from BeckerMax/develop

anEXPer · web-flow · commit dcc96d1587f3 · 2019-02-06T10:51:09.000-07:00
Introduce property to log filename with blackbox
diff --git a/jobs/syslog_forwarder/spec b/jobs/syslog_forwarder/spec
@@ -162,6 +162,10 @@ properties:
       log lines will be tagged with subdirectory name.
     default: /var/vcap/sys/log
 
+  syslog.blackbox.log_filename:
+    description: If set to true, log lines are also tagged with filename in the format <subdirectory>/<file.log>.
+    default: false
+
   syslog.blackbox.limit_cpu:
     description: limit goprocess to a single cpu via gomaxprocs
     default: true
diff --git a/jobs/syslog_forwarder/templates/blackbox_config.yml.erb b/jobs/syslog_forwarder/templates/blackbox_config.yml.erb
@@ -10,3 +10,4 @@ syslog:
     address: 127.0.0.1:514
 
   source_dir: <%= p("syslog.blackbox.source_dir") %>
+  log_filename: <%= p("syslog.blackbox.log_filename") %>
diff --git a/src/github.com/cloudfoundry/blackbox b/src/github.com/cloudfoundry/blackbox
@@ -1 +1 @@
-Subproject commit b147be571adb214de5eb81d6b083e33b160a03b8
+Subproject commit 1d0559c615459fa53e4bf88568d00de527228dfa

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,4 @@ syslog:`
`10`	`10`	`address: 127.0.0.1:514`
`11`	`11`
`12`	`12`	`source_dir: <%= p("syslog.blackbox.source_dir") %>`
	`13`	`+ log_filename: <%= p("syslog.blackbox.log_filename") %>`