Merge pull request #659 from blockloop/bjones/bug-1852341/relabel-level

Bug 1852341: fix legacy syslog k8s Metadata
openshift · Aug 20, 2020 · cb772f9 · cb772f9
2 parents 5971ee0 + 1ec2338
commit cb772f9
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 0 deletions.
diff --git a/pkg/generators/forwarding/fluentd/fluent_conf_test.go b/pkg/generators/forwarding/fluentd/fluent_conf_test.go
@@ -352,6 +352,15 @@ var _ = Describe("Generating fluentd config", func() {
 					</record>
 					remove_keys req,res,msg,name,level,v,pid,err
 				</filter>
+
+				<filter k8s-audit.log**>
+				  @type record_transformer
+				  <record>
+				    k8s_audit_level ${record['level']}
+				  </record>
+				  remove_keys level
+				</filter>
+
 				<filter **>
 					@type viaq_data_model
 					elasticsearch_index_prefix_field 'viaq_index_name'
@@ -765,6 +774,15 @@ var _ = Describe("Generating fluentd config", func() {
 					</record>
 					remove_keys req,res,msg,name,level,v,pid,err
 				</filter>
+
+				<filter k8s-audit.log**>
+				  @type record_transformer
+				  <record>
+				    k8s_audit_level ${record['level']}
+				  </record>
+				  remove_keys level
+				</filter>
+
 				<filter **>
 					@type viaq_data_model
 					elasticsearch_index_prefix_field 'viaq_index_name'
@@ -1564,6 +1582,14 @@ var _ = Describe("Generating fluentd config", func() {
         remove_keys req,res,msg,name,level,v,pid,err
       </filter>
     
+      <filter k8s-audit.log**>
+        @type record_transformer
+        <record>
+          k8s_audit_level ${record['level']}
+        </record>
+        remove_keys level
+      </filter>
+
       <filter **>
         @type viaq_data_model
         elasticsearch_index_prefix_field 'viaq_index_name'

diff --git a/pkg/generators/forwarding/fluentd/output_conf_legacy_test.go b/pkg/generators/forwarding/fluentd/output_conf_legacy_test.go
@@ -299,6 +299,14 @@ var _ = Describe("Generating fluentd legacy output store config blocks", func()
             remove_keys req,res,msg,name,level,v,pid,err
           </filter>
 
+          <filter k8s-audit.log**>
+            @type record_transformer
+            <record>
+              k8s_audit_level ${record['level']}
+            </record>
+            remove_keys level
+          </filter>
+
           <filter **>
             @type viaq_data_model
             elasticsearch_index_prefix_field 'viaq_index_name'
@@ -739,6 +747,14 @@ var _ = Describe("Generating fluentd legacy output store config blocks", func()
             remove_keys req,res,msg,name,level,v,pid,err
           </filter>
 
+          <filter k8s-audit.log**>
+            @type record_transformer
+            <record>
+              k8s_audit_level ${record['level']}
+            </record>
+            remove_keys level
+          </filter>
+
           <filter **>
             @type viaq_data_model
             elasticsearch_index_prefix_field 'viaq_index_name'
@@ -1180,6 +1196,14 @@ var _ = Describe("Generating fluentd legacy output store config blocks", func()
             remove_keys req,res,msg,name,level,v,pid,err
           </filter>
 
+          <filter k8s-audit.log**>
+            @type record_transformer
+            <record>
+              k8s_audit_level ${record['level']}
+            </record>
+            remove_keys level
+          </filter>
+
           <filter **>
             @type viaq_data_model
             elasticsearch_index_prefix_field 'viaq_index_name'

diff --git a/pkg/generators/forwarding/fluentd/templates.go b/pkg/generators/forwarding/fluentd/templates.go
@@ -210,6 +210,14 @@ const fluentConfTemplate = `{{- define "fluentConf" -}}
     remove_keys req,res,msg,name,level,v,pid,err
   </filter>
 
+  <filter k8s-audit.log**>
+    @type record_transformer
+    <record>
+      k8s_audit_level ${record['level']}
+    </record>
+    remove_keys level
+  </filter>
+
   <filter **>
     @type viaq_data_model
     elasticsearch_index_prefix_field 'viaq_index_name'