Revert "Set ELK components version from .env file" (#206)
This reverts commit 5075cafea0
.
Fixes #205
This commit is contained in:
parent
a935ffd27e
commit
8f5b242d6a
17
README.md
17
README.md
|
@ -42,8 +42,6 @@ Based on the official Docker images:
|
||||||
6. [JVM tuning](#jvm-tuning)
|
6. [JVM tuning](#jvm-tuning)
|
||||||
* [How can I specify the amount of memory used by a service?](#how-can-i-specify-the-amount-of-memory-used-by-a-service)
|
* [How can I specify the amount of memory used by a service?](#how-can-i-specify-the-amount-of-memory-used-by-a-service)
|
||||||
* [How can I enable a remote JMX connection to a service?](#how-can-i-enable-a-remote-jmx-connection-to-a-service)
|
* [How can I enable a remote JMX connection to a service?](#how-can-i-enable-a-remote-jmx-connection-to-a-service)
|
||||||
7. [Updates](#updates)
|
|
||||||
* [Using a newer stack version](#using-a-newer-stack-version)
|
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
|
@ -255,18 +253,3 @@ logstash:
|
||||||
environment:
|
environment:
|
||||||
LS_JAVA_OPTS: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=18080 -Dcom.sun.management.jmxremote.rmi.port=18080 -Djava.rmi.server.hostname=DOCKER_HOST_IP -Dcom.sun.management.jmxremote.local.only=false"
|
LS_JAVA_OPTS: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=18080 -Dcom.sun.management.jmxremote.rmi.port=18080 -Djava.rmi.server.hostname=DOCKER_HOST_IP -Dcom.sun.management.jmxremote.local.only=false"
|
||||||
```
|
```
|
||||||
|
|
||||||
## Updates
|
|
||||||
|
|
||||||
### Using a newer stack version
|
|
||||||
|
|
||||||
To use a different Elastic Stack version than the one currently available in the repository, simply change the version
|
|
||||||
number inside the `.env` file, and rebuild the stack with:
|
|
||||||
|
|
||||||
```console
|
|
||||||
$ docker-compose build
|
|
||||||
$ docker-compose up
|
|
||||||
```
|
|
||||||
|
|
||||||
**NOTE**: Always pay attention to the [upgrade instructions](https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html)
|
|
||||||
for each individual component before performing a stack upgrade.
|
|
||||||
|
|
|
@ -5,8 +5,6 @@ services:
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
build:
|
build:
|
||||||
context: elasticsearch/
|
context: elasticsearch/
|
||||||
args:
|
|
||||||
ELK_VERSION: $ELK_VERSION
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
|
- ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
|
||||||
ports:
|
ports:
|
||||||
|
@ -20,8 +18,6 @@ services:
|
||||||
logstash:
|
logstash:
|
||||||
build:
|
build:
|
||||||
context: logstash/
|
context: logstash/
|
||||||
args:
|
|
||||||
ELK_VERSION: $ELK_VERSION
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro
|
- ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro
|
||||||
- ./logstash/pipeline:/usr/share/logstash/pipeline
|
- ./logstash/pipeline:/usr/share/logstash/pipeline
|
||||||
|
@ -37,8 +33,6 @@ services:
|
||||||
kibana:
|
kibana:
|
||||||
build:
|
build:
|
||||||
context: kibana/
|
context: kibana/
|
||||||
args:
|
|
||||||
ELK_VERSION: $ELK_VERSION
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./kibana/config/:/usr/share/kibana/config:ro
|
- ./kibana/config/:/usr/share/kibana/config:ro
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
ARG ELK_VERSION
|
|
||||||
|
|
||||||
# https://github.com/elastic/elasticsearch-docker
|
# https://github.com/elastic/elasticsearch-docker
|
||||||
FROM docker.elastic.co/elasticsearch/elasticsearch-oss:${ELK_VERSION}
|
FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.0.0
|
||||||
|
|
||||||
# Add your elasticsearch plugins setup here
|
# Add your elasticsearch plugins setup here
|
||||||
# Example: RUN elasticsearch-plugin install analysis-icu
|
# Example: RUN elasticsearch-plugin install analysis-icu
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
ARG ELK_VERSION
|
|
||||||
|
|
||||||
# https://github.com/elastic/kibana-docker
|
# https://github.com/elastic/kibana-docker
|
||||||
FROM docker.elastic.co/kibana/kibana-oss:${ELK_VERSION}
|
FROM docker.elastic.co/kibana/kibana-oss:6.0.0
|
||||||
|
|
||||||
# Add your kibana plugins setup here
|
# Add your kibana plugins setup here
|
||||||
# Example: RUN kibana-plugin install <name|url>
|
# Example: RUN kibana-plugin install <name|url>
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
ARG ELK_VERSION
|
|
||||||
|
|
||||||
# https://github.com/elastic/logstash-docker
|
# https://github.com/elastic/logstash-docker
|
||||||
FROM docker.elastic.co/logstash/logstash-oss:${ELK_VERSION}
|
FROM docker.elastic.co/logstash/logstash-oss:6.0.0
|
||||||
|
|
||||||
# Add your logstash plugins setup here
|
# Add your logstash plugins setup here
|
||||||
# Example: RUN logstash-plugin install logstash-filter-json
|
# Example: RUN logstash-plugin install logstash-filter-json
|
||||||
|
|
Loading…
Reference in New Issue