From 6bd66b90b64c02fd5ea8b02169863774f80ca4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Tue, 18 May 2021 14:35:43 +0200 Subject: [PATCH] LOG-1195: Add Openshift Ingest Plugin for ES --- elasticsearch/Dockerfile | 2 ++ elasticsearch/Dockerfile.in | 2 ++ elasticsearch/ci-env.sh | 7 ++++++- elasticsearch/fetch-artifacts-koji.yaml | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 3cec6573d4..fb5bbc0b05 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -31,6 +31,7 @@ USER 0 ARG ES_ARCHIVE_URL ARG PROMETHEUS_EXPORTER_URL +ARG INGEST_PLUGIN_URL ARG OPENDISTRO_URL ARG OPENSHIFT_CI @@ -44,6 +45,7 @@ ENV ES_PATH_CONF=/etc/elasticsearch/ \ JAVA_HOME=/usr/lib/jvm/jre \ NODE_QUORUM=1 \ PROMETHEUS_EXPORTER_VER=6.8.1.0-redhat-00001 \ + INGEST_PLUGIN_URL=6.8.1.0-redhat-00001 \ OPENDISTRO_VER=0.10.0.4-redhat-00001 \ PLUGIN_LOGLEVEL=INFO \ RECOVER_AFTER_NODES=1 \ diff --git a/elasticsearch/Dockerfile.in b/elasticsearch/Dockerfile.in index 999bb266c6..cec15e59eb 100644 --- a/elasticsearch/Dockerfile.in +++ b/elasticsearch/Dockerfile.in @@ -44,6 +44,7 @@ USER 0 ARG ES_ARCHIVE_URL ARG PROMETHEUS_EXPORTER_URL +ARG INGEST_PLUGIN_URL ARG OPENDISTRO_URL ARG OPENSHIFT_CI @@ -57,6 +58,7 @@ ENV ES_PATH_CONF=/etc/elasticsearch/ \ JAVA_HOME=/usr/lib/jvm/jre \ NODE_QUORUM=1 \ PROMETHEUS_EXPORTER_VER=6.8.1.0-redhat-00001 \ + INGEST_PLUGIN_URL=6.8.1.0-redhat-00001 \ OPENDISTRO_VER=0.10.0.4-redhat-00001 \ PLUGIN_LOGLEVEL=INFO \ RECOVER_AFTER_NODES=1 \ diff --git a/elasticsearch/ci-env.sh b/elasticsearch/ci-env.sh index cd62469fcd..fa9a6c6c7e 100755 --- a/elasticsearch/ci-env.sh +++ b/elasticsearch/ci-env.sh @@ -4,6 +4,7 @@ set -o xtrace PROMETHEUS_EXPORTER_URL=${PROMETHEUS_EXPORTER_URL:-$MAVEN_REPO_URL/org/elasticsearch/plugin/prometheus/prometheus-exporter/$PROMETHEUS_EXPORTER_VER/prometheus-exporter-$PROMETHEUS_EXPORTER_VER.zip} OPENDISTRO_URL=${OPENDISTRO_URL:-$MAVEN_REPO_URL/com/amazon/opendistroforelasticsearch/opendistro_security/$OPENDISTRO_VER/opendistro_security-$OPENDISTRO_VER.zip} +INGEST_PLUGIN_URL=${INGESTI_PLUGIN_URL:-$MAVEN_REPO_URL/org/elasticsearch/plugin/ingest/openshift/$INGEST_PLUGIN_VER/openshift_ingest-plugin-$INGEST_PLUGIN_VER.zip} if [[ "${OPENSHIFT_CI:-}" == "true" ]]; then # This flag is set during CI runs. If no ARG was passed in, @@ -11,7 +12,11 @@ if [[ "${OPENSHIFT_CI:-}" == "true" ]]; then export ES_ARCHIVE_URL=https://github.com/openshift/origin-aggregated-logging/releases/download/elasticsearch-oss-$ES_VER/elasticsearch-oss-$ES_VER.zip export OPENDISTRO_URL=https://github.com/openshift/origin-aggregated-logging/releases/download/opendistro_security-$OPENDISTRO_VER/opendistro_security-$OPENDISTRO_VER.zip + # TODO[lvlcek]: We need to download official releases from ViaQ repo. Getting it from lukas-vlcek is temporary. + INGEST_PLUGIN_VER=$(echo INGEST_PLUGIN_VER | cut -d'-' -f1) + export INGEST_PLUGIN_URL=https://github.com/lukas-vlcek/elasticsearch-openshift-ingest-plugin/releases/download/$INGEST_PLUGIN_VER-testing/openshift-ingest-plugin-$INGEST_PLUGIN_VER.zip + PROMETHEUS_EXPORTER_VER=$(echo $PROMETHEUS_EXPORTER_VER | cut -d'-' -f1) export PROMETHEUS_EXPORTER_URL=https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/$PROMETHEUS_EXPORTER_VER/prometheus-exporter-$PROMETHEUS_EXPORTER_VER.zip fi -es_plugins=($OPENDISTRO_URL $PROMETHEUS_EXPORTER_URL) +es_plugins=($OPENDISTRO_URL $PROMETHEUS_EXPORTER_URL $INGEST_PLUGIN_URL) diff --git a/elasticsearch/fetch-artifacts-koji.yaml b/elasticsearch/fetch-artifacts-koji.yaml index 48e0ebf79e..718ea16e29 100644 --- a/elasticsearch/fetch-artifacts-koji.yaml +++ b/elasticsearch/fetch-artifacts-koji.yaml @@ -1,3 +1,4 @@ - nvr: org.elasticsearch-elasticsearch-6.8.1.redhat_00006-1 - nvr: com.amazon.opendistroforelasticsearch-opendistro_security-0.10.0.4_redhat_00001-1 - nvr: org.elasticsearch.plugin.prometheus-prometheus-exporter-6.8.1.0_redhat_00001-1 +- nvr: org.elasticsearch.plugin.ingest.openshift-ingest-plugin-6.8.1.0_redhat_00001-1