From: sambufe <samuel.bufe@publicispixelpark.de>
Date: Mon, 31 Jul 2017 08:19:44 +0000 (+0200)
Subject: fbb-db mysql logstash fix
X-Git-Tag: v0.1.0~2666^2~47
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=117d99871e66a891b3a27a85c1ba5cb11dd5574b;p=pixelpark%2Fhiera.git

fbb-db mysql logstash fix
---

diff --git a/customer/fbb-db/common.yaml b/customer/fbb-db/common.yaml
index e7652283..f8249339 100644
--- a/customer/fbb-db/common.yaml
+++ b/customer/fbb-db/common.yaml
@@ -37,34 +37,3 @@ accounts::users:
 #    owner: root
 #    group: root
 #    mode: '0755'
-
-logstash::generic_resource:
-  mysql_error:
-    resource: file
-    order: 10  # Input
-    parameters:
-      path: 
-        - '/var/log/mariadb/mariadb.log'
-        - '/var/log/mariadb/mysql.log'
-        - '/var/log/mariadb/error.log'
-        - '/var/log/mysql/mysql.log'
-        - '/var/log/mysql/mariadb.log'
-        - '/var/log/mysql/error.log'
-        - '/var/log/mysqld.log'
-      type: mysql-error
-      tags:
-        - "%{customer}"
-        - "%{tier}"
-      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:restmessage}'