From 2a302e5b652db5ab7996e393489a14967f6aa5b9 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 24 May 2023 15:19:16 +0100
Subject: [PATCH 1/2] mariadb-clustercheck: ensure /var/log/kolla/mariadb
 exists

If mariadb-clustercheck starts before mariadb, the directory may not
exist, and the command fails.

This is necessary for the refactored MariaDB restart in
I5a12670d07077d24047aaff57ce8d33ccf7156ff.

Change-Id: Ie1b36eb9a403611c2f86aa4c1d500d324e5291f3
(cherry picked from commit 9035251443ed6cbb110e9dc5efdbc9d4be797ef5)
---
 docker/mariadb/mariadb-clustercheck/Dockerfile.j2   |  4 ++++
 docker/mariadb/mariadb-clustercheck/extend_start.sh | 11 +++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 docker/mariadb/mariadb-clustercheck/extend_start.sh

diff --git a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
index 3f5e1ef299..82c297c5df 100644
--- a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
+++ b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
@@ -15,5 +15,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% endif %}
 
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN chmod 644 /usr/local/bin/kolla_extend_start
+
 {% block mariadb_clustercheck_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/mariadb/mariadb-clustercheck/extend_start.sh b/docker/mariadb/mariadb-clustercheck/extend_start.sh
new file mode 100644
index 0000000000..7379abddc6
--- /dev/null
+++ b/docker/mariadb/mariadb-clustercheck/extend_start.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+: ${MARIADB_LOG_DIR:=/var/log/kolla/mariadb}
+
+# Create log directory, with appropriate permissions
+if [[ ! -d "${MARIADB_LOG_DIR}" ]]; then
+    mkdir -p ${MARIADB_LOG_DIR}
+fi
+if [[ $(stat -c %a ${MARIADB_LOG_DIR}) != "755" ]]; then
+    chmod 755 ${MARIADB_LOG_DIR}
+fi

From 59a5de343ac3adf9463d7231fa0f5ff5f1f0a433 Mon Sep 17 00:00:00 2001
From: Sven Kieske <kieske@osism.tech>
Date: Wed, 31 May 2023 12:02:53 +0200
Subject: [PATCH 2/2] fluentd: pin td-agent to 4.4.2

Closes-Bug: #2019557

Change-Id: I3723e418c061c387c7f18cd33556ebb74ba1bd95
Signed-off-by: Sven Kieske <kieske@osism.tech>
---
 docker/base/apt_preferences.debian | 5 +++++
 docker/base/apt_preferences.ubuntu | 6 ++++++
 docker/fluentd/Dockerfile.j2       | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 00b004072a..b59402cec9 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -12,6 +12,11 @@ Package: logstash-oss
 Pin: version 7.9.*
 Pin-Priority: 1000
 
+# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557
+Package: td-agent*
+Pin: version 4.4.2-1
+Pin-Priority: 1000
+
 # NOTE(hrw): we do not want backports unless requested
 Package: *
 Pin: release n=bullseye-backports
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
index d61b18bdcd..2b97bc8edc 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -11,3 +11,9 @@ Pin-Priority: 1000
 Package: logstash-oss
 Pin: version 7.9.*
 Pin-Priority: 1000
+
+# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557
+Package: td-agent*
+Pin: version 4.4.2-1
+Pin-Priority: 1000
+
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 28fec327e9..ee1c20e88f 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set fluentd_packages = [
         'gcc-c++',
         'make',
-        'td-agent',
+        'td-agent-4.4.2',
     ] %}
 
 {% elif base_package_type == 'deb' %}