Skip to content

Commit

Permalink
Merge pull request #1755 from jcantrill/1752850
Browse files Browse the repository at this point in the history
Bug 1752850: Seed index patterns based on match to existing indices
  • Loading branch information
openshift-merge-robot committed Sep 19, 2019
2 parents c73a0cd + 026fc3a commit 81fab5c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions elasticsearch/Dockerfile
Expand Up @@ -13,7 +13,7 @@ ENV ES_CONF=/etc/elasticsearch/ \
INSTANCE_RAM=512G \
JAVA_VER=1.8.0 \
NODE_QUORUM=1 \
OSE_ES_VER=5.6.16.0-redhat-1 \
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 \
Expand All @@ -23,7 +23,7 @@ ENV ES_CONF=/etc/elasticsearch/ \
DHE_TMP_KEY_SIZE=2048 \
container=oci

ARG OSE_ES_VER=5.6.16.0-redhat-1
ARG OSE_ES_VER=5.6.16.1-redhat-1
ARG OSE_ES_URL
ARG PROMETHEUS_EXPORTER_VER=5.6.16.0-redhat-1
ARG PROMETHEUS_EXPORTER_URL
Expand Down
4 changes: 2 additions & 2 deletions elasticsearch/Dockerfile.centos7
Expand Up @@ -14,7 +14,7 @@ ENV ES_CONF=/etc/elasticsearch/ \
JAVA_VER=1.8.0 \
JAVA_HOME=/usr/lib/jvm/jre \
NODE_QUORUM=1 \
OSE_ES_VER=5.6.16.0 \
OSE_ES_VER=5.6.16.1 \
PROMETHEUS_EXPORTER_VER=5.6.16.0 \
PLUGIN_LOGLEVEL=INFO \
RECOVER_AFTER_NODES=1 \
Expand All @@ -23,7 +23,7 @@ ENV ES_CONF=/etc/elasticsearch/ \
DHE_TMP_KEY_SIZE=2048 \
RELEASE_STREAM=origin

ARG OSE_ES_VER=5.6.16.0
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" \
Expand Down

0 comments on commit 81fab5c

Please sign in to comment.