Merge pull request #227 from stackhpc/upstream/wallaby-2023-05-29

Synchronise wallaby with upstream

Author: markgoddard

docker/fluentd/Dockerfile.j2

@@ -84,7 +84,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% if not (base_package_type == 'rpm' and base_arch != 'x86_64') %}
     {% set fluentd_plugins = [
-        'fluent-plugin-elasticsearch',
+        'fluent-plugin-elasticsearch:"<5.3.0"',
         'fluent-plugin-grep',
         'fluent-plugin-grok-parser',
         'fluent-plugin-parser',