Skip to content

Commit 3811815

Browse files
kiturutinkiturutin
committed
Tmp changes
1 parent 35701a9 commit 3811815

File tree

4 files changed

+136
-37
lines changed

4 files changed

+136
-37
lines changed

‎lib/docker_compose/docker-compose.yml

+5-35
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ services:
4747
image: docker.io/browserup/grid-java-api:latest
4848
volumes:
4949
- /var/run/docker.sock:/var/run/docker.sock
50+
- //wsl$/docker-desktop-data:/var/lib/docker/containers
5051
ports:
5152
- "${BROWSERUP_GRID_JAVA_API_PORT}:8080"
5253
restart: on-failure
@@ -94,9 +95,9 @@ services:
9495
- rabbitmq
9596
- fluentbit
9697
logging:
97-
driver: "fluentd"
98+
driver: "json-file"
9899
options:
99-
fluentd-address: "localhost:24224"
100+
tag: "{{.Name}}"
100101

101102
grid-java-coordinator:
102103
container_name: browserup_grid-java-coordinator
@@ -143,10 +144,6 @@ services:
143144
- rabbitmq
144145
- grid-java-api
145146
- fluentbit
146-
logging:
147-
driver: "fluentd"
148-
options:
149-
fluentd-address: "localhost:24224"
150147

151148
webconsole:
152149
container_name: browserup_webconsole
@@ -193,10 +190,6 @@ services:
193190
- redis
194191
- minio
195192
- fluentbit
196-
logging:
197-
driver: "fluentd"
198-
options:
199-
fluentd-address: "localhost:24224"
200193
volumes:
201194
- ./containers:/var/lib/containers
202195

@@ -207,10 +200,6 @@ services:
207200
depends_on:
208201
- influxdb
209202
- fluentbit
210-
logging:
211-
driver: "fluentd"
212-
options:
213-
fluentd-address: "localhost:24224"
214203

215204
influxdb:
216205
container_name: browserup_influxdb
@@ -229,10 +218,6 @@ services:
229218
- INFLUXDB_HTTP_LOG_ENABLED=false
230219
depends_on:
231220
- fluentbit
232-
logging:
233-
driver: "fluentd"
234-
options:
235-
fluentd-address: "localhost:24224"
236221

237222
mysql:
238223
container_name: browserup_mysql
@@ -250,10 +235,6 @@ services:
250235
- MYSQL_PASSWORD=${BROWSERUP_MYSQL_PASSWORD}
251236
depends_on:
252237
- fluentbit
253-
logging:
254-
driver: "fluentd"
255-
options:
256-
fluentd-address: "localhost:24224"
257238

258239
redis:
259240
container_name: browserup_redis
@@ -262,10 +243,6 @@ services:
262243
- "${BROWSERUP_REDIS_PORT}:6379"
263244
depends_on:
264245
- fluentbit
265-
logging:
266-
driver: "fluentd"
267-
options:
268-
fluentd-address: "localhost:24224"
269246

270247
rabbitmq:
271248
container_name: browserup_rabbitmq
@@ -286,10 +263,6 @@ services:
286263
retries: 3
287264
depends_on:
288265
- fluentbit
289-
logging:
290-
driver: "fluentd"
291-
options:
292-
fluentd-address: "localhost:24224"
293266

294267
zookeeper:
295268
container_name: browserup_zookeeper
@@ -308,10 +281,6 @@ services:
308281
- fluentbit
309282
- loki
310283
- grafana
311-
logging:
312-
driver: "fluentd"
313-
options:
314-
fluentd-address: "localhost:24224"
315284

316285
minio:
317286
container_name: browserup_minio
@@ -336,7 +305,7 @@ services:
336305

337306
# router
338307
fluentbit:
339-
image: fluent/fluent-bit:2.1.10
308+
image: fluent/fluent-bit:2.2.2
340309
depends_on:
341310
- loki
342311
environment:
@@ -347,6 +316,7 @@ services:
347316
- "2020:2020"
348317
volumes:
349318
- ./resources/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf
319+
- ./resources/parsers.conf:/fluent-bit/etc/parsers.conf
350320

351321
# storage
352322
loki:

‎lib/docker_compose/resources/fluent-bit.conf

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
[SERVICE]
2+
HTTP_Server On
3+
HTTP_Listen 0.0.0.0
4+
HTTP_PORT 2020
5+
Hot_Reload On
6+
Parsers_File parsers.conf
7+
18
[INPUT]
29
Name forward
310
Listen 0.0.0.0

‎lib/docker_compose/resources/parsers.conf

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
[PARSER]
2+
Name apache
3+
Format regex
4+
Regex ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
5+
Time_Key time
6+
Time_Format %d/%b/%Y:%H:%M:%S %z
7+
8+
[PARSER]
9+
Name apache2
10+
Format regex
11+
Regex ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>.*)")?$
12+
Time_Key time
13+
Time_Format %d/%b/%Y:%H:%M:%S %z
14+
15+
[PARSER]
16+
Name apache_error
17+
Format regex
18+
Regex ^\[[^ ]* (?<time>[^\]]*)\] \[(?<level>[^\]]*)\](?: \[pid (?<pid>[^\]]*)\])?( \[client (?<client>[^\]]*)\])? (?<message>.*)$
19+
20+
[PARSER]
21+
Name nginx
22+
Format regex
23+
Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")
24+
Time_Key time
25+
Time_Format %d/%b/%Y:%H:%M:%S %z
26+
27+
[PARSER]
28+
# https://rubular.com/r/IhIbCAIs7ImOkc
29+
Name k8s-nginx-ingress
30+
Format regex
31+
Regex ^(?<host>[^ ]*) - (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*) "(?<referer>[^\"]*)" "(?<agent>[^\"]*)" (?<request_length>[^ ]*) (?<request_time>[^ ]*) \[(?<proxy_upstream_name>[^ ]*)\] (\[(?<proxy_alternative_upstream_name>[^ ]*)\] )?(?<upstream_addr>[^ ]*) (?<upstream_response_length>[^ ]*) (?<upstream_response_time>[^ ]*) (?<upstream_status>[^ ]*) (?<reg_id>[^ ]*).*$
32+
Time_Key time
33+
Time_Format %d/%b/%Y:%H:%M:%S %z
34+
35+
[PARSER]
36+
Name json
37+
Format json
38+
Time_Key time
39+
Time_Format %d/%b/%Y:%H:%M:%S %z
40+
41+
[PARSER]
42+
Name logfmt
43+
Format logfmt
44+
45+
[PARSER]
46+
Name docker
47+
Format json
48+
Time_Key time
49+
Time_Format %Y-%m-%dT%H:%M:%S.%L
50+
Time_Keep On
51+
52+
[PARSER]
53+
Name docker-daemon
54+
Format regex
55+
Regex time="(?<time>[^ ]*)" level=(?<level>[^ ]*) msg="(?<msg>[^ ].*)"
56+
Time_Key time
57+
Time_Format %Y-%m-%dT%H:%M:%S.%L
58+
Time_Keep On
59+
60+
[PARSER]
61+
Name syslog-rfc5424
62+
Format regex
63+
Regex ^\<(?<pri>[0-9]{1,5})\>1 (?<time>[^ ]+) (?<host>[^ ]+) (?<ident>[^ ]+) (?<pid>[-0-9]+) (?<msgid>[^ ]+) (?<extradata>(\[(.*?)\]|-)) (?<message>.+)$
64+
Time_Key time
65+
Time_Format %Y-%m-%dT%H:%M:%S.%L%z
66+
Time_Keep On
67+
68+
[PARSER]
69+
Name syslog-rfc3164-local
70+
Format regex
71+
Regex ^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$
72+
Time_Key time
73+
Time_Format %b %d %H:%M:%S
74+
Time_Keep On
75+
76+
[PARSER]
77+
Name syslog-rfc3164
78+
Format regex
79+
Regex /^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
80+
Time_Key time
81+
Time_Format %b %d %H:%M:%S
82+
Time_Keep On
83+
84+
[PARSER]
85+
Name mongodb
86+
Format regex
87+
Regex ^(?<time>[^ ]*)\s+(?<severity>\w)\s+(?<component>[^ ]+)\s+\[(?<context>[^\]]+)]\s+(?<message>.*?) *(?<ms>(\d+))?(:?ms)?$
88+
Time_Format %Y-%m-%dT%H:%M:%S.%L
89+
Time_Keep On
90+
Time_Key time
91+
92+
[PARSER]
93+
# https://rubular.com/r/0VZmcYcLWMGAp1
94+
Name envoy
95+
Format regex
96+
Regex ^\[(?<start_time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)? (?<protocol>\S+)" (?<code>[^ ]*) (?<response_flags>[^ ]*) (?<bytes_received>[^ ]*) (?<bytes_sent>[^ ]*) (?<duration>[^ ]*) (?<x_envoy_upstream_service_time>[^ ]*) "(?<x_forwarded_for>[^ ]*)" "(?<user_agent>[^\"]*)" "(?<request_id>[^\"]*)" "(?<authority>[^ ]*)" "(?<upstream_host>[^ ]*)"
97+
Time_Format %Y-%m-%dT%H:%M:%S.%L%z
98+
Time_Keep On
99+
Time_Key start_time
100+
101+
[PARSER]
102+
# https://rubular.com/r/17KGEdDClwiuDG
103+
Name istio-envoy-proxy
104+
Format regex
105+
Regex ^\[(?<start_time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)? (?<protocol>\S+)" (?<response_code>[^ ]*) (?<response_flags>[^ ]*) (?<response_code_details>[^ ]*) (?<connection_termination_details>[^ ]*) (?<upstream_transport_failure_reason>[^ ]*) (?<bytes_received>[^ ]*) (?<bytes_sent>[^ ]*) (?<duration>[^ ]*) (?<x_envoy_upstream_service_time>[^ ]*) "(?<x_forwarded_for>[^ ]*)" "(?<user_agent>[^\"]*)" "(?<x_request_id>[^\"]*)" (?<authority>[^ ]*)" "(?<upstream_host>[^ ]*)" (?<upstream_cluster>[^ ]*) (?<upstream_local_address>[^ ]*) (?<downstream_local_address>[^ ]*) (?<downstream_remote_address>[^ ]*) (?<requested_server_name>[^ ]*) (?<route_name>[^ ]*)
106+
Time_Format %Y-%m-%dT%H:%M:%S.%L%z
107+
Time_Keep On
108+
Time_Key start_time
109+
110+
[PARSER]
111+
# http://rubular.com/r/tjUt3Awgg4
112+
Name cri
113+
Format regex
114+
Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<message>.*)$
115+
Time_Key time
116+
Time_Format %Y-%m-%dT%H:%M:%S.%L%z
117+
Time_Keep On
118+
119+
[PARSER]
120+
Name kube-custom
121+
Format regex
122+
Regex (?<tag>[^.]+)?\.?(?<pod_name>[a-z0-9](?:[-a-z0-9]*[a-z0-9])?(?:\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)_(?<namespace_name>[^_]+)_(?<container_name>.+)-(?<docker_id>[a-z0-9]{64})\.log$

‎lib/services/docker_client.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,14 +319,14 @@ export class DockerClient {
319319
return;
320320
}
321321

322-
const cmd = `docker stop ${minionsContainersIds.join(' ')};`;
322+
const cmd = `docker stop ${minionsContainersIds.join(' ')}`;
323323
try {
324324
await this.execCommand(cmd);
325325
} catch (e) {
326326
throw decoratedError({msg: `Failed to stop minion containers`, error: e});
327327
}
328328

329-
const cmd2 = `docker rm ${minionsContainersIds.join(' ')};`;
329+
const cmd2 = `docker rm ${minionsContainersIds.join(' ')}`;
330330
try {
331331
await this.execCommand(cmd2);
332332
} catch (errors) {

0 commit comments

Comments
 (0)