Merge "fluentd: migrate to td-agent 4 where possible"

6 files changed, 19 insertions, 9 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index d1966e2ad..cef4ba628 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -93,6 +93,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
         'elasticsearch.repo',
         'grafana.repo',
         'rabbitmq_rabbitmq-server.repo',
+        'td.repo',
     ] %}
 
     {% set base_yum_repo_keys = [
diff --git a/docker/base/td.repo b/docker/base/td.repo
index 38dcc6d44..cea423169 100644
--- a/docker/base/td.repo
+++ b/docker/base/td.repo
@@ -1,6 +1,6 @@
 [treasuredata]
 name=TreasureData
-baseurl=http://packages.treasuredata.com/3/redhat/$releasever/$basearch
+baseurl=http://packages.treasuredata.com/4/redhat/$releasever/$basearch
 gpgcheck=1
 gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent
 enabled=0
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 919aec8da..211db5c1e 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -2,10 +2,10 @@ FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
-{% if base_package_type == 'rpm' and base_arch != 'x86_64' %}
+{% if base_package_type == 'rpm' and base_arch not in ['aarch64', 'x86_64'] %}
 LABEL fluentd_version="0.12" fluentd_binary="fluentd"
     {% set fluentd_user = 'fluentd' %}
-{% elif base_package_type == 'deb' and base_arch != 'x86_64' %}
+{% elif base_package_type == 'deb' and base_arch not in ['aarch64', 'x86_64'] %}
 LABEL fluentd_version="0.14" fluentd_binary="fluentd"
     {% set fluentd_user = 'fluentd' %}
 {% else %}
@@ -26,7 +26,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent"
         'make'
     ] %}
 
-    {% if base_arch == 'x86_64' %}
+    {% if base_arch in ['aarch64', 'x86_64'] %}
         {% set fluentd_packages = fluentd_packages + [
             'td-agent'
         ] %}
@@ -47,7 +47,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent"
         'make'
     ] %}
 
-    {% if base_arch == 'x86_64' %}
+    {% if base_arch in ['aarch64', 'x86_64'] %}
         {% set fluentd_packages = fluentd_packages + [
             'td-agent'
         ] %}
@@ -65,7 +65,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent"
 
 # Distro specific files and operations
 # Fluentd on rpm-based non-x86_64 is installed from rpm
-{% if base_package_type == 'deb' and base_arch != 'x86_64' %}
+{% if base_package_type == 'deb' and fluentd_binary == 'fluentd' %}
 RUN /usr/bin/gem install fluentd --no-rdoc --no-ri
 {% endif %}
 
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 8b7c2eb12..5cdcbd233 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -149,7 +149,6 @@ UNBUILDABLE_IMAGES = {
 
     'centos+aarch64': {
         "elasticsearch",  # no binary package
-        "fluentd",        # no binary package
         "hacluster-pcs",  # no binary package
         "influxdb",       # no binary package
         "kibana",         # no binary package
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 63aabdebc..769175c55 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -28,6 +28,7 @@ centos-aarch64:
   logstash: "elasticsearch-kibana-logstash-6.x"
   opstools: "centos-opstools"
   rabbitmq: "rabbitmq_rabbitmq-server"
+  td-agent: "treasuredata"
 
 centos-ppc64le:
   ceph: "centos-ceph-nautilus"
@@ -54,7 +55,7 @@ debian:
   logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
-  td-agent: "deb http://packages.treasuredata.com/3/debian/buster buster contrib"
+  td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
 debian-aarch64:
   elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
@@ -65,6 +66,7 @@ debian-aarch64:
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
   rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
+  td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
 ubuntu:
   elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
@@ -76,7 +78,7 @@ ubuntu:
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
   qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main"
   rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
-  td-agent: "deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib"
+  td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib"
 
 ubuntu-aarch64:
   elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
@@ -86,6 +88,7 @@ ubuntu-aarch64:
   logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
   rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
+  td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib"
 
 ubuntu-ppc64le:
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
diff --git a/releasenotes/notes/td-agent-4-b2c7fc574bff0a42.yaml b/releasenotes/notes/td-agent-4-b2c7fc574bff0a42.yaml
new file mode 100644
index 000000000..5bcd6a27e
--- /dev/null
+++ b/releasenotes/notes/td-agent-4-b2c7fc574bff0a42.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    ``td-agent`` has been upgraded to version 4. It will be now used for both
+    ``x86-64`` and ``aarch64`` architectures on all distributions Kolla is
+    supporting. Users before upgrade should analyse changed config file syntax
+    for their custom fluentd configuration files.