From 72221aa9f0b4d75275bb08b7b3d6d14aabf4193d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 29 Dec 2021 13:37:47 +0000 Subject: [PATCH] fluentd: remove legacy parsing config After we remove the problematic, legacy "parser" plugin, the config only needs the new, modern syntax. This removes warnings that were logged. Depends-On: https://review.opendev.org/c/openstack/kolla/+/823071 Change-Id: I33aa06de6ce88288769a8291ebd59e78e07cdbaf --- .../roles/common/templates/conf/format/apache_access.conf.j2 | 5 ----- .../roles/common/templates/conf/format/wsgi_access.conf.j2 | 5 ----- 2 files changed, 10 deletions(-) diff --git a/ansible/roles/common/templates/conf/format/apache_access.conf.j2 b/ansible/roles/common/templates/conf/format/apache_access.conf.j2 index 9109048707..bef2c4eeb4 100644 --- a/ansible/roles/common/templates/conf/format/apache_access.conf.j2 +++ b/ansible/roles/common/templates/conf/format/apache_access.conf.j2 @@ -1,12 +1,7 @@ @type parser reserve_data true - format grok key_name Payload - grok_pattern \[%{HTTPDATE:Timestamp}\] "(?:%{WORD:http_method} %{NOTSPACE:http_url}(?: HTTP/%{NUMBER:http_version})?|%{DATA:rawrequest})" %{NUMBER:http_status} (?:\d+|-) - time_key Timestamp - time_format %d/%b/%Y:%H:%M:%S %z - keep_time_key true @type grok grok_pattern \[%{HTTPDATE:Timestamp}\] "(?:%{WORD:http_method} %{NOTSPACE:http_url}(?: HTTP/%{NUMBER:http_version})?|%{DATA:rawrequest})" %{NUMBER:http_status} (?:\d+|-) diff --git a/ansible/roles/common/templates/conf/format/wsgi_access.conf.j2 b/ansible/roles/common/templates/conf/format/wsgi_access.conf.j2 index 5dbe537c9f..fae0e52127 100644 --- a/ansible/roles/common/templates/conf/format/wsgi_access.conf.j2 +++ b/ansible/roles/common/templates/conf/format/wsgi_access.conf.j2 @@ -1,12 +1,7 @@ @type parser reserve_data true - format grok key_name Payload - grok_pattern %{IPORHOST:clientip} %{HTTPDUSER:ident} %{USER:auth} \[%{HTTPDATE:Timestamp}\] "(?:%{WORD:http_method} %{NOTSPACE:http_url}(?: HTTP/%{NUMBER:http_version})?|%{DATA:rawrequest})" %{NUMBER:http_status} (?:%{NUMBER:http_bytes}|-) (?:%{NUMBER:http_response_time_us}|-) %{QS:referrer} %{QS:agent} - time_key Timestamp - time_format %d/%b/%Y:%H:%M:%S %z - keep_time_key true @type grok grok_pattern %{IPORHOST:clientip} %{HTTPDUSER:ident} %{USER:auth} \[%{HTTPDATE:Timestamp}\] "(?:%{WORD:http_method} %{NOTSPACE:http_url}(?: HTTP/%{NUMBER:http_version})?|%{DATA:rawrequest})" %{NUMBER:http_status} (?:%{NUMBER:http_bytes}|-) (?:%{NUMBER:http_response_time_us}|-) %{QS:referrer} %{QS:agent}