diff --git a/Dockerfile b/Dockerfile index 408663c..162fd66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 RUN apk update \ && apk add --no-cache \ ca-certificates \ + libcurl \ ruby ruby-irb ruby-etc ruby-webrick \ tini ruby-bundler \ && apk add --no-cache --virtual .build-deps \ @@ -31,7 +32,6 @@ RUN addgroup -S fluent && adduser -S -g fluent fluent \ && mkdir -p /fluentd/etc /fluentd/plugins \ && chown -R fluent /fluentd && chgrp -R fluent /fluentd - COPY fluent.conf /fluentd/etc/ COPY entrypoint.sh /bin/ diff --git a/Gemfile b/Gemfile index fb335df..417c5d5 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,7 @@ gem "ffi" gem "fluentd", "1.16.5" gem "oj", "~> 3.16.0" gem "rexml", "~> 3.2.5" +gem "faraday-typhoeus", "~> 1.1.0" gem "fluent-plugin-multi-format-parser", "~> 1.1.0" gem "fluent-plugin-concat", "~> 2.5.0" gem "fluent-plugin-grok-parser", "~> 2.6.2" diff --git a/Jenkinsfile b/Jenkinsfile index c3f3c9f..7eedde1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -library identifier: 'zdt-lib@master', retriever: modernSCM( +library identifier: 'zdt-lib@main', retriever: modernSCM( [$class: 'GitSCMSource', remote: 'https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git']) diff --git a/README.md b/README.md index 348d478..1c20877 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,6 @@ Opinionated Fluentd container intended to work as central ingestion service fron - fluentd runs as non-root fluent user # Resources +- https://github.com/fluent/fluent-plugin-opensearch - https://github.com/fluent/fluentd-docker-image/blob/master/v1.14/alpine/Dockerfile - https://github.com/fluent/fluentd-kubernetes-daemonset/tree/master/docker-image/v1.16/debian-elasticsearch7