From e61616d829d4c3de4039b0137e540f2396af20e4 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 13 Feb 2019 11:16:53 +0100 Subject: [PATCH] devenv: send nginx logs to loki in ha test --- devenv/docker/ha_test/docker-compose.yaml | 7 +++++ devenv/docker/ha_test/fluentd/fluentd.conf | 35 +++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/devenv/docker/ha_test/docker-compose.yaml b/devenv/docker/ha_test/docker-compose.yaml index 3ca23035e09..9772827251a 100644 --- a/devenv/docker/ha_test/docker-compose.yaml +++ b/devenv/docker/ha_test/docker-compose.yaml @@ -7,6 +7,13 @@ services: - "80:80" volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + depends_on: + db: + condition: service_healthy + logging: + driver: "fluentd" + options: + tag: nginx db: image: mysql:5.6 diff --git a/devenv/docker/ha_test/fluentd/fluentd.conf b/devenv/docker/ha_test/fluentd/fluentd.conf index 6d7dc3daf3f..58859441d96 100644 --- a/devenv/docker/ha_test/fluentd/fluentd.conf +++ b/devenv/docker/ha_test/fluentd/fluentd.conf @@ -17,7 +17,16 @@ remove_key_name_field true - + + @type parser + format /^.*m(?[^ ]*) (?[^ ]*) \- \- \[(? + + @type record_transformer remove_keys "source,t" @@ -37,4 +46,28 @@ flush_at_shutdown true buffer_chunk_limit 1m + + + + @type record_transformer + + lvl "info" + + + + + @type copy + + @type stdout + output_type json + + + @type loki + url "http://loki:3100" + extra_labels {"app":"nginx"} + label_keys "container_name,container_id" + flush_interval 10s + flush_at_shutdown true + buffer_chunk_limit 1m + \ No newline at end of file