diff options
| author | Zuul <zuul@review.opendev.org> | 2022-12-07 13:30:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-12-07 13:30:25 +0000 |
| commit | d5886bc3b8e3fe03f3485f6533d471082ffa89c6 (patch) | |
| tree | 701624f49f604bc31c818f6ddca2a27e64ba776c /docker/fluentd | |
| parent | 74e0d0169fb6eef02877e83998578a8e7d64ce71 (diff) | |
| parent | e221ac8f2704a21461f9b36134816329a43272cc (diff) | |
| download | kolla-d5886bc3b8e3fe03f3485f6533d471082ffa89c6.tar.gz kolla-d5886bc3b8e3fe03f3485f6533d471082ffa89c6.zip | |
Merge "Drop elasticsearch, kibana and logstash"
Diffstat (limited to 'docker/fluentd')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 144027be8..b3d8bf397 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -34,12 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start -# NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES {{ macros.install_packages(fluentd_packages | customizable("packages")) }} \ - && td-agent-gem install elasticsearch:7.13.0 \ - && td-agent-gem uninstall "elasticsearch:>7.13.0" \ - && td-agent-gem uninstall "elasticsearch-api:>7.13.0" \ - && td-agent-gem uninstall "elasticsearch-transport:>7.13.0" \ && chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ && mkdir -p /etc/{{ fluentd_user }} \ && mkdir -p /var/run/{{ fluentd_user }} \ @@ -49,7 +44,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start {% block fluentd_plugins_install %} {% set fluentd_plugins = [ - 'fluent-plugin-elasticsearch', 'fluent-plugin-grok-parser', 'fluent-plugin-prometheus', 'fluent-plugin-rewrite-tag-filter', |