Merge pull request openshift#999 from k-keiichi-rh/fixanythingleftover

Fix built-in application behavior to collect all of logs

Author: openshift-merge-robot

pkg/generators/forwarding/fluentd/fluent_conf_test.go

@@ -496,7 +496,6 @@ var _ = Describe("Generating fluentd config", func() {
   <label @_APPLICATION>
     <match **>
       @type label_router
-      default_route @_APPLICATION_DEFAULT
       <route>
         @label @APPS_PIPELINE
         <match>
@@ -509,9 +508,14 @@ var _ = Describe("Generating fluentd config", func() {
           namespaces dev-apple,project2-namespace
         </match>
       </route>
+      <route>
+        @label @_APPLICATION_ALL
+        <match>
+        </match>
+      </route>
     </match>
   </label>
-  <label @_APPLICATION_DEFAULT>
+  <label @_APPLICATION_ALL>
     <match **>
       @type copy
       <store>
@@ -1212,7 +1216,6 @@ var _ = Describe("Generating fluentd config", func() {
   <label @_APPLICATION>
     <match **>
       @type label_router
-      default_route @_APPLICATION_DEFAULT
       <route>
         @label @APPS_PROD_PIPELINE
         <match>
@@ -1225,9 +1228,14 @@ var _ = Describe("Generating fluentd config", func() {
           labels app:nginx,environment:dev
         </match>
       </route>
+      <route>
+        @label @_APPLICATION_ALL
+        <match>
+        </match>
+      </route>
     </match>
   </label>
-  <label @_APPLICATION_DEFAULT>
+  <label @_APPLICATION_ALL>
     <match **>
       @type copy
       <store>
@@ -1909,7 +1917,6 @@ var _ = Describe("Generating fluentd config", func() {
   <label @_APPLICATION>
     <match **>
       @type label_router
-      default_route @_APPLICATION_DEFAULT
       <route>
         @label @APPS_PROD_PIPELINE
         <match>
@@ -1924,9 +1931,14 @@ var _ = Describe("Generating fluentd config", func() {
           labels app:nginx,environment:dev
         </match>
       </route>
+      <route>
+        @label @_APPLICATION_ALL
+        <match>
+        </match>
+      </route>
     </match>
   </label>
-  <label @_APPLICATION_DEFAULT>
+  <label @_APPLICATION_ALL>
     <match **>
       @type copy
       <store>

pkg/generators/forwarding/fluentd/templates.go

@@ -540,16 +540,20 @@ const inputSelectorToPipelineTemplate = `{{- define "inputSelectorToPipelineTemp
 <label {{sourceTypelabelName .Source}}>
   <match **>
     @type label_router
-{{- if .PipelineNames }}
-    default_route {{sourceTypelabelName .Source}}_DEFAULT
-{{- end }}
     {{- range .InputSelectors }}
     {{ . }}
     {{- end}}
+{{- if .PipelineNames }}
+    <route>
+      @label {{sourceTypelabelName .Source}}_ALL
+      <match>
+      </match>
+    </route>
+{{- end }}
   </match>
 </label>
 {{ if .PipelineNames -}}
-<label {{sourceTypelabelName .Source}}_DEFAULT>
+<label {{sourceTypelabelName .Source}}_ALL>
   <match **>
     @type copy
 {{- range $index, $pipelineLabel := .PipelineNames }}