Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1481 from openshift-cherrypick-robot/cherry-pick-…
…1478-to-master

[master] bug 1652224. Fix defaultIndex for Kibana uprade
  • Loading branch information
openshift-merge-robot committed Dec 14, 2018
2 parents b362507 + b275e32 commit 6d5d0b7
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.13.1-redhat-1 \
OSE_ES_VER=5.6.13.2-redhat-1 \
PROMETHEUS_EXPORTER_VER=5.6.13.1-redhat-1 \
PLUGIN_LOGLEVEL=INFO \
RECOVER_AFTER_NODES=1 \
Expand All @@ -22,7 +22,7 @@ ENV ES_CONF=/etc/elasticsearch/ \
RELEASE_STREAM=prod \
container=oci

ARG OSE_ES_VER=5.6.13.1-redhat-1
ARG OSE_ES_VER=5.6.13.2-redhat-1
ARG OSE_ES_URL
ARG PROMETHEUS_EXPORTER_VER=5.6.13.1-redhat-1
ARG PROMETHEUS_EXPORTER_URL
Expand Down
4 changes: 2 additions & 2 deletions elasticsearch/Dockerfile.centos7
Expand Up @@ -14,15 +14,15 @@ 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.1 \
OSE_ES_VER=5.6.13.2 \
PROMETHEUS_EXPORTER_VER=5.6.13.1 \
PLUGIN_LOGLEVEL=INFO \
RECOVER_AFTER_NODES=1 \
RECOVER_EXPECTED_NODES=1 \
RECOVER_AFTER_TIME=5m \
RELEASE_STREAM=origin

ARG OSE_ES_VER=5.6.13.1
ARG OSE_ES_VER=5.6.13.2
ARG SG_VER=5.6.13-19.2

LABEL io.k8s.description="Elasticsearch container for EFK aggregated logging storage" \
Expand Down

0 comments on commit 6d5d0b7

Please sign in to comment.