From 3811815ee8af2ba6f5ee06f61d5e7e87e56422b0 Mon Sep 17 00:00:00 2001 From: Kirill Date: Fri, 26 Jan 2024 21:17:39 +0100 Subject: [PATCH 1/7] Tmp changes --- lib/docker_compose/docker-compose.yml | 40 +----- lib/docker_compose/resources/fluent-bit.conf | 7 ++ lib/docker_compose/resources/parsers.conf | 122 +++++++++++++++++++ lib/services/docker_client.mjs | 4 +- 4 files changed, 136 insertions(+), 37 deletions(-) create mode 100644 lib/docker_compose/resources/parsers.conf diff --git a/lib/docker_compose/docker-compose.yml b/lib/docker_compose/docker-compose.yml index 50c220f2..7c1417f1 100644 --- a/lib/docker_compose/docker-compose.yml +++ b/lib/docker_compose/docker-compose.yml @@ -47,6 +47,7 @@ services: image: docker.io/browserup/grid-java-api:latest volumes: - /var/run/docker.sock:/var/run/docker.sock + - //wsl$/docker-desktop-data:/var/lib/docker/containers ports: - "${BROWSERUP_GRID_JAVA_API_PORT}:8080" restart: on-failure @@ -94,9 +95,9 @@ services: - rabbitmq - fluentbit logging: - driver: "fluentd" + driver: "json-file" options: - fluentd-address: "localhost:24224" + tag: "{{.Name}}" grid-java-coordinator: container_name: browserup_grid-java-coordinator @@ -143,10 +144,6 @@ services: - rabbitmq - grid-java-api - fluentbit - logging: - driver: "fluentd" - options: - fluentd-address: "localhost:24224" webconsole: container_name: browserup_webconsole @@ -193,10 +190,6 @@ services: - redis - minio - fluentbit - logging: - driver: "fluentd" - options: - fluentd-address: "localhost:24224" volumes: - ./containers:/var/lib/containers @@ -207,10 +200,6 @@ services: depends_on: - influxdb - fluentbit - logging: - driver: "fluentd" - options: - fluentd-address: "localhost:24224" influxdb: container_name: browserup_influxdb @@ -229,10 +218,6 @@ services: - INFLUXDB_HTTP_LOG_ENABLED=false depends_on: - fluentbit - logging: - driver: "fluentd" - options: - fluentd-address: "localhost:24224" mysql: container_name: browserup_mysql @@ -250,10 +235,6 @@ services: - MYSQL_PASSWORD=${BROWSERUP_MYSQL_PASSWORD} depends_on: - fluentbit - logging: - driver: "fluentd" - options: - fluentd-address: "localhost:24224" redis: container_name: browserup_redis @@ -262,10 +243,6 @@ services: - "${BROWSERUP_REDIS_PORT}:6379" depends_on: - fluentbit - logging: - driver: "fluentd" - options: - fluentd-address: "localhost:24224" rabbitmq: container_name: browserup_rabbitmq @@ -286,10 +263,6 @@ services: retries: 3 depends_on: - fluentbit - logging: - driver: "fluentd" - options: - fluentd-address: "localhost:24224" zookeeper: container_name: browserup_zookeeper @@ -308,10 +281,6 @@ services: - fluentbit - loki - grafana - logging: - driver: "fluentd" - options: - fluentd-address: "localhost:24224" minio: container_name: browserup_minio @@ -336,7 +305,7 @@ services: # router fluentbit: - image: fluent/fluent-bit:2.1.10 + image: fluent/fluent-bit:2.2.2 depends_on: - loki environment: @@ -347,6 +316,7 @@ services: - "2020:2020" volumes: - ./resources/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf + - ./resources/parsers.conf:/fluent-bit/etc/parsers.conf # storage loki: diff --git a/lib/docker_compose/resources/fluent-bit.conf b/lib/docker_compose/resources/fluent-bit.conf index 80702adb..1bd549e2 100644 --- a/lib/docker_compose/resources/fluent-bit.conf +++ b/lib/docker_compose/resources/fluent-bit.conf @@ -1,3 +1,10 @@ +[SERVICE] + HTTP_Server On + HTTP_Listen 0.0.0.0 + HTTP_PORT 2020 + Hot_Reload On + Parsers_File parsers.conf + [INPUT] Name forward Listen 0.0.0.0 diff --git a/lib/docker_compose/resources/parsers.conf b/lib/docker_compose/resources/parsers.conf new file mode 100644 index 00000000..65b52bd6 --- /dev/null +++ b/lib/docker_compose/resources/parsers.conf @@ -0,0 +1,122 @@ +[PARSER] + Name apache + Format regex + Regex ^(?[^ ]*) [^ ]* (?[^ ]*) \[(?