Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Carter214/6.8.3 #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −8
Open

Carter214/6.8.3 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ff824c
Update to 6.8.3 and add restart always to apm-server
Oct 8, 2019
974cbe6
Fix index.md
Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions elastic-apm-java/docker/apm-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
USER apm-server
3 changes: 2 additions & 1 deletion elastic-apm-java/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- apm
- mysql
kibana:
image: kibana:6.5.2
image: kibana:6.8.3
environment:
- "LOGGING_QUIET=true"
links:
Expand Down Expand Up @@ -49,6 +49,7 @@ services:
build:
context: apm-server
dockerfile: Dockerfile
restart: always
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

ports:
- 8200:8200
links:
Expand Down
4 changes: 2 additions & 2 deletions elastic-apm-java/docker/elasticsearch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
CMD ["elasticsearch", "-Elogger.level=INFO"]
5 changes: 2 additions & 3 deletions elastic-apm-java/docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we still need this paragraph?


#### Spring Boot Service Dockerfile

Expand All @@ -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
Expand Down