Skip to content

Commit 0f57aeb

Browse files
committed
Used Graylog
1 parent 39c697d commit 0f57aeb

File tree

3 files changed

+26
-13
lines changed

3 files changed

+26
-13
lines changed

docker-compose.yml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,20 @@ services:
5757
- "MAX_HEAP_SIZE=512m"
5858
deploy:
5959
replicas: 4
60-
kibana:
61-
image: docker.elastic.co/kibana/kibana:5.6.3
62-
ports:
63-
- "3002:5601"
64-
environment:
65-
- xpack.monitoring.ui.container.elasticsearch.enabled=false
66-
# SERVER_NAME: kibana.example.org
67-
# ELASTICSEARCH_URL: http://elasticsearch.example.org
68-
links:
69-
- log-elasticsearch:elasticsearch
60+
61+
log-mongo:
62+
image: mongo:3
63+
volumes:
64+
- logging:/usr/share/elasticsearch/data
7065
networks:
7166
- logging
67+
environment:
68+
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
69+
- xpack.security.enabled=false
70+
ulimits:
71+
memlock:
72+
soft: -1
73+
hard: -1
7274
log-elasticsearch:
7375
image: docker.elastic.co/elasticsearch/elasticsearch:5.6.3
7476
volumes:
@@ -77,17 +79,28 @@ services:
7779
- logging
7880
environment:
7981
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
82+
- cluster.name=graylog
8083
- xpack.security.enabled=false
8184
ulimits:
8285
memlock:
8386
soft: -1
8487
hard: -1
8588
logstash-ms:
86-
build: ./src/docker/logstash-ms
89+
image: graylog/graylog:2.3.1-1
90+
environment:
91+
# CHANGE ME!
92+
- GRAYLOG_PASSWORD_SECRET=somepasswordpepper
93+
# Password: admin
94+
- GRAYLOG_ROOT_PASSWORD_SHA2=8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918
95+
- GRAYLOG_WEB_ENDPOINT_URI=http://127.0.0.1:9000/api
96+
ports:
97+
- "9000:9000"
8798
depends_on:
8899
- log-elasticsearch
100+
- log-mongo
89101
links:
90102
- log-elasticsearch:elasticsearch
103+
- log-mongo:mongo
91104
networks:
92105
- default
93106
- logging

ms-common/src/main/resources/logback-spring.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<includeMdcData>true</includeMdcData>
2626
<includeRootCauseData>true</includeRootCauseData>
2727
<includeLevelName>true</includeLevelName>
28-
<staticField>request_id:{X-Request-ID}</staticField>
28+
<staticField>request_id:%{X-Request-ID}</staticField>
2929
</layout>
3030
</appender>
3131
<logger name="stdout" level="WARN">

ms-gateway/src/main/resources/logback-spring.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<includeMdcData>true</includeMdcData>
2626
<includeRootCauseData>true</includeRootCauseData>
2727
<includeLevelName>true</includeLevelName>
28-
<staticField>request_id:{X-Request-ID}</staticField>
28+
<staticField>request_id:%{X-Request-ID}</staticField>
2929
</layout>
3030
</appender>
3131
<logger name="stdout" level="WARN">

0 commit comments

Comments
 (0)