From 0ff824c4dcb0058849936d715116fb7e4f0a5003 Mon Sep 17 00:00:00 2001
From: Andrew Carter <ancarter@ciena.com>
Date: Tue, 8 Oct 2019 16:56:33 -0400
Subject: [PATCH 1/2] Update to 6.8.3 and add restart always to apm-server

---
 elastic-apm-java/docker/apm-server/Dockerfile    | 4 ++--
 elastic-apm-java/docker/docker-compose.yml       | 3 ++-
 elastic-apm-java/docker/elasticsearch/Dockerfile | 4 ++--
 elastic-apm-java/docs/index.md                   | 7 +++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/elastic-apm-java/docker/apm-server/Dockerfile b/elastic-apm-java/docker/apm-server/Dockerfile
index 9038e28..5e66e0e 100644
--- a/elastic-apm-java/docker/apm-server/Dockerfile
+++ b/elastic-apm-java/docker/apm-server/Dockerfile
@@ -1,5 +1,5 @@
-FROM docker.elastic.co/apm/apm-server:6.5.4
+FROM docker.elastic.co/apm/apm-server:6.8.3
 COPY apm-server.yml /usr/share/apm-server/apm-server.yml
 USER root
 RUN chown root:apm-server /usr/share/apm-server/apm-server.yml
-USER apm-server
\ No newline at end of file
+USER apm-server
diff --git a/elastic-apm-java/docker/docker-compose.yml b/elastic-apm-java/docker/docker-compose.yml
index f28b89b..a57f10e 100644
--- a/elastic-apm-java/docker/docker-compose.yml
+++ b/elastic-apm-java/docker/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - apm
       - mysql
   kibana:
-    image: kibana:6.5.2
+    image: kibana:6.8.3
     environment:
       - "LOGGING_QUIET=true"
     links:
@@ -49,6 +49,7 @@ services:
     build:
       context: apm-server
       dockerfile: Dockerfile
+    restart: always
     ports:
       - 8200:8200
     links:
diff --git a/elastic-apm-java/docker/elasticsearch/Dockerfile b/elastic-apm-java/docker/elasticsearch/Dockerfile
index df65d08..d24bab3 100644
--- a/elastic-apm-java/docker/elasticsearch/Dockerfile
+++ b/elastic-apm-java/docker/elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.2
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.3
 COPY --chown=elasticsearch:elasticsearch elasticsearch.yml /usr/share/elasticsearch/config/
 
-CMD ["elasticsearch", "-Elogger.level=INFO"]
\ No newline at end of file
+CMD ["elasticsearch", "-Elogger.level=INFO"]
diff --git a/elastic-apm-java/docs/index.md b/elastic-apm-java/docs/index.md
index 41ca610..fea7ca0 100644
--- a/elastic-apm-java/docs/index.md
+++ b/elastic-apm-java/docs/index.md
@@ -1,4 +1,4 @@
-# Monitor Spring Boot Application Performance with Elastic APM, Elasticsearch and Kibana
+ Monitor Spring Boot Application Performance with Elastic APM, Elasticsearch and Kibana
 
 ## Introduction
 We know that applications deployed in a production state require large amount of data for performance and debuging purposes.
@@ -70,8 +70,7 @@ Besides the REST api, the application will have some scheduled backgrounds tasks
  
  ![alt-text](./images/docker-ps.png)
  
- If APM Server service doesn't start, it's because it uses Elasticsearch and Elasticsearch take some time to start. To solve this, just restart some containers using this command: `docker-compose -f docker/docker-compose.yml restart apm user-microservice
-`. 
+ If APM Server service is restarting, it's because it uses Elasticsearch and Elasticsearch take some time to start. This will resolve itself when Elasticsearch is available. 
 
 #### Spring Boot Service Dockerfile
 
@@ -92,7 +91,7 @@ CMD java -javaagent:/opt/app/apm-agent.jar $JVM_OPTIONS -jar $JAR_NAME
 ### APM Server Dockerfile
 
 ```dockerfile
-FROM docker.elastic.co/apm/apm-server:6.5.4
+FROM docker.elastic.co/apm/apm-server:6.8.3
 COPY apm-server.yml /usr/share/apm-server/apm-server.yml
 USER root
 RUN chown root:apm-server /usr/share/apm-server/apm-server.yml

From 974cbe6238c2093622a1bfa9260117343c3d784a Mon Sep 17 00:00:00 2001
From: Andrew Carter <ancarter@ciena.com>
Date: Thu, 10 Oct 2019 15:59:51 -0400
Subject: [PATCH 2/2] Fix index.md

---
 elastic-apm-java/docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elastic-apm-java/docs/index.md b/elastic-apm-java/docs/index.md
index fea7ca0..06f134d 100644
--- a/elastic-apm-java/docs/index.md
+++ b/elastic-apm-java/docs/index.md
@@ -1,4 +1,4 @@
- Monitor Spring Boot Application Performance with Elastic APM, Elasticsearch and Kibana
+# Monitor Spring Boot Application Performance with Elastic APM, Elasticsearch and Kibana
 
 ## Introduction
 We know that applications deployed in a production state require large amount of data for performance and debuging purposes.