Removed disable of xpack.security

logstash-plugins · Oct 1, 2021 · ee6fb44 · ee6fb44
1 parent e590e04
commit ee6fb44
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.ci/Dockerfile.elasticsearch b/.ci/Dockerfile.elasticsearch
@@ -11,7 +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

diff --git 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