simplify plugin by removing distribution specific code (#1020)

Author: jsvd

.ci/Dockerfile

@@ -1,17 +1,13 @@
 ARG ELASTIC_STACK_VERSION
 # TODO: refactor this to be implicitly resolved by logstash-plugins/.ci/Dockerfile
-ARG DISTRIBUTION_SUFFIX
-FROM docker.elastic.co/logstash/logstash$DISTRIBUTION_SUFFIX:$ELASTIC_STACK_VERSION
+FROM docker.elastic.co/logstash/logstash:$ELASTIC_STACK_VERSION
 USER logstash
 COPY --chown=logstash:logstash Gemfile /usr/share/plugins/plugin/Gemfile
 COPY --chown=logstash:logstash *.gemspec VERSION* version* /usr/share/plugins/plugin/
 RUN cp /usr/share/logstash/logstash-core/versions-gem-copy.yml /usr/share/logstash/versions.yml
 ENV PATH="${PATH}:/usr/share/logstash/vendor/jruby/bin:/usr/share/logstash/jdk/bin"
 ENV LOGSTASH_SOURCE="1"
 ENV ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION
-# DISTRIBUTION="default" (by default) or "oss"
-ARG DISTRIBUTION
-ENV DISTRIBUTION=$DISTRIBUTION
 # INTEGRATION="true" while integration testing (false-y by default)
 ARG INTEGRATION
 ENV INTEGRATION=$INTEGRATION

.ci/Dockerfile.elasticsearch

@@ -1,6 +1,5 @@
 ARG ELASTIC_STACK_VERSION
-ARG DISTRIBUTION_SUFFIX
-FROM docker.elastic.co/elasticsearch/elasticsearch$DISTRIBUTION_SUFFIX:$ELASTIC_STACK_VERSION
+FROM docker.elastic.co/elasticsearch/elasticsearch:$ELASTIC_STACK_VERSION
 
 ARG plugin_path=/usr/share/plugins/plugin
 ARG es_path=/usr/share/elasticsearch

.ci/docker-compose.override.yml

@@ -7,11 +7,7 @@ services:
     build:
       args:
         - ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION
-        - DISTRIBUTION=${DISTRIBUTION:-default}
-        - DISTRIBUTION_SUFFIX=${DISTRIBUTION_SUFFIX}
     environment:
-        - DISTRIBUTION=${DISTRIBUTION:-default}
-        - DISTRIBUTION_SUFFIX=${DISTRIBUTION_SUFFIX}
         - INTEGRATION=${INTEGRATION:-false}
         - SECURE_INTEGRATION=${SECURE_INTEGRATION:-false}
 
@@ -23,7 +19,6 @@ services:
         - ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION
         - INTEGRATION=${INTEGRATION:-false}
         - SECURE_INTEGRATION=${SECURE_INTEGRATION:-false}
-        - DISTRIBUTION_SUFFIX=${DISTRIBUTION_SUFFIX}
     command: /usr/share/elasticsearch/elasticsearch-run.sh
     tty: true
     ports:

.ci/docker-setup.sh

@@ -9,7 +9,7 @@ VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/master/ci/logsta
 
 pull_docker_snapshot() {
   project="${1?project name required}"
-  local docker_image="docker.elastic.co/${project}/${project}${DISTRIBUTION_SUFFIX}:${ELASTIC_STACK_VERSION}"
+  local docker_image="docker.elastic.co/${project}/${project}:${ELASTIC_STACK_VERSION}"
   echo "Pulling $docker_image"
   docker pull "$docker_image"
 }
@@ -31,13 +31,7 @@ if [ "$ELASTIC_STACK_VERSION" ]; then
       export ELASTIC_STACK_VERSION=$ELASTIC_STACK_RETRIEVED_VERSION
     fi
 
-    case "${DISTRIBUTION}" in
-      default) DISTRIBUTION_SUFFIX="" ;; # empty string when explicit "default" is given
-            *) DISTRIBUTION_SUFFIX="${DISTRIBUTION/*/-}${DISTRIBUTION}" ;;
-    esac
-    export DISTRIBUTION_SUFFIX
-
-    echo "Testing against version: $ELASTIC_STACK_VERSION (distribution: ${DISTRIBUTION:-'default'})"
+    echo "Testing against version: $ELASTIC_STACK_VERSION"
 
     if [[ "$ELASTIC_STACK_VERSION" = *"-SNAPSHOT" ]]; then
         pull_docker_snapshot "logstash"

.ci/logstash-run.sh

@@ -29,11 +29,6 @@ else
     extra_tag_args="--tag ~secure_integration --tag integration"
   fi
 
-  if [[ "$DISTRIBUTION" == "oss" ]]; then
-    extra_tag_args="$extra_tag_args --tag distribution:oss --tag ~distribution:xpack"
-  elif [[ "$DISTRIBUTION" == "default" ]]; then
-    extra_tag_args="$extra_tag_args --tag ~distribution:oss --tag distribution:xpack"
-  fi
   echo "Waiting for elasticsearch to respond..."
   ES_VERSION=$(wait_for_es)
   echo "Elasticsearch $ES_VERSION is Up!"

.travis.yml

@@ -2,10 +2,10 @@ import:
 - logstash-plugins/.ci:travis/[email protected]
 
 env:
-  - DISTRIBUTION=default INTEGRATION=false ELASTIC_STACK_VERSION=6.x
-  - DISTRIBUTION=default INTEGRATION=false ELASTIC_STACK_VERSION=7.x
-  - DISTRIBUTION=default INTEGRATION=true ELASTIC_STACK_VERSION=6.x
-  - DISTRIBUTION=default INTEGRATION=true ELASTIC_STACK_VERSION=7.x
-  - DISTRIBUTION=default INTEGRATION=true ELASTIC_STACK_VERSION=7.x SNAPSHOT=true
-  - DISTRIBUTION=default INTEGRATION=true ELASTIC_STACK_VERSION=8.x SNAPSHOT=true
-  - DISTRIBUTION=default SECURE_INTEGRATION=true INTEGRATION=true ELASTIC_STACK_VERSION=7.x
+  - INTEGRATION=false ELASTIC_STACK_VERSION=6.x
+  - INTEGRATION=false ELASTIC_STACK_VERSION=7.x
+  - INTEGRATION=true ELASTIC_STACK_VERSION=6.x
+  - INTEGRATION=true ELASTIC_STACK_VERSION=7.x
+  - INTEGRATION=true ELASTIC_STACK_VERSION=7.x SNAPSHOT=true
+  - INTEGRATION=true ELASTIC_STACK_VERSION=8.x SNAPSHOT=true
+  - SECURE_INTEGRATION=true INTEGRATION=true ELASTIC_STACK_VERSION=7.x

lib/logstash/outputs/elasticsearch/ilm.rb

@@ -16,20 +16,12 @@ def ilm_in_use?
         begin
           if @ilm_enabled == 'auto'
             if ilm_on_by_default?
-              ilm_ready, error = ilm_ready?
-              if !ilm_ready
-                @logger.info("Index Lifecycle Management is set to 'auto', but will be disabled - #{error}")
-                false
-              else
-                ilm_alias_set?
-              end
+              ilm_alias_set?
             else
               @logger.info("Index Lifecycle Management is set to 'auto', but will be disabled - Your Elasticsearch cluster is before 7.0.0, which is the minimum version required to automatically run Index Lifecycle Management")
               false
             end
           elsif @ilm_enabled.to_s == 'true'
-            ilm_ready, error = ilm_ready?
-            raise LogStash::ConfigurationError,"Index Lifecycle Management is set to enabled in Logstash, but cannot be used - #{error}"  unless ilm_ready
             ilm_alias_set?
           else
             false
@@ -47,29 +39,6 @@ def ilm_on_by_default?
       maximum_seen_major_version >= 7
     end
 
-    def ilm_ready?
-      # Check the Elasticsearch instance for ILM readiness - this means that the version has to be a non-OSS release, with ILM feature
-      # available and enabled.
-      begin
-        xpack = client.get_xpack_info
-        features = xpack.nil? || xpack.empty? ? nil : xpack["features"]
-        ilm = features.nil? ? nil : features["ilm"]
-        return false, "Index Lifecycle management is not installed on your Elasticsearch cluster" if features.nil? || ilm.nil?
-        return false, "Index Lifecycle management is not available in your Elasticsearch cluster" unless ilm['available']
-        return false, "Index Lifecycle management is not enabled in your Elasticsearch cluster" unless ilm['enabled']
-        return true, nil
-      rescue ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError => e
-        # Check xpack endpoint: If no xpack endpoint, then this version of Elasticsearch is not compatible
-        if e.response_code == 404
-          return false, "Index Lifecycle management is not installed on your Elasticsearch cluster"
-        elsif e.response_code == 400
-          return false, "Index Lifecycle management is not installed on your Elasticsearch cluster"
-        else
-          raise e
-        end
-      end
-    end
-
     def default_index?(index)
       index == @default_index
     end
@@ -113,4 +82,4 @@ def policy_payload
       LogStash::Json.load(::IO.read(policy_path))
     end
   end
-end; end; end
+end; end; end