Merge pull request #1947 from multi-arch/master

Prepare for RHEL 8

Author: openshift-merge-robot

elasticsearch/Dockerfile.rhel8

@@ -0,0 +1,60 @@
+FROM ubi8:latest
+
+MAINTAINER OpenShift Development <[email protected]>
+
+EXPOSE 9200
+EXPOSE 9300
+USER 0
+
+ENV ES_PATH_CONF=/etc/elasticsearch/ \
+    ES_HOME=/usr/share/elasticsearch \
+    ES_VER=6.8.1.redhat-6 \
+    HOME=/opt/app-root/src \
+    INSTANCE_RAM=512G \
+    JAVA_VER=1.8.0 \
+    JAVA_HOME=/usr/lib/jvm/jre \
+    NODE_QUORUM=1 \
+    PROMETHEUS_EXPORTER_VER=6.8.1.0-redhat-1 \
+    OPENDISTRO_VER=0.10.1.0-redhat-1 \
+    PLUGIN_LOGLEVEL=INFO \
+    RECOVER_AFTER_NODES=1 \
+    RECOVER_EXPECTED_NODES=1 \
+    RECOVER_AFTER_TIME=5m \
+    DHE_TMP_KEY_SIZE=2048 \
+    RELEASE_STREAM=origin
+
+ARG MAVEN_REPO_URL=file:///artifacts/
+
+RUN packages="java-${JAVA_VER}-openjdk-headless \
+              python3 python3-pyyaml  \
+              hostname \
+              openssl \
+              zip \
+              unzip \
+              jq" && \
+    yum install -y --setopt=tsflags=nodocs ${packages} && \
+    rpm -V ${packages} && \
+    alternatives --set python /usr/bin/python3 &&
+    yum clean all
+
+ADD extra-jvm.options install-es.sh /var/tmp
+COPY artifacts /artifacts
+RUN /var/tmp/install-es.sh
+
+ADD sgconfig/ ${HOME}/sgconfig/
+ADD index_templates/ ${ES_HOME}/index_templates/
+ADD index_patterns/ ${ES_HOME}/index_patterns/
+ADD init/ ${ES_HOME}/init/
+ADD kibana_ui_objects/ ${ES_HOME}/kibana_ui_objects/
+ADD probe/ ${ES_HOME}/probe/
+ADD init.sh run.sh prep-install* install.sh ${HOME}/
+COPY utils/** /usr/local/bin/
+
+ARG PROMETHEUS_EXPORTER_URL=${MAVEN_REPO_URL}org/elasticsearch/plugin/prometheus/prometheus-exporter/${PROMETHEUS_EXPORTER_VER}/prometheus-exporter-${PROMETHEUS_EXPORTER_VER}.zip
+ARG OPENDISTRO_URL=${MAVEN_REPO_URL}com/amazon/opendistroforelasticsearch/opendistro_security/${OPENDISTRO_VER}/opendistro_security-${OPENDISTRO_VER}.zip
+
+RUN ${HOME}/install.sh && rm -rf /artifacts
+
+WORKDIR ${HOME}
+USER 1000
+CMD ["sh", "/opt/app-root/src/run.sh"]

elasticsearch/utils/es_util_env

@@ -11,11 +11,11 @@ get_security_conf_index() {
   local index=$( python -c 'import sys,yaml
 hsh = yaml.load(open(sys.argv[1]))
 if "searchguard" in hsh and "config_index_name" in hsh["searchguard"]:
-  print hsh["searchguard"]["config_index_name"]
+  print(hsh["searchguard"]["config_index_name"])
 elif "opendistro_security" in hsh and "config_index_name" in hsh["opendistro_security"]:
-  print hsh["opendistro_security"]["config_index_name"]
+  print(hsh["opendistro_security"]["config_index_name"])
 else:
-  print "unknown_security_index"
+  print("unknown_security_index")
 ' $es_config_file )
   echo $index
 }

kibana/Dockerfile.rhel8

@@ -0,0 +1,34 @@
+FROM ubi8/nodejs-10:latest
+
+MAINTAINER OpenShift Development <[email protected]>
+
+EXPOSE 5601
+
+ENV ELASTICSEARCH_URL=https://elasticsearch.openshift-logging.svc.cluster.local:9200 \
+    HOME=/opt/app-root/src  \
+    KIBANA_CONF_DIR=${HOME}/config \
+    KIBANA_VERSION=6.8.1 \
+    NODE_ENV=production \
+    RELEASE_STREAM=prod \
+    container=oci \
+    NODE_ENV=production \
+    NODE_PATH=/usr/bin
+
+ARG LOCAL_REPO
+
+USER 0
+
+COPY vendored_tar_src/kibana-oss-6.8.1 ${HOME}/
+COPY vendored_tar_src/opendistro_security_kibana_plugin-0.10.0.4/ ${HOME}/plugins/opendistro_security_kibana_plugin-0.10.0.4/
+
+RUN chmod -R og+w ${HOME}/
+ADD probe/ /usr/share/kibana/probe/
+ADD kibana.yml ${KIBANA_CONF_DIR}/
+ADD run.sh utils ${HOME}/
+RUN sed -i -e 's/"node":.*/"node": "'$(${NODE_PATH}/node --version | sed 's/v//')'"/' package.json && \
+    mkdir -p node && \
+    ln -s ${NODE_PATH} node/bin
+RUN bin/kibana --optimize
+
+WORKDIR ${HOME}
+CMD ["./run.sh"]