Skip to content

Commit b32cf27

Browse files
committed
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
1 parent e4f019a commit b32cf27

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

docker/base/apt_preferences.debian

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@ Pin-Priority: 1000
1111
Package: td-agent*
1212
Pin: version 4.0.*
1313
Pin-Priority: 1000
14+
15+
# NOTE(mgoddard): logstash 7.9.x is the last version that supports
16+
# Elasticsearch OSS.
17+
Package: logstash-oss
18+
Pin: version 7.9.*
19+
Pin-Priority: 1000

docker/base/apt_preferences.ubuntu

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@ Pin-Priority: 1000
1010
Package: td-agent*
1111
Pin: version 4.0.*
1212
Pin-Priority: 1000
13+
14+
# NOTE(mgoddard): logstash 7.9.x is the last version that supports
15+
# Elasticsearch OSS.
16+
Package: logstash-oss
17+
Pin: version 7.9.*
18+
Pin-Priority: 1000

docker/logstash/Dockerfile.j2

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,17 @@ ENV JAVA_HOME /usr/lib/jvm/jre-11-openjdk/
1919
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-{{debian_arch}}/
2020
{% endif %}
2121

22+
# NOTE(mgoddard): logstash 7.9.x is the last version that supports
23+
# Elasticsearch OSS.
24+
{% if base_package_type == 'rpm' %}
25+
{% set logstash_packages = [
26+
'logstash-oss-7.9.*',
27+
] %}
28+
{% else %}
2229
{% set logstash_packages = [
2330
'logstash-oss',
2431
] %}
32+
{% endif %}
2533

2634
# Post-install script of Logstash fails when trying to install Logstash and
2735
# Java together.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue with the logstash image which was incompatible with the last
5+
OSS version (7.10) of Elasticsearch. Logstash is now pinned to 7.9.
6+
`LP#1941754 <https://bugs.launchpad.net/kolla/+bug/1941754>`__

0 commit comments

Comments
 (0)