Revert to e855ae0

Author: KOTungseth

docs/en/getting-started/docker/docker-compose.yml

@@ -19,7 +19,11 @@ services:
     ports:
       - 9200:9200
     networks:
+<<<<<<< HEAD
+      - elastic    
+=======
       - elastic
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
 
   es02:
     image: docker.elastic.co/elasticsearch/elasticsearch:{version}
@@ -37,9 +41,17 @@ services:
         hard: -1
     volumes:
       - data02:/usr/share/elasticsearch/data
+<<<<<<< HEAD
+    ports:
+      - 9201:9201
+    networks:
+      - elastic
+  
+=======
     networks:
       - elastic
 
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
   es03:
     image: docker.elastic.co/elasticsearch/elasticsearch:{version}
     container_name: es03
@@ -56,6 +68,11 @@ services:
         hard: -1
     volumes:
       - data03:/usr/share/elasticsearch/data
+<<<<<<< HEAD
+    ports:
+      - 9202:9202     
+=======
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
     networks:
       - elastic
 
@@ -66,17 +83,27 @@ services:
       - 5601:5601
     environment:
       ELASTICSEARCH_URL: http://es01:9200
+<<<<<<< HEAD
+      ELASTICSEARCH_HOSTS: http://es01:9200
+    networks:
+      - elastic      
+=======
       ELASTICSEARCH_HOSTS: '["http://es01:9200","http://es02:9200","http://es03:9200"]'
     networks:
       - elastic
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
 
 volumes:
   data01:
     driver: local
   data02:
     driver: local
   data03:
+<<<<<<< HEAD
+    driver: local    
+=======
     driver: local
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
 
 networks:
   elastic:

docs/en/getting-started/docker/elastic-docker-tls.yml

@@ -86,7 +86,11 @@ services:
       - xpack.security.http.ssl.enabled=true
       - xpack.security.http.ssl.key=$CERTS_DIR/es03/es03.key
       - xpack.security.http.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt
+<<<<<<< HEAD
+      - xpack.security.http.ssl.certificate=$CERTS_DIR/es02/es02.crt
+=======
       - xpack.security.http.ssl.certificate=$CERTS_DIR/es03/es03.crt
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
       - xpack.security.transport.ssl.enabled=true
       - xpack.security.transport.ssl.verification_mode=certificate 
       - xpack.security.transport.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt
@@ -111,7 +115,11 @@ services:
       SERVERNAME: localhost
       ELASTICSEARCH_URL: https://es01:9200
       ELASTICSEARCH_HOSTS: https://es01:9200
+<<<<<<< HEAD
+      ELASTICSEARCH_USERNAME: kibana
+=======
       ELASTICSEARCH_USERNAME: kibana_system
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
       ELASTICSEARCH_PASSWORD: CHANGEME
       ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES: $CERTS_DIR/ca/ca.crt
       SERVER_SSL_ENABLED: "true"

docs/en/getting-started/get-started-docker.asciidoc

@@ -57,11 +57,18 @@ volumes by running `docker-compose down -v`.
 [[get-started-docker-tls]]
 === Run in Docker with TLS enabled 
 
+<<<<<<< HEAD
+When security is enabled with a https://www.elastic.co/subscriptions[Gold or Platinum license], 
+Transport Layer Security (TLS) encryption must be configured for the {es} transport layer. 
+While it is possible to use a trial license without setting up TLS,
+we advise securing your stack from the start. 
+=======
 If you have a {subscriptions}[Gold (or higher) subscription] and the
 {security-features} are enabled, you must configure Transport Layer Security
 (TLS) encryption for the {es} transport layer. While it is possible to use a
 trial license without setting up TLS, we advise securing your stack from the
 start. 
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
 
 To get an {es} cluster and {kib} up and running in Docker with security enabled, 
 you can use Docker Compose:
@@ -142,30 +149,54 @@ docker-compose -f elastic-docker-tls.yml up -d
 ----
 
 IMPORTANT: At this point, {kib} cannot connect to the {es} cluster.
+<<<<<<< HEAD
+You must generate a password for the built-in `kibana` user, update the `ELASTICSEARCH_PASSWORD` 
+=======
 You must generate a password for the built-in `kibana_system` user, update the `ELASTICSEARCH_PASSWORD` 
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
 in the compose file, and restart to enable {kib} to communicate with the secured cluster. 
 
 --
 
 . Run the `elasticsearch-setup-passwords` tool to generate passwords for all built-in users, 
+<<<<<<< HEAD
+including the `kibana` user. If you don't use PowerShell on Windows, remove the trailing `\`characters
+=======
 including the `kibana_system` user. If you don't use PowerShell on Windows, remove the trailing `\`characters
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
 and join the lines before running this command.
 +
 --
 ["source","sh"]
 ----
 docker exec es01 /bin/bash -c "bin/elasticsearch-setup-passwords \
+<<<<<<< HEAD
+auto --batch \
+-Expack.security.http.ssl.certificate=certificates/es01/es01.crt \
+-Expack.security.http.ssl.certificate_authorities=certificates/ca/ca.crt \
+-Expack.security.http.ssl.key=certificates/es01/es01.key \
+--url https://es01:9200"
+----
+
+IMPORTANT: Make a note of the generated passwords. 
+You must configure the `kibana` user password in the compose file to enable {kib} to connect to {es}, 
+=======
 auto --batch --url https://es01:9200"
 ----
 
 IMPORTANT: Make a note of the generated passwords. 
 You must configure the `kibana_system` user password in the compose file to enable {kib} to connect to {es}, 
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
 and you'll need the password for the `elastic` superuser to 
 log in to {kib} and submit requests to {es}.
 --
 
 . Set `ELASTICSEARCH_PASSWORD` in the `elastic-docker-tls.yml` compose file to the password 
+<<<<<<< HEAD
+generated for the `kibana` user.
+=======
 generated for the `kibana_system` user.
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
 +
 --
 ifeval::["{release-state}"=="unreleased"]
@@ -187,7 +218,11 @@ ifeval::["{release-state}"!="unreleased"]
       SERVERNAME: localhost
       ELASTICSEARCH_URL: https://es01:9200
       ELASTICSEARCH_HOSTS: https://es01:9200
+<<<<<<< HEAD
+      ELASTICSEARCH_USERNAME: kibana
+=======
       ELASTICSEARCH_USERNAME: kibana_system
+>>>>>>> e855ae0e9d059941a5ab131ec197b554200184e8
       **ELASTICSEARCH_PASSWORD: CHANGEME**
       ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES: $CERTS_DIR/ca/ca.crt
       SERVER_SSL_ENABLED: "true"
@@ -253,7 +288,7 @@ Similarly, to load {kib} settings from a file, you overwrite `/usr/share/kibana/
 See the product-specific documentation for information about running a specific Elastic product in Docker:
 
 * {ref}/docker.html[Install {es} with Docker]
-* {apm-server-ref}/running-on-docker.html[Running APM Server on Docker]
+* {apm-server-ref-70}/running-on-docker.html[Running APM Server on Docker]
 * {auditbeat-ref}/running-on-docker.html[Running {auditbeat} on Docker]
 * {filebeat-ref}/running-on-docker.html[Running {filebeat} on Docker]
 * {heartbeat-ref}/running-on-docker.html[Running {heartbeat} on Docker]