From 79726bd9d5e3d23558b4495a84be9e12b0714b3f Mon Sep 17 00:00:00 2001 From: Piotr Milewski Date: Thu, 18 Sep 2025 14:10:40 +0200 Subject: [PATCH] Update Fluentd from v5 LTS to v6 LTS Fluent Package v5 LTS will reach end of support at the end of 2025. Fluent Package v6 LTS will be supported until at least the end of 2027. This change updates the apt repository configuration and package version to use Fluent Package v6 LTS for Ubuntu, Debian and RHEL. No changes to existing Fluentd configuration files are required. Change-Id: Iaf3c4de859986629f9768563a319fe0385acff6a Signed-off-by: Piotr Milewski --- doc/source/contributor/versions.rst | 4 ++-- docker/base/Dockerfile.j2 | 2 +- kolla/template/repos.yaml | 16 ++++++++-------- .../notes/fluentd-update-8db10e760b2dc4d5.yaml | 4 ++++ 4 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 releasenotes/notes/fluentd-update-8db10e760b2dc4d5.yaml diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst index dfe3cdc334..b3adf19206 100644 --- a/doc/source/contributor/versions.rst +++ b/doc/source/contributor/versions.rst @@ -33,7 +33,7 @@ information about package sources. `Team RabbitMQ 'Cloudsmith' repo (RPM)`_ - Debian/Ubuntu: `Team RabbitMQ 'Modern Erlang' PPA`_ - TD Agent 4.4.x `TreasureData install guide`_ + Fluentd 6.x (LTS) `Fluentd install guide`_ Telegraf 1.24.x `InfluxDB upstream repo`_ ============== ================ ============================================= @@ -41,7 +41,7 @@ information about package sources. .. _`OpenSearch install guide`: https://opensearch.org/downloads.html .. _`Kibana install guide`: https://www.elastic.co/guide/en/kibana/7.10/install.html .. _`Logstash install guide`: https://www.elastic.co/guide/en/logstash/7.9/installing-logstash.html -.. _`TreasureData install guide`: https://www.fluentd.org/download +.. _`Fluentd install guide`: https://www.fluentd.org/download .. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/ .. _`Team RabbitMQ 'Cloudsmith' repo (Deb)`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 40fb6f92c6..45e7f9c03b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -250,12 +250,12 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #} {% set base_remote_apt_keys = [ {'name': 'docker-ce', 'url': 'https://download.docker.com/linux/debian/gpg'}, + {'name': 'fluentd', 'url': 'https://fluentd.cdn.cncf.io/GPG-KEY-fluent-package'}, {'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'}, {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'}, {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'}, {'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch-release.pgp'}, {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key'}, - {'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'}, ] %} {% block base_ubuntu_package_installation %} diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 2f31a297d7..c9ba633b89 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -25,8 +25,8 @@ centos: distro: True name: "extras" fluentd: - baseurl: "https://packages.treasuredata.com/lts/5/redhat/9/$basearch" - gpgkey: "https://packages.treasuredata.com/GPG-KEY-td-agent" + baseurl: "https://fluentd.cdn.cncf.io/lts/6/redhat/$releasever/$basearch" + gpgkey: "https://fluentd.cdn.cncf.io/GPG-KEY-fluent-package" name: "fluent-package-lts" grafana: baseurl: "https://rpm.grafana.com" @@ -98,10 +98,10 @@ debian: component: "main" gpg_key: "erlang-ppa.gpg" fluentd: - url: "https://packages.treasuredata.com/lts/5/debian/bookworm" + url: "https://fluentd.cdn.cncf.io/lts/6/debian/bookworm" suite: "bookworm" component: "contrib" - gpg_key: "treasuredata.asc" + gpg_key: "fluentd.asc" grafana: url: "https://apt.grafana.com" suite: "stable" @@ -174,8 +174,8 @@ rocky: distro: True name: "extras" fluentd: - baseurl: "https://packages.treasuredata.com/lts/5/redhat/9/$basearch" - gpgkey: "https://packages.treasuredata.com/GPG-KEY-td-agent" + baseurl: "https://fluentd.cdn.cncf.io/lts/6/redhat/$releasever/$basearch" + gpgkey: "https://fluentd.cdn.cncf.io/GPG-KEY-fluent-package" name: "fluent-package-lts" grafana: baseurl: "https://rpm.grafana.com" @@ -244,10 +244,10 @@ ubuntu: component: "main" gpg_key: "erlang-ppa.gpg" fluentd: - url: "https://packages.treasuredata.com/lts/5/ubuntu/noble/" + url: "https://fluentd.cdn.cncf.io/lts/6/ubuntu/noble" suite: "noble" component: "contrib" - gpg_key: "treasuredata.asc" + gpg_key: "fluentd.asc" grafana: url: "https://apt.grafana.com" suite: "stable" diff --git a/releasenotes/notes/fluentd-update-8db10e760b2dc4d5.yaml b/releasenotes/notes/fluentd-update-8db10e760b2dc4d5.yaml new file mode 100644 index 0000000000..6ecb744c02 --- /dev/null +++ b/releasenotes/notes/fluentd-update-8db10e760b2dc4d5.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Update Fluentd to version 6.x LTS.