Changes between Version 89 and Version 90 of SystemAdministration/Default_VM_setup

Timestamp:

08/03/18 13:35:49 (6 years ago)

Author:

André Moreira

Comment:

--

SystemAdministration/Default_VM_setup

@@ -334 +334 @@
 {{{
 <system>
-  log_level warn
+  log_level info
 </system>
 
@@ -343 +343 @@
 </source>
 
+<filter **>
+  @type record_transformer
+  <record>
+    clarin_host ${hostname}
+  </record>
+</filter>
+
 <filter docker.**>
     @type parser
     key_name log
-    reserve_data false
-
+    reserve_data true
+    remove_key_name_field true
     <parse>
         @type multi_format
-        #Match java logs
-        <pattern>
-            format regexp
-            expression /^(?<log_time>.+ .+ .+) (?<log_source>.+): \{"level":"(?<log_level>.*)","class":"(?<log_class>.*)","message":"(?<message>.*)"\}$/
-        </pattern>
         #Match default fluentd messages
         <pattern>
             format regexp
             expression /^(?<log_time>.+ .+ .+) (?<log_source>.+): \{"message":"(?<message>.*)"\}$/
+        </pattern>
+        #Match fluentd JSON messages
+        <pattern>
+            format regexp
+             expression /^(?<log_time>.+ .+ .+) (?<log_source>.+): (?<message>\{.*\})$/
         </pattern>
         #Match plain stdout messages
@@ -368 +375 @@
 </filter>
 
+<filter docker.**>
+    @type parser
+    key_name message
+    reserve_data true
+    remove_key_name_field true
+    <parse>
+      @type multi_format
+      <pattern>
+        format json
+      </pattern>
+      <pattern>
+        format none
+      </pattern>
+    </parse>
+</filter>
+
 <match docker.**>
   @type rewrite_tag_filter
+  hostname_command "hostname -s"
+  <rule>
+    key container_id
+    pattern ^(.*)$
+    tag ${hostname}.${tag}
+  </rule>
+</match>
+
+<match fluent.**>
+  @type rewrite_tag_filter
+  hostname_command "hostname -s"
   <rule>
     key message
@@ -377 +411 @@
 </match>
 
-<match **.docker.**>
+<match **>
     @type copy
-     <store>
+    <store>
         @type secure_forward
-        self_hostname transip-vps3
+        self_hostname transip-vps5
         shared_key    mxXWooqM2NWBoFbkpmALz8Aw
 
@@ -395 +429 @@
         @type file
         path /var/log/fluent/aggregation
-        symlink_path /var/log/fluent/aggregation.current
+        symlink_path /var/log/fluent/aggregation.current
         time_slice_format %Y%m%d
         time_slice_wait 10m
@@ -401 +435 @@
         time_key sent_at
         compress gzip
-        buffer_type file
-        buffer_path /var/log/fluent/aggregation.*
-        append true
-        flush_interval 60s
+        buffer_type file
+        buffer_path /var/log/fluent/aggregation.*
+        append true
+        flush_interval 60s
     </store>
 </match>