From 6d0882ef799bb531d007c3e6839ef318fd512d5c Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Mon, 7 Jun 2021 10:14:55 +0000 Subject: [PATCH] Pin td-agent to 4.0.* to fix missing logs The recent inclusion of Fluentd 1.12.x in Centos/Ubuntu packages causes a significant number of logs to fail to appear in the Elasticsearch or Monasca output plugins. The logs appear to sit in a local buffer, and are only flushed when Fluentd is restarted. The same issue persists in the most recent release (1.13.0), so for now we pin the td-agent package to 4.0.* which should restrict Fluentd to the 1.11.x release where we don't see this issue. Backport to Victoria. Change-Id: Iefcdd3100b7e3c5320bc5f1286a18251bdeab885 Closes-Bug: #1930867 --- docker/base/apt_preferences.ubuntu | 5 +++++ docker/fluentd/Dockerfile.j2 | 3 ++- releasenotes/notes/bug-1930867.yaml | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1930867.yaml diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index c8e36affd0..2928ee6620 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -5,3 +5,8 @@ Pin-Priority: 1000 Package: erlang* Pin: version 1:23.* Pin-Priority: 1000 + +# FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867. +Package: td-agent* +Pin: version 4.0.* +Pin-Priority: 1000 diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 29176c0cf4..0f3fe11df6 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -27,8 +27,9 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent" ] %} {% if base_arch in ['aarch64', 'x86_64'] %} + # FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867. {% set fluentd_packages = fluentd_packages + [ - 'td-agent' + 'td-agent-4.0.*' ] %} {% else %} {% set fluentd_packages = fluentd_packages + [ diff --git a/releasenotes/notes/bug-1930867.yaml b/releasenotes/notes/bug-1930867.yaml new file mode 100644 index 0000000000..fbdfca82dd --- /dev/null +++ b/releasenotes/notes/bug-1930867.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue with logs going missing in the Fluentd pipeline + by pinning td-agent to 4.0.*. + `LP#1930867 `__