openstack/kolla
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2020-07-22 12:55:09 +00:00 committed by Gerrit Code Review
commit acd0d4bf20
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/base/Dockerfile.j2
View File

@ -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 = [

2
docker/base/td.repo
View File

@ -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

10
docker/fluentd/Dockerfile.j2
View File

@ -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 %}

1
kolla/image/build.py
View File

@ -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

7
kolla/template/repos.yaml
View File

@ -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"

7
releasenotes/notes/td-agent-4-b2c7fc574bff0a42.yaml Normal file
View File

@ -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.