File tree Expand file tree Collapse file tree 6 files changed +30
-36
lines changed
ms-common/src/main/resources Expand file tree Collapse file tree 6 files changed +30
-36
lines changed Original file line number Diff line number Diff line change @@ -58,52 +58,41 @@ services:
5858 deploy :
5959 replicas : 4
6060
61- log-mongo :
62- image : mongo:3
63- volumes :
64- - logging:/usr/share/elasticsearch/data
65- networks :
66- - logging
67- environment :
68- - " ES_JAVA_OPTS=-Xms512m -Xmx512m"
69- - xpack.security.enabled=false
70- ulimits :
71- memlock :
72- soft : -1
73- hard : -1
7461 log-elasticsearch :
7562 image : docker.elastic.co/elasticsearch/elasticsearch:5.6.3
7663 volumes :
7764 - logging:/usr/share/elasticsearch/data
7865 networks :
7966 - logging
8067 environment :
81- - " ES_JAVA_OPTS=-Xms512m -Xmx512m"
82- - cluster.name=graylog
68+ - " ES_JAVA_OPTS=-Xms1g -Xmx1g"
8369 - xpack.security.enabled=false
8470 ulimits :
8571 memlock :
8672 soft : -1
8773 hard : -1
74+ deploy :
75+ restart_policy :
76+ condition : on-failure
8877 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"
78+ build : ./src/docker/logstash-ms
9879 depends_on :
9980 - log-elasticsearch
100- - log-mongo
101- links :
102- - log-elasticsearch:elasticsearch
103- - log-mongo:mongo
10481 networks :
10582 - default
10683 - logging
84+ kibana :
85+ image : docker.elastic.co/kibana/kibana:5.6.3
86+ ports :
87+ - " 3002:5601"
88+ networks :
89+ - logging
90+ depends_on :
91+ - log-elasticsearch
92+ environment :
93+ - xpack.monitoring.ui.container.elasticsearch.enabled=false
94+ links :
95+ - log-elasticsearch:elasticsearch
10796
10897networks :
10998 # The default network is used for all the microservices that are not associated with anything infrastructure related. Primarily where the aplpication specific microservices reside.
Original file line number Diff line number Diff line change 2828 <staticField >request_id:%{X-Request-ID}</staticField >
2929 </layout >
3030 </appender >
31- <logger name =" stdout " level =" WARN " >
32- <appender-ref ref =" stdout " />
31+ <logger name =" net.trajano.ms " level =" DEBUG " >
32+ <appender-ref ref =" GELF " />
3333 </logger >
34- <root level =" debug " >
34+ <root level =" WARN " >
3535 <appender-ref ref =" GELF" />
3636 </root >
3737 </springProfile >
Original file line number Diff line number Diff line change 11FROM openjdk:jre-alpine
2+ RUN apk update && \
3+ apk add tzdata && \
4+ cp /usr/share/zoneinfo/America/Toronto /etc/localtime && \
5+ echo "America/Toronto" > /etc/timezone && \
6+ apk del tzdata
27COPY target/ms-gateway.jar application.yml /
38EXPOSE 80
49CMD ["/usr/bin/java" , "-jar" , "/ms-gateway.jar" ]
Original file line number Diff line number Diff line change 2828 <staticField >request_id:%{X-Request-ID}</staticField >
2929 </layout >
3030 </appender >
31- <logger name =" stdout " level =" WARN " >
32- <appender-ref ref =" stdout " />
31+ <logger name =" net.trajano.ms " level =" DEBUG " >
32+ <appender-ref ref =" GELF " />
3333 </logger >
34- <root level =" debug " >
34+ <root level =" WARN " >
3535 <appender-ref ref =" GELF" />
3636 </root >
3737 </springProfile >
Original file line number Diff line number Diff line change 11FROM docker.elastic.co/logstash/logstash:5.6.3
22RUN rm -f /usr/share/logstash/pipeline/logstash.conf
33ADD pipeline/ /usr/share/logstash/pipeline/
4- ADD config/ /usr/share/logstash/config/
4+ ENV XPACK_MONITORING_ENABLED=false
Original file line number Diff line number Diff line change 11input { gelf { } }
22output {
3- elasticsearch { hosts => ["elasticsearch:9200"] }
3+ elasticsearch { hosts => ["log- elasticsearch:9200"] }
44}
You can’t perform that action at this time.
0 commit comments