]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
fbb-db - correct logstash filter
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Thu, 29 Jun 2017 13:03:15 +0000 (15:03 +0200)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Thu, 29 Jun 2017 13:03:15 +0000 (15:03 +0200)
customer/fbb-db/common.yaml

index 3ede86c67187dc4285f810f60e3f7a47401bac9b..e76b69c20d56cb633633990401900eddb78cc47c 100644 (file)
@@ -48,19 +48,16 @@ logstash::generic_resource:
       tags:
         - "%{customer}"
         - "%{tier}"
-  mysql_filter_1:
-    condition: 'if [type] == "mysql-error"'
-    resource: multiline
-    order: 39  # Filter
-    parameters:
-      pattern: '^%%{ich-trickse}{NUMBER} *%%{ich-trickse}{NUMBER}'
-      negate: 'true'
-      what: 'previous'
-  mysql_filter_2:
+      codec:
+        type: multiline
+        what: previous
+        negate: true
+        pattern: '%%{ich-trickse}{TIMESTAMP_ISO8601:time} *%%{ich-trickse}{INT:threadid}? *\[%%{ich-trickse}{WORD:loglevel}\] *%%{ich-trickse}{GREEDYDATA:restmessage}'
+  mysql_filter:
     condition: 'if [type] == "mysql-error"'
     resource: grok
     order: 40  # Filter
     parameters:
       match:
         - message
-        - '%%{ich-trickse}{TIMESTAMP_ISO8601:time} *%%{ich-trickse}{INT:threadid}? *\[%%{ich-trickse}{WORD:loglevel}\] *%%{ich-trickse}{GREEDYDATA:message}'
\ No newline at end of file
+        - '%%{ich-trickse}{TIMESTAMP_ISO8601:time} *%%{ich-trickse}{INT:threadid}? *\[%%{ich-trickse}{WORD:loglevel}\] *%%{ich-trickse}{GREEDYDATA:restmessage}'
\ No newline at end of file