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 diff --git a/docker/fluentd-ingest/Dockerfile b/docker/fluentd-ingest/Dockerfile index ff56125..ec47d7a 100644 --- a/docker/fluentd-ingest/Dockerfile +++ b/docker/fluentd-ingest/Dockerfile @@ -3,4 +3,5 @@ USER root COPY fluent.conf /fluentd/etc/ RUN chown -R fluent:fluent /fluentd && chmod -R 700 /fluentd/etc && \ gem install fluent-plugin-grafana-loki + USER fluent \ No newline at end of file diff --git a/docker/fluentd-ingest/fluent.conf b/docker/fluentd-ingest/fluent.conf index b580e95..b02ca89 100644 --- a/docker/fluentd-ingest/fluent.conf +++ b/docker/fluentd-ingest/fluent.conf @@ -1,17 +1,18 @@ - @type forward + @type forward port 24224 - - @type copy + + + @type copy - @type gelf - host graylog_graylog - port 12201 + @type loki + url "https://loki.nixc.us/loki/api/v1/push" + extra_labels {"job": "fluentd"} @type forward host fluentd_fluentd - port 24224 + port 24224 - \ No newline at end of file + 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: