Skip to content
Snippets Groups Projects
Commit 25daa46a authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'fix-mariadb-logparsing' into 'master'

Fix parsing of MariaDB timestamps

See merge request !734
parents 709cb4c9 af3d99b6
Branches
Tags
1 merge request!734Fix parsing of MariaDB timestamps
...@@ -5,6 +5,7 @@ FROM ${SOURCE_IMAGE} ...@@ -5,6 +5,7 @@ FROM ${SOURCE_IMAGE}
ENV ELASTIC_CONTAINER=false ENV ELASTIC_CONTAINER=false
# Provide our logstash config # Provide our logstash config
COPY loki.conf /home/logstash/ COPY logstash.conf /home/logstash/
COPY logstash.yml /usr/share/logstash/config/logstash.yml COPY logstash.yml /usr/share/logstash/config/logstash.yml
COPY loki.conf /usr/share/logstash/pipeline/logstash.conf COPY logstash.conf /usr/share/logstash/pipeline/logstash.conf
COPY patterns /usr/share/logstash/patterns
...@@ -97,10 +97,11 @@ filter { ...@@ -97,10 +97,11 @@ filter {
if [program] == "tangodb" { if [program] == "tangodb" {
grok { grok {
id => "grok_tangodb" id => "grok_tangodb"
patterns_dir => [ "/usr/share/logstash/patterns/" ]
match => { match => {
"message" => [ "message" => [
"%{TIMESTAMP_ISO8601:timestamp} .%{WORD:level}. %{GREEDYDATA:message}", "%{TIMESTAMP_ISO8601_MARIADB:timestamp} .%{WORD:level}. %{GREEDYDATA:message}",
"%{TIMESTAMP_ISO8601:timestamp} 0 .%{WORD:level}. %{GREEDYDATA:message}" "%{TIMESTAMP_ISO8601_MARIADB:timestamp} %{NONNEGINT} .%{WORD:level}. %{GREEDYDATA:message}"
] ]
} }
"overwrite" => [ "timestamp", "level", "message" ] "overwrite" => [ "timestamp", "level", "message" ]
......
# MariaDB uses ' 2' instead of '02' for hours. The following format accepts both.
TIMESTAMP_ISO8601_MARIADB %{YEAR}-%{MONTHNUM}-%{MONTHDAY}[T ] ?%{HOUR}:?%{MINUTE}(?::?%{SECOND})?%{ISO8601_TIMEZONE}?
...@@ -27,6 +27,7 @@ services: ...@@ -27,6 +27,7 @@ services:
- MYSQL_DATABASE=tango - MYSQL_DATABASE=tango
- MYSQL_USER=tango - MYSQL_USER=tango
- MYSQL_PASSWORD=tango - MYSQL_PASSWORD=tango
- MARIADB_AUTO_UPGRADE=1
volumes: volumes:
- tangodb:/var/lib/mysql - tangodb:/var/lib/mysql
ports: ports:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment