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:
58
58
deploy :
59
59
replicas : 4
60
60
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
74
61
log-elasticsearch :
75
62
image : docker.elastic.co/elasticsearch/elasticsearch:5.6.3
76
63
volumes :
77
64
- logging:/usr/share/elasticsearch/data
78
65
networks :
79
66
- logging
80
67
environment :
81
- - " ES_JAVA_OPTS=-Xms512m -Xmx512m"
82
- - cluster.name=graylog
68
+ - " ES_JAVA_OPTS=-Xms1g -Xmx1g"
83
69
- xpack.security.enabled=false
84
70
ulimits :
85
71
memlock :
86
72
soft : -1
87
73
hard : -1
74
+ deploy :
75
+ restart_policy :
76
+ condition : on-failure
88
77
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
98
79
depends_on :
99
80
- log-elasticsearch
100
- - log-mongo
101
- links :
102
- - log-elasticsearch:elasticsearch
103
- - log-mongo:mongo
104
81
networks :
105
82
- default
106
83
- 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
107
96
108
97
networks :
109
98
# 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 28
28
<staticField >request_id:%{X-Request-ID}</staticField >
29
29
</layout >
30
30
</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 " />
33
33
</logger >
34
- <root level =" debug " >
34
+ <root level =" WARN " >
35
35
<appender-ref ref =" GELF" />
36
36
</root >
37
37
</springProfile >
Original file line number Diff line number Diff line change 1
1
FROM 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
2
7
COPY target/ms-gateway.jar application.yml /
3
8
EXPOSE 80
4
9
CMD ["/usr/bin/java" , "-jar" , "/ms-gateway.jar" ]
Original file line number Diff line number Diff line change 28
28
<staticField >request_id:%{X-Request-ID}</staticField >
29
29
</layout >
30
30
</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 " />
33
33
</logger >
34
- <root level =" debug " >
34
+ <root level =" WARN " >
35
35
<appender-ref ref =" GELF" />
36
36
</root >
37
37
</springProfile >
Original file line number Diff line number Diff line change 1
1
FROM docker.elastic.co/logstash/logstash:5.6.3
2
2
RUN rm -f /usr/share/logstash/pipeline/logstash.conf
3
3
ADD 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 1
1
input { gelf { } }
2
2
output {
3
- elasticsearch { hosts => ["elasticsearch:9200"] }
3
+ elasticsearch { hosts => ["log- elasticsearch:9200"] }
4
4
}
You can’t perform that action at this time.
0 commit comments