4 files changed, 26 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.
diff --git a/releasenotes/notes/logstash-7.9-30fd90e921037a8a.yaml b/releasenotes/notes/logstash-7.9-30fd90e921037a8a.yaml
new file mode 100644
index 000000000..dc30f91fb
--- /dev/null
+++ b/releasenotes/notes/logstash-7.9-30fd90e921037a8a.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with the logstash image which was incompatible with the last
+    OSS version (7.10) of Elasticsearch. Logstash is now pinned to 7.9.
+    `LP#1941754 <https://bugs.launchpad.net/kolla/+bug/1941754>`__