diff options
| author | Mark Goddard <mark@stackhpc.com> | 2021-09-30 13:42:18 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2021-09-30 20:22:34 +0100 |
| commit | b32cf27cc93878bcc124bcc387749829b0997a66 (patch) | |
| tree | b4505cabe802674fd94d2acce04648ec2c8f6244 /docker | |
| parent | e4f019a5ddfca68c7f0ac5cbfdeb47e88e170d20 (diff) | |
| download | kolla-b32cf27cc93878bcc124bcc387749829b0997a66.tar.gz kolla-b32cf27cc93878bcc124bcc387749829b0997a66.zip | |
logstash: pin to 7.9.* for Elasticsearch OSS compatibility
The latest versions of logstash 7.x do not support using the OSS version
of Elasticsearch, and fail to push logs if an OSS version is used. This
prevents Monasca log API from working correctly.
This change fixes the issue by pinning logstash-oss to 7.9.x, the most
recent available package in the repo that still supports Elasticsearch
OSS.
NOTE: logstash 7.11 introduced the breaking change, however 7.10 is
unavailable in the package repos.
Change-Id: I4ec4eb837c98f57964488769ab82ba8213ad582c
Closes-Bug: #1941754
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.debian | 6 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 6 | ||||
| -rw-r--r-- | docker/logstash/Dockerfile.j2 | 8 |
3 files changed, 20 insertions, 0 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index b2013f388..9c4af3561 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -11,3 +11,9 @@ Pin-Priority: 1000 Package: td-agent* Pin: version 4.0.* Pin-Priority: 1000 + +# NOTE(mgoddard): logstash 7.9.x is the last version that supports +# Elasticsearch OSS. +Package: logstash-oss +Pin: version 7.9.* +Pin-Priority: 1000 diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 2928ee662..4f0707067 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -10,3 +10,9 @@ Pin-Priority: 1000 Package: td-agent* Pin: version 4.0.* Pin-Priority: 1000 + +# NOTE(mgoddard): logstash 7.9.x is the last version that supports +# Elasticsearch OSS. +Package: logstash-oss +Pin: version 7.9.* +Pin-Priority: 1000 diff --git a/docker/logstash/Dockerfile.j2 b/docker/logstash/Dockerfile.j2 index 6911dc61d..0be662092 100644 --- a/docker/logstash/Dockerfile.j2 +++ b/docker/logstash/Dockerfile.j2 @@ -19,9 +19,17 @@ ENV JAVA_HOME /usr/lib/jvm/jre-11-openjdk/ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-{{debian_arch}}/ {% endif %} +# NOTE(mgoddard): logstash 7.9.x is the last version that supports +# Elasticsearch OSS. +{% if base_package_type == 'rpm' %} +{% set logstash_packages = [ + 'logstash-oss-7.9.*', +] %} +{% else %} {% set logstash_packages = [ 'logstash-oss', ] %} +{% endif %} # Post-install script of Logstash fails when trying to install Logstash and # Java together. |