Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ updates:
open-pull-requests-limit: 0


- package-ecosystem: "bundler"
directory: "/docker-image/v1.19/arm64/debian-datadog"
schedule:
interval: "daily"
open-pull-requests-limit: 0


- package-ecosystem: "bundler"
directory: "/docker-image/v1.19/arm64/debian-elasticsearch7"
schedule:
Expand Down Expand Up @@ -146,6 +153,13 @@ updates:
open-pull-requests-limit: 0


- package-ecosystem: "bundler"
directory: "/docker-image/v1.19/debian-datadog"
schedule:
interval: "daily"
open-pull-requests-limit: 0


- package-ecosystem: "bundler"
directory: "/docker-image/v1.19/debian-elasticsearch7"
schedule:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/check-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
[
"debian-azureblob",
"debian-cloudwatch",
"debian-datadog",
"debian-elasticsearch7",
"debian-elasticsearch8",
"debian-forward",
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
[
"debian-azureblob",
"debian-cloudwatch",
"debian-datadog",
"debian-elasticsearch7",
"debian-elasticsearch8",
"debian-forward",
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ X86_IMAGES := \
v1.19/debian-logzio:v1.19.0-debian-logzio-amd64-1.0,v1.19-debian-logzio-amd64-1 \
v1.19/debian-kafka:v1.19.0-debian-kafka-amd64-1.0,v1.19-debian-kafka-amd64-1 \
v1.19/debian-kafka2:v1.19.0-debian-kafka2-amd64-1.0,v1.19-debian-kafka2-amd64-1 \
v1.19/debian-kinesis:v1.19.0-debian-kinesis-amd64-1.0,v1.19-debian-kinesis-amd64-1
v1.19/debian-kinesis:v1.19.0-debian-kinesis-amd64-1.0,v1.19-debian-kinesis-amd64-1 \
v1.19/debian-datadog:v1.19.0-debian-datadog-amd64-1.0,v1.19-debian-datadog-amd64-1

# <Dockerfile>:<version>,<tag1>,<tag2>,...

Expand All @@ -45,7 +46,8 @@ ARM64_IMAGES := \
v1.19/arm64/debian-logzio:v1.19.0-debian-logzio-arm64-1.0,v1.19-debian-logzio-arm64-1 \
v1.19/arm64/debian-kafka:v1.19.0-debian-kafka-arm64-1.0,v1.19-debian-kafka-arm64-1 \
v1.19/arm64/debian-kafka2:v1.19.0-debian-kafka2-arm64-1.0,v1.19-debian-kafka2-arm64-1 \
v1.19/arm64/debian-kinesis:v1.19.0-debian-kinesis-arm64-1.0,v1.19-debian-kinesis-arm64-1
v1.19/arm64/debian-kinesis:v1.19.0-debian-kinesis-arm64-1.0,v1.19-debian-kinesis-arm64-1 \
v1.19/arm64/debian-datadog:v1.19.0-debian-datadog-arm64-1.0,v1.19-debian-datadog-arm64-1

ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES)

Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ See also dockerhub tags page: https://hub.docker.com/r/fluent/fluentd-kubernetes
- `Kinesis`
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19.0-debian-kinesis-1.0`
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19-debian-kinesis-1`
- `Datadog`
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19.0-debian-datadog-1.0`
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19-debian-datadog-1`

##### x86_64 images
- `Azureblob` [Dockerfile](docker-image/v1.19/debian-azureblob/Dockerfile)
Expand Down Expand Up @@ -133,6 +136,9 @@ See also dockerhub tags page: https://hub.docker.com/r/fluent/fluentd-kubernetes
- `Kinesis` [Dockerfile](docker-image/v1.19/debian-kinesis/Dockerfile)
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19.0-debian-kinesis-amd64-1.0`
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19-debian-kinesis-amd64-1`
- `Datadog` [Dockerfile](docker-image/v1.19/debian-datadog/Dockerfile)
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19.0-debian-datadog-amd64-1.0`
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19-debian-datadog-amd64-1`

##### arm64 images
- `Azureblob` [Dockerfile](docker-image/v1.19/arm64/debian-azureblob/Dockerfile)
Expand Down Expand Up @@ -187,6 +193,9 @@ See also dockerhub tags page: https://hub.docker.com/r/fluent/fluentd-kubernetes
- `Kinesis` [Dockerfile](docker-image/v1.19/arm64/debian-kinesis/Dockerfile)
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19.0-debian-kinesis-arm64-1.0`
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19-debian-kinesis-arm64-1`
- `Datadog` [Dockerfile](docker-image/v1.19/arm64/debian-datadog/Dockerfile)
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19.0-debian-datadog-arm64-1.0`
- `docker pull fluent/fluentd-kubernetes-daemonset:v1.19-debian-datadog-arm64-1`


You can also use `v1-debian-PLUGIN` tag to refer latest v1 image, e.g. `v1-debian-elasticsearch`. On production, strict tag is better to avoid unexpected update.
Expand Down Expand Up @@ -373,6 +382,7 @@ Some images are contributed by users. If you have a problem/question for followi
- Amazon Kinesis : @shiftky
- logz.io : @SaMnCo / @jamielennox
- splunkhec: @FutureSharks
- Datadog : @nbifrye

Currently, we don't accept new destination request without contribution.
See https://github.com/fluent/fluentd-kubernetes-daemonset/issues/293
Expand Down
1 change: 1 addition & 0 deletions docker-image/v1.19/arm64/debian-datadog/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*.gitkeep
56 changes: 56 additions & 0 deletions docker-image/v1.19/arm64/debian-datadog/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb

# For multiarch build on Docker hub automated build.
FROM fluent/fluentd:v1.19.0-debian-arm64

LABEL maintainer="Eduardo Silva <[email protected]>"
USER root
WORKDIR /home/fluent
ENV PATH /fluentd/vendor/bundle/ruby/3.4.0/bin:$PATH
ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.4.0
ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.4.0
# skip runtime bundler installation
ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1

COPY Gemfile* /fluentd/
RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
runtimeDeps="" \
&& apt-get update \
&& apt-get upgrade -y \
&& apt-get install \
-y --no-install-recommends \
$buildDeps $runtimeDeps net-tools \
&& gem install bundler --version 2.4.17 \
&& bundle config silence_root_warning true \
&& bundle install --gemfile=/fluentd/Gemfile --path=/fluentd/vendor/bundle \
&& SUDO_FORCE_REMOVE=yes \
apt-get purge -y --auto-remove \
-o APT::AutoRemove::RecommendsImportant=false \
$buildDeps \
'*-dev' \
&& rm -rf /var/lib/apt/lists/* \
&& gem sources --clear-all \
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem
# Copy configuration files
COPY ./conf/fluent.conf /fluentd/etc/
COPY ./conf/systemd.conf /fluentd/etc/
COPY ./conf/kubernetes.conf /fluentd/etc/
COPY ./conf/prometheus.conf /fluentd/etc/
COPY ./conf/tail_container_parse.conf /fluentd/etc/
COPY ./conf/kubernetes/*.conf /fluentd/etc/kubernetes/
RUN touch /fluentd/etc/disable.conf

# Copy plugins
COPY plugins /fluentd/plugins/
COPY entrypoint.sh /fluentd/entrypoint.sh

# Environment variables
ENV FLUENTD_OPT=""
ENV FLUENTD_CONF="fluent.conf"
# Override LD_PRELOAD in fluentd docker image
# Set "/usr/lib/libjemalloc.so.2" if you want to enable jemalloc explicitly
ENV LD_PRELOAD=""

# Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib
ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"]
21 changes: 21 additions & 0 deletions docker-image/v1.19/arm64/debian-datadog/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Gemfile.erb

source "https://rubygems.org"

gem "fluentd", "1.19.0"
gem "oj", "~> 3.16.11"
gem "rexml", "~> 3.4.1"
gem "fluent-plugin-multi-format-parser", "~> 1.0.0"
gem "fluent-plugin-concat", "~> 2.6.0"
gem "fluent-plugin-grok-parser", "~> 2.6.2"
gem "fluent-plugin-prometheus", "~> 2.2.1"
gem 'fluent-plugin-json-in-json-2', ">= 1.0.2"
gem "fluent-plugin-record-modifier", "~> 2.2.0"
gem "fluent-plugin-detect-exceptions", "~> 0.0.16"
gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
gem "fluent-plugin-parser-cri", "~> 0.1.1"
gem "fluent-plugin-datadog", "~> 0.14.4"
gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.8.0"
gem "ffi"
gem "fluent-plugin-systemd", "~> 1.1.1"
Loading