From 83d644dcee183c45ec80721d5379c15fc4ff0e71 Mon Sep 17 00:00:00 2001 From: andsel Date: Fri, 1 Oct 2021 09:21:33 +0200 Subject: [PATCH] Removed disable of xpack.security --- .ci/Dockerfile.elasticsearch | 2 -- lib/logstash/outputs/elasticsearch/http_client/pool.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.ci/Dockerfile.elasticsearch b/.ci/Dockerfile.elasticsearch index 3b7f2f6d..ba27fb07 100644 --- a/.ci/Dockerfile.elasticsearch +++ b/.ci/Dockerfile.elasticsearch @@ -11,8 +11,6 @@ RUN rm -f $es_path/config/scripts COPY --chown=elasticsearch:elasticsearch spec/fixtures/test_certs/* $es_path/config/test_certs/ COPY --chown=elasticsearch:elasticsearch .ci/elasticsearch-run.sh $es_path/ -RUN echo "xpack.security.enabled: false" >> $es_yml - RUN if [ "$SECURE_INTEGRATION" = "true" ] ; then echo "xpack.security.http.ssl.enabled: $SECURE_INTEGRATION" >> $es_yml; fi RUN if [ "$SECURE_INTEGRATION" = "true" ] ; then echo "xpack.security.http.ssl.key: $es_path/config/test_certs/test.key" >> $es_yml; fi RUN if [ "$SECURE_INTEGRATION" = "true" ] ; then echo "xpack.security.http.ssl.certificate: $es_path/config/test_certs/test.crt" >> $es_yml; fi diff --git a/lib/logstash/outputs/elasticsearch/http_client/pool.rb b/lib/logstash/outputs/elasticsearch/http_client/pool.rb index 50f75115..3a7b136a 100644 --- a/lib/logstash/outputs/elasticsearch/http_client/pool.rb +++ b/lib/logstash/outputs/elasticsearch/http_client/pool.rb @@ -297,7 +297,7 @@ def elasticsearch?(url) def valid_tagline?(version_info) tagline = version_info['tagline'] - tagline == "You Know, for Search" + tagline == "You Know, for Search" end def stop_resurrectionist