Skip to content

Commit

Permalink
Bug 1752850: Seed index patterns based on match to existing indices
Browse files Browse the repository at this point in the history
(cherry picked from commit 3e3bff9)
  • Loading branch information
jcantrill committed Sep 17, 2019
1 parent cf15110 commit 05603ee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions elasticsearch/Dockerfile
Expand Up @@ -13,8 +13,8 @@ ENV ES_CONF=/etc/elasticsearch/ \
INSTANCE_RAM=512G \
JAVA_VER=1.8.0 \
NODE_QUORUM=1 \
OSE_ES_VER=5.6.13.8-redhat-1 \
PROMETHEUS_EXPORTER_VER=5.6.13.2-redhat-3 \
OSE_ES_VER=5.6.16.1-redhat-1 \
PROMETHEUS_EXPORTER_VER=5.6.16.0-redhat-1 \
PLUGIN_LOGLEVEL=INFO \
RECOVER_AFTER_NODES=1 \
RECOVER_EXPECTED_NODES=1 \
Expand All @@ -23,7 +23,7 @@ ENV ES_CONF=/etc/elasticsearch/ \
DHE_TMP_KEY_SIZE=2048 \
container=oci

ARG OSE_ES_VER=5.6.13.8-redhat-1
ARG OSE_ES_VER=5.6.16.1-redhat-1
ARG OSE_ES_URL
ARG PROMETHEUS_EXPORTER_VER=5.6.13.2-redhat-3
ARG PROMETHEUS_EXPORTER_URL
Expand Down
8 changes: 4 additions & 4 deletions elasticsearch/Dockerfile.centos7
Expand Up @@ -14,17 +14,17 @@ ENV ES_CONF=/etc/elasticsearch/ \
JAVA_VER=1.8.0 \
JAVA_HOME=/usr/lib/jvm/jre \
NODE_QUORUM=1 \
OSE_ES_VER=5.6.13.8 \
PROMETHEUS_EXPORTER_VER=5.6.13.2 \
OSE_ES_VER=5.6.16.1 \
PROMETHEUS_EXPORTER_VER=5.6.16.0 \
PLUGIN_LOGLEVEL=INFO \
RECOVER_AFTER_NODES=1 \
RECOVER_EXPECTED_NODES=1 \
RECOVER_AFTER_TIME=5m \
DHE_TMP_KEY_SIZE=2048 \
RELEASE_STREAM=origin

ARG OSE_ES_VER=5.6.13.8
ARG SG_VER=5.6.13-19.2
ARG OSE_ES_VER=5.6.16.1
ARG SG_VER=5.6.16-19.3

LABEL io.k8s.description="Elasticsearch container for EFK aggregated logging storage" \
io.k8s.display-name="Elasticsearch ${ES_VER}" \
Expand Down

0 comments on commit 05603ee

Please sign in to comment.