Skip to content

Commit

Permalink
[DOCS] Update Docker getting started for the Stack (#1888)
Browse files Browse the repository at this point in the history
* [DOCS] Update Docker getting started for the Stack

* Adding redirect file

* Update reset password syntax

* Incorporating review feedback, adding response, updating commands, adding remove container section

* Update if statements for unreleased versions

* Fix typo

* Apply suggestions from code review

Co-authored-by: Ioannis Kakavas <ikakavas@protonmail.com>

* More review feedback, plus some optimizations

* Create section for generating passwords and enrollment tokens

Co-authored-by: Ioannis Kakavas <ikakavas@protonmail.com>
  • Loading branch information
Adam Locke and jkakavas authored Dec 3, 2021
1 parent 6f015d0 commit af89863
Show file tree
Hide file tree
Showing 6 changed files with 379 additions and 134 deletions.
36 changes: 18 additions & 18 deletions docs/en/getting-started/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
version: '2.2'
version: "2.2"
services:
es01:
es-node01:
image: docker.elastic.co/elasticsearch/elasticsearch:{version}
container_name: es01
container_name: es-node01
environment:
- node.name=es01
- node.name=es-node01
- cluster.name=es-docker-cluster
- discovery.seed_hosts=es02,es03
- cluster.initial_master_nodes=es01,es02,es03
- discovery.seed_hosts=es-node02,es-node03
- cluster.initial_master_nodes=es-node01,es-node02,es-node03
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits:
Expand All @@ -21,14 +21,14 @@ services:
networks:
- elastic

es02:
es-node02:
image: docker.elastic.co/elasticsearch/elasticsearch:{version}
container_name: es02
container_name: es-node02
environment:
- node.name=es02
- node.name=es-node02
- cluster.name=es-docker-cluster
- discovery.seed_hosts=es01,es03
- cluster.initial_master_nodes=es01,es02,es03
- discovery.seed_hosts=es-node01,es-node03
- cluster.initial_master_nodes=es-node01,es-node02,es-node03
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits:
Expand All @@ -40,14 +40,14 @@ services:
networks:
- elastic

es03:
es-node03:
image: docker.elastic.co/elasticsearch/elasticsearch:{version}
container_name: es03
container_name: es-node03
environment:
- node.name=es03
- node.name=es-node03
- cluster.name=es-docker-cluster
- discovery.seed_hosts=es01,es02
- cluster.initial_master_nodes=es01,es02,es03
- discovery.seed_hosts=es-node01,es-node02
- cluster.initial_master_nodes=es-node01,es-node02,es-node03
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ulimits:
Expand All @@ -65,8 +65,8 @@ services:
ports:
- 5601:5601
environment:
ELASTICSEARCH_URL: http://es01:9200
ELASTICSEARCH_HOSTS: '["http://es01:9200","http://es02:9200","http://es03:9200"]'
ELASTICSEARCH_URL: http://es-node01:9200
ELASTICSEARCH_HOSTS: '["http://es-node01:9200","http://es-node02:9200","http://es-node03:9200"]'
networks:
- elastic

Expand Down
90 changes: 45 additions & 45 deletions docs/en/getting-started/docker/elastic-docker-tls.yml
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
version: '2.2'
version: "2.2"

services:
es01:
es-node01:
image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION}
container_name: es01
container_name: es-node01
environment:
- node.name=es01
- cluster.name=es-docker-cluster
- discovery.seed_hosts=es02,es03
- cluster.initial_master_nodes=es01,es02,es03
- node.name=es-node01
- cluster.name=es-docker-cluster
- discovery.seed_hosts=es-node02,es-node03
- cluster.initial_master_nodes=es-node01,es-node02,es-node03
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- xpack.license.self_generated.type=trial # <1>
- xpack.security.enabled=true
- xpack.security.enabled=true
- xpack.security.http.ssl.enabled=true # <2>
- xpack.security.http.ssl.key=$CERTS_DIR/es01/es01.key
- xpack.security.http.ssl.key=$CERTS_DIR/es-node01/es-node01.key
- xpack.security.http.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt
- xpack.security.http.ssl.certificate=$CERTS_DIR/es01/es01.crt
- xpack.security.http.ssl.certificate=$CERTS_DIR/es-node01/es-node01.crt
- xpack.security.transport.ssl.enabled=true # <3>
- xpack.security.transport.ssl.verification_mode=certificate # <4>
- xpack.security.transport.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt
- xpack.security.transport.ssl.certificate=$CERTS_DIR/es01/es01.crt
- xpack.security.transport.ssl.key=$CERTS_DIR/es01/es01.key
- xpack.security.transport.ssl.certificate=$CERTS_DIR/es-node01/es-node01.crt
- xpack.security.transport.ssl.key=$CERTS_DIR/es-node01/es-node01.key
ulimits:
memlock:
soft: -1
hard: -1
volumes:
volumes:
- data01:/usr/share/elasticsearch/data
- certs:$CERTS_DIR
ports:
- 9200:9200
networks:
- elastic

healthcheck:
test: curl --cacert $CERTS_DIR/ca/ca.crt -s https://localhost:9200 >/dev/null; if [[ $$? == 52 ]]; then echo 0; else echo 1; fi
interval: 30s
timeout: 10s
retries: 5

es02:
es-node02:
image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION}
container_name: es02
container_name: es-node02
environment:
- node.name=es02
- node.name=es-node02
- cluster.name=es-docker-cluster
- discovery.seed_hosts=es01,es03
- cluster.initial_master_nodes=es01,es02,es03
- discovery.seed_hosts=es-node01,es-node03
- cluster.initial_master_nodes=es-node01,es-node02,es-node03
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- xpack.license.self_generated.type=trial
- xpack.security.enabled=true
- xpack.security.http.ssl.enabled=true
- xpack.security.http.ssl.key=$CERTS_DIR/es02/es02.key
- xpack.security.http.ssl.key=$CERTS_DIR/es-node02/es-node02.key
- xpack.security.http.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt
- xpack.security.http.ssl.certificate=$CERTS_DIR/es02/es02.crt
- xpack.security.http.ssl.certificate=$CERTS_DIR/es-node02/es-node02.crt
- xpack.security.transport.ssl.enabled=true
- xpack.security.transport.ssl.verification_mode=certificate
- xpack.security.transport.ssl.verification_mode=certificate
- xpack.security.transport.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt
- xpack.security.transport.ssl.certificate=$CERTS_DIR/es02/es02.crt
- xpack.security.transport.ssl.key=$CERTS_DIR/es02/es02.key
- xpack.security.transport.ssl.certificate=$CERTS_DIR/es-node02/es-node02.crt
- xpack.security.transport.ssl.key=$CERTS_DIR/es-node02/es-node02.key
ulimits:
memlock:
soft: -1
Expand All @@ -70,57 +70,57 @@ services:
- certs:$CERTS_DIR
networks:
- elastic
es03:

es-node03:
image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION}
container_name: es03
container_name: es-node03
environment:
- node.name=es03
- node.name=es-node03
- cluster.name=es-docker-cluster
- discovery.seed_hosts=es01,es02
- cluster.initial_master_nodes=es01,es02,es03
- discovery.seed_hosts=es-node01,es-node02
- cluster.initial_master_nodes=es-node01,es-node02,es-node03
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- xpack.license.self_generated.type=trial
- xpack.security.enabled=true
- xpack.security.http.ssl.enabled=true
- xpack.security.http.ssl.key=$CERTS_DIR/es03/es03.key
- xpack.security.http.ssl.key=$CERTS_DIR/es-node03/es-node03.key
- xpack.security.http.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt
- xpack.security.http.ssl.certificate=$CERTS_DIR/es03/es03.crt
- xpack.security.http.ssl.certificate=$CERTS_DIR/es-node03/es-node03.crt
- xpack.security.transport.ssl.enabled=true
- xpack.security.transport.ssl.verification_mode=certificate
- xpack.security.transport.ssl.verification_mode=certificate
- xpack.security.transport.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt
- xpack.security.transport.ssl.certificate=$CERTS_DIR/es03/es03.crt
- xpack.security.transport.ssl.key=$CERTS_DIR/es03/es03.key
- xpack.security.transport.ssl.certificate=$CERTS_DIR/es-node03/es-node03.crt
- xpack.security.transport.ssl.key=$CERTS_DIR/es-node03/es-node03.key
ulimits:
memlock:
soft: -1
hard: -1
volumes:
volumes:
- data03:/usr/share/elasticsearch/data
- certs:$CERTS_DIR
networks:
- elastic
kib01:
image: docker.elastic.co/kibana/kibana:${VERSION}
container_name: kib01
depends_on: {"es01": {"condition": "service_healthy"}}
depends_on: { "es-node01": { "condition": "service_healthy" } }
ports:
- 5601:5601
- 5601:5601
environment:
SERVERNAME: localhost
ELASTICSEARCH_URL: https://es01:9200
ELASTICSEARCH_HOSTS: https://es01:9200
ELASTICSEARCH_URL: https://es-node01:9200
ELASTICSEARCH_HOSTS: https://es-node01:9200
ELASTICSEARCH_USERNAME: kibana_system
ELASTICSEARCH_PASSWORD: CHANGEME
ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES: $CERTS_DIR/ca/ca.crt
SERVER_SSL_ENABLED: "true"
SERVER_SSL_KEY: $CERTS_DIR/kib01/kib01.key
SERVER_SSL_CERTIFICATE: $CERTS_DIR/kib01/kib01.crt
volumes:
volumes:
- certs:$CERTS_DIR
networks:
- elastic
- elastic
volumes:
data01:
driver: local
Expand All @@ -131,6 +131,6 @@ volumes:
certs:
driver: local

networks:
networks:
elastic:
driver: bridge
driver: bridge
22 changes: 11 additions & 11 deletions docs/en/getting-started/docker/instances.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
instances:
- name: es01
- name: es-node01
dns:
- es01
- es-node01
- localhost
ip:
- 127.0.0.1

- name: es02
- name: es-node02
dns:
- es02
- es-node02
- localhost
ip:
- 127.0.0.1
- name: es03

- name: es-node03
dns:
- es03
- es-node03
- localhost
ip:
- 127.0.0.1
- name: 'kib01'
dns:

- name: "kib01"
dns:
- kib01
- localhost
- localhost
Loading

0 comments on commit af89863

Please sign in to comment.