From bc66f5e3d300df9fea023c9387c3de8afb8a763d Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 18 Apr 2024 00:00:52 +0000 Subject: [PATCH 1/5] Update stack.production.yml --- stack.production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.production.yml b/stack.production.yml index 2d727eb..9c76cbb 100644 --- a/stack.production.yml +++ b/stack.production.yml @@ -7,7 +7,7 @@ services: image: git.nixc.us/nixius/fluentd-ingest:production ports: - target: 24224 - published: 24224 + published: 24225 protocol: tcp mode: host networks: From 7c866e79b60259c4e534f5f238596f1241a842e6 Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 18 Apr 2024 00:12:27 +0000 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c788b7..05ff564 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 72bda1d7cce1e6e729407a9f4db0cf3a127decb5 Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 18 Apr 2024 00:24:32 +0000 Subject: [PATCH 3/5] Update docker/fluentd-ingest/Dockerfile --- docker/fluentd-ingest/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/fluentd-ingest/Dockerfile b/docker/fluentd-ingest/Dockerfile index b247cc7..7ca7be6 100644 --- a/docker/fluentd-ingest/Dockerfile +++ b/docker/fluentd-ingest/Dockerfile @@ -1,5 +1,6 @@ FROM fluent/fluentd:v1.12-debian-1 USER root COPY fluent.conf /fluentd/etc/ -RUN chown -R fluent:fluent /fluentd && chmod -R 700 /fluentd/etc +RUN chown -R fluent:fluent /fluentd && chmod -R 700 /fluentd/etc && \ + gem install fluent-plugin-gelf USER fluent \ No newline at end of file From 260fe1b22aa48a76833510c7860669ab6c6bc18e Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 18 Apr 2024 12:16:18 +0000 Subject: [PATCH 4/5] Update docker/fluentd-ingest/fluent.conf --- docker/fluentd-ingest/fluent.conf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docker/fluentd-ingest/fluent.conf b/docker/fluentd-ingest/fluent.conf index b580e95..03b21bb 100644 --- a/docker/fluentd-ingest/fluent.conf +++ b/docker/fluentd-ingest/fluent.conf @@ -1,17 +1,19 @@ - @type forward + @type forward port 24224 - + @type copy @type gelf host graylog_graylog - port 12201 + port 12201 @type forward - host fluentd_fluentd - port 24224 + + host fluentd_fluentd + port 24224 + \ No newline at end of file From ba146b04ef4c75daf11e106883253871caeb0e7a Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 18 Apr 2024 12:30:38 +0000 Subject: [PATCH 5/5] Update docker/fluentd-ingest/fluent.conf --- docker/fluentd-ingest/fluent.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/fluentd-ingest/fluent.conf b/docker/fluentd-ingest/fluent.conf index 03b21bb..4f2bd35 100644 --- a/docker/fluentd-ingest/fluent.conf +++ b/docker/fluentd-ingest/fluent.conf @@ -6,13 +6,13 @@ @type copy @type gelf - host graylog_graylog + host log.nixc.us port 12201 @type forward - host fluentd_fluentd + host ingress.nixc.us port 24224