From b32cf27cc93878bcc124bcc387749829b0997a66 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 30 Sep 2021 13:42:18 +0100 Subject: 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 --- docker/logstash/Dockerfile.j2 | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docker/logstash') 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. -- cgit v1.2.3