Skip to content

Commit ecf8837

Browse files
elsesiyelsesiy
committed
Update to fluentd 1.11.0
Signed-off-by: Jonas-Taha El Sesiy <[email protected]>
1 parent 79f63a8 commit ecf8837

File tree

215 files changed

+11318
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+11318
-30
lines changed

Diff for: ‎Makefile

+15-15
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212

1313
IMAGE_NAME := fluent/fluentd-kubernetes
1414
ALL_IMAGES := \
15-
v1.10/debian-elasticsearch7:v1.10.4-debian-elasticsearch7-1.0,v1.10-debian-elasticsearch7-1,v1-debian-elasticsearch \
16-
v1.10/debian-elasticsearch6:v1.10.4-debian-elasticsearch6-1.0,v1.10-debian-elasticsearch6-1 \
17-
v1.10/debian-loggly:v1.10.4-debian-loggly-1.0,v1.10-debian-loggly-1 \
18-
v1.10/debian-logentries:v1.10.4-debian-logentries-1.0,v1.10-debian-logentries-1 \
19-
v1.10/debian-cloudwatch:v1.10.4-debian-cloudwatch-1.0,v1.10-debian-cloudwatch-1 \
20-
v1.10/debian-stackdriver:v1.10.4-debian-stackdriver-1.0,v1.10-debian-stackdriver-1 \
21-
v1.10/debian-s3:v1.10.4-debian-s3-1.0,v1.10-debian-s3-1 \
22-
v1.10/debian-syslog:v1.10.4-debian-syslog-1.0,v1.10-debian-syslog-1 \
23-
v1.10/debian-forward:v1.10.4-debian-forward-1.0,v1.10-debian-forward-1 \
24-
v1.10/debian-gcs:v1.10.4-debian-gcs-1.0,v1.10-debian-gcs-1 \
25-
v1.10/debian-graylog:v1.10.4-debian-graylog-1.0,v1.10-debian-graylog-1 \
26-
v1.10/debian-papertrail:v1.10.4-debian-papertrail-1.0,v1.10-debian-papertrail-1 \
27-
v1.10/debian-logzio:v1.10.4-debian-logzio-1.0,v1.10-debian-logzio-1 \
28-
v1.10/debian-kafka:v1.10.4-debian-kafka-1.0,v1.10-debian-kafka-2 \
29-
v1.10/debian-kinesis:v1.10.4-debian-kinesis-1.0,v1.10-debian-kinesis-1
15+
v1.11/debian-elasticsearch7:v1.11.0-debian-elasticsearch7-1.0,v1.11-debian-elasticsearch7-1,v1-debian-elasticsearch \
16+
v1.11/debian-elasticsearch6:v1.11.0-debian-elasticsearch6-1.0,v1.11-debian-elasticsearch6-1 \
17+
v1.11/debian-loggly:v1.11.0-debian-loggly-1.0,v1.11-debian-loggly-1 \
18+
v1.11/debian-logentries:v1.11.0-debian-logentries-1.0,v1.11-debian-logentries-1 \
19+
v1.11/debian-cloudwatch:v1.11.0-debian-cloudwatch-1.0,v1.11-debian-cloudwatch-1 \
20+
v1.11/debian-stackdriver:v1.11.0-debian-stackdriver-1.0,v1.11-debian-stackdriver-1 \
21+
v1.11/debian-s3:v1.11.0-debian-s3-1.0,v1.11-debian-s3-1 \
22+
v1.11/debian-syslog:v1.11.0-debian-syslog-1.0,v1.11-debian-syslog-1 \
23+
v1.11/debian-forward:v1.11.0-debian-forward-1.0,v1.11-debian-forward-1 \
24+
v1.11/debian-gcs:v1.11.0-debian-gcs-1.0,v1.11-debian-gcs-1 \
25+
v1.11/debian-graylog:v1.11.0-debian-graylog-1.0,v1.11-debian-graylog-1 \
26+
v1.11/debian-papertrail:v1.11.0-debian-papertrail-1.0,v1.11-debian-papertrail-1 \
27+
v1.11/debian-logzio:v1.11.0-debian-logzio-1.0,v1.11-debian-logzio-1 \
28+
v1.11/debian-kafka:v1.11.0-debian-kafka-1.0,v1.11-debian-kafka-2 \
29+
v1.11/debian-kinesis:v1.11.0-debian-kinesis-1.0,v1.11-debian-kinesis-1
3030

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

Diff for: ‎README.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ See also dockerhub tags page: https://hub.docker.com/r/fluent/fluentd-kubernetes
1313

1414
#### Current stable
1515

16-
- `v1.10.4-debian-elasticsearch7-1.0,v1.10-debian-elasticsearch7-1,v1-debian-elasticsearch` [docker-image/v1.10/debian-elasticsearch7/Dockerfile](docker-image/v1.10/debian-elasticsearch7/Dockerfile)
17-
- `v1.10.4-debian-elasticsearch6-1.0,v1.10-debian-elasticsearch6-1` [docker-image/v1.10/debian-elasticsearch6/Dockerfile](docker-image/v1.10/debian-elasticsearch6/Dockerfile)
18-
- `v1.10.4-debian-loggly-1.0,v1.10-debian-loggly-1` [docker-image/v1.10/debian-loggly/Dockerfile](docker-image/v1.10/debian-loggly/Dockerfile)
19-
- `v1.10.4-debian-logentries-1.0,v1.10-debian-logentries-1` [docker-image/v1.10/debian-logentries/Dockerfile](docker-image/v1.10/debian-logentries/Dockerfile)
20-
- `v1.10.4-debian-cloudwatch-1.0,v1.10-debian-cloudwatch-1` [docker-image/v1.10/debian-cloudwatch/Dockerfile](docker-image/v1.10/debian-cloudwatch/Dockerfile)
21-
- `v1.10.4-debian-stackdriver-1.0,v1.10-debian-stackdriver-1` [docker-image/v1.10/debian-stackdriver/Dockerfile](docker-image/v1.10/debian-stackdriver/Dockerfile)
22-
- `v1.10.4-debian-s3-1.0,v1.10-debian-s3-1` [docker-image/v1.10/debian-s3/Dockerfile](docker-image/v1.10/debian-s3/Dockerfile)
23-
- `v1.10.4-debian-syslog-1.0,v1.10-debian-syslog-1` [docker-image/v1.10/debian-syslog/Dockerfile](docker-image/v1.10/debian-syslog/Dockerfile)
24-
- `v1.10.4-debian-forward-1.0,v1.10-debian-forward-1` [docker-image/v1.10/debian-forward/Dockerfile](docker-image/v1.10/debian-forward/Dockerfile)
25-
- `v1.10.4-debian-gcs-1.0,v1.10-debian-gcs-1` [docker-image/v1.10/debian-gcs/Dockerfile](docker-image/v1.10/debian-gcs/Dockerfile)
26-
- `v1.10.4-debian-graylog-1.0,v1.10-debian-graylog-1` [docker-image/v1.10/debian-graylog/Dockerfile](docker-image/v1.10/debian-graylog/Dockerfile)
27-
- `v1.10.4-debian-papertrail-1.0,v1.10-debian-papertrail-1` [docker-image/v1.10/debian-papertrail/Dockerfile](docker-image/v1.10/debian-papertrail/Dockerfile)
28-
- `v1.10.4-debian-logzio-1.0,v1.10-debian-logzio-1` [docker-image/v1.10/debian-logzio/Dockerfile](docker-image/v1.10/debian-logzio/Dockerfile)
29-
- `v1.10.4-debian-kafka-1.0,v1.10-debian-kafka-2` [docker-image/v1.10/debian-kafka/Dockerfile](docker-image/v1.10/debian-kafka/Dockerfile)
30-
- `v1.10.4-debian-kinesis-1.0,v1.10-debian-kinesis-1` [docker-image/v1.10/debian-kinesis/Dockerfile](docker-image/v1.10/debian-kinesis/Dockerfile)
16+
- `v1.11.0-debian-elasticsearch7-1.0,v1.11-debian-elasticsearch7-1,v1-debian-elasticsearch` [docker-image/v1.11/debian-elasticsearch7/Dockerfile](docker-image/v1.11/debian-elasticsearch7/Dockerfile)
17+
- `v1.11.0-debian-elasticsearch6-1.0,v1.11-debian-elasticsearch6-1` [docker-image/v1.11/debian-elasticsearch6/Dockerfile](docker-image/v1.11/debian-elasticsearch6/Dockerfile)
18+
- `v1.11.0-debian-loggly-1.0,v1.11-debian-loggly-1` [docker-image/v1.11/debian-loggly/Dockerfile](docker-image/v1.11/debian-loggly/Dockerfile)
19+
- `v1.11.0-debian-logentries-1.0,v1.11-debian-logentries-1` [docker-image/v1.11/debian-logentries/Dockerfile](docker-image/v1.11/debian-logentries/Dockerfile)
20+
- `v1.11.0-debian-cloudwatch-1.0,v1.11-debian-cloudwatch-1` [docker-image/v1.11/debian-cloudwatch/Dockerfile](docker-image/v1.11/debian-cloudwatch/Dockerfile)
21+
- `v1.11.0-debian-stackdriver-1.0,v1.11-debian-stackdriver-1` [docker-image/v1.11/debian-stackdriver/Dockerfile](docker-image/v1.11/debian-stackdriver/Dockerfile)
22+
- `v1.11.0-debian-s3-1.0,v1.11-debian-s3-1` [docker-image/v1.11/debian-s3/Dockerfile](docker-image/v1.11/debian-s3/Dockerfile)
23+
- `v1.11.0-debian-syslog-1.0,v1.11-debian-syslog-1` [docker-image/v1.11/debian-syslog/Dockerfile](docker-image/v1.11/debian-syslog/Dockerfile)
24+
- `v1.11.0-debian-forward-1.0,v1.11-debian-forward-1` [docker-image/v1.11/debian-forward/Dockerfile](docker-image/v1.11/debian-forward/Dockerfile)
25+
- `v1.11.0-debian-gcs-1.0,v1.11-debian-gcs-1` [docker-image/v1.11/debian-gcs/Dockerfile](docker-image/v1.11/debian-gcs/Dockerfile)
26+
- `v1.11.0-debian-graylog-1.0,v1.11-debian-graylog-1` [docker-image/v1.11/debian-graylog/Dockerfile](docker-image/v1.11/debian-graylog/Dockerfile)
27+
- `v1.11.0-debian-papertrail-1.0,v1.11-debian-papertrail-1` [docker-image/v1.11/debian-papertrail/Dockerfile](docker-image/v1.11/debian-papertrail/Dockerfile)
28+
- `v1.11.0-debian-logzio-1.0,v1.11-debian-logzio-1` [docker-image/v1.11/debian-logzio/Dockerfile](docker-image/v1.11/debian-logzio/Dockerfile)
29+
- `v1.11.0-debian-kafka-1.0,v1.11-debian-kafka-2` [docker-image/v1.11/debian-kafka/Dockerfile](docker-image/v1.11/debian-kafka/Dockerfile)
30+
- `v1.11.0-debian-kinesis-1.0,v1.11-debian-kinesis-1` [docker-image/v1.11/debian-kinesis/Dockerfile](docker-image/v1.11/debian-kinesis/Dockerfile)
3131

3232
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.
3333

Diff for: ‎docker-image/v1.11/debian-cloudwatch/.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/*.gitkeep

Diff for: ‎docker-image/v1.11/debian-cloudwatch/Dockerfile

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# AUTOMATICALLY GENERATED
2+
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Dockerfile.erb
3+
4+
FROM fluent/fluentd:v1.11.0-debian-1.0
5+
6+
LABEL maintainer="Eduardo Silva <[email protected]>"
7+
USER root
8+
WORKDIR /home/fluent
9+
ENV PATH /fluentd/vendor/bundle/ruby/2.6.0/bin:$PATH
10+
ENV GEM_PATH /fluentd/vendor/bundle/ruby/2.6.0
11+
ENV GEM_HOME /fluentd/vendor/bundle/ruby/2.6.0
12+
# skip runtime bundler installation
13+
ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
14+
15+
COPY Gemfile* /fluentd/
16+
RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev" \
17+
runtimeDeps="" \
18+
&& apt-get update \
19+
&& apt-get upgrade -y \
20+
&& apt-get install \
21+
-y --no-install-recommends \
22+
$buildDeps $runtimeDeps net-tools \
23+
&& gem install bundler --version 2.1.4 \
24+
&& bundle config silence_root_warning true \
25+
&& bundle install --gemfile=/fluentd/Gemfile --path=/fluentd/vendor/bundle \
26+
&& SUDO_FORCE_REMOVE=yes \
27+
apt-get purge -y --auto-remove \
28+
-o APT::AutoRemove::RecommendsImportant=false \
29+
$buildDeps \
30+
&& rm -rf /var/lib/apt/lists/* \
31+
&& gem sources --clear-all \
32+
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem
33+
34+
# Copy configuration files
35+
COPY ./conf/fluent.conf /fluentd/etc/
36+
COPY ./conf/systemd.conf /fluentd/etc/
37+
COPY ./conf/kubernetes.conf /fluentd/etc/
38+
COPY ./conf/prometheus.conf /fluentd/etc/
39+
RUN touch /fluentd/etc/disable.conf
40+
41+
# Copy plugins
42+
COPY plugins /fluentd/plugins/
43+
COPY entrypoint.sh /fluentd/entrypoint.sh
44+
45+
# Environment variables
46+
ENV FLUENTD_OPT=""
47+
ENV FLUENTD_CONF="fluent.conf"
48+
49+
# Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib
50+
ENTRYPOINT ["tini", "--", "/fluentd/entrypoint.sh"]

Diff for: ‎docker-image/v1.11/debian-cloudwatch/Gemfile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# AUTOMATICALLY GENERATED
2+
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/Gemfile.erb
3+
4+
source "https://rubygems.org"
5+
6+
gem "fluentd", "1.11.0"
7+
gem "oj", "3.8.1"
8+
gem "fluent-plugin-multi-format-parser", "~> 1.0.0"
9+
gem "fluent-plugin-concat", "~> 2.4.0"
10+
gem "fluent-plugin-grok-parser", "~> 2.6.0"
11+
gem "fluent-plugin-prometheus", "~> 1.6.1"
12+
gem 'fluent-plugin-json-in-json-2', ">= 1.0.2"
13+
gem "fluent-plugin-record-modifier", "~> 2.0.0"
14+
gem "fluent-plugin-detect-exceptions", "~> 0.0.12"
15+
gem "fluent-plugin-rewrite-tag-filter", "~> 2.2.0"
16+
gem "aws-sdk-cloudwatchlogs", "~> 1.0"
17+
gem "fluent-plugin-cloudwatch-logs", "~> 0.9.3"
18+
gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.3.0"
19+
gem "ffi"
20+
gem "fluent-plugin-systemd", "~> 1.0.1"

Diff for: ‎docker-image/v1.11/debian-cloudwatch/Gemfile.lock

+138
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
addressable (2.7.0)
5+
public_suffix (>= 2.0.2, < 5.0)
6+
aws-eventstream (1.1.0)
7+
aws-partitions (1.326.0)
8+
aws-sdk-cloudwatchlogs (1.31.0)
9+
aws-sdk-core (~> 3, >= 3.71.0)
10+
aws-sigv4 (~> 1.1)
11+
aws-sdk-core (3.98.0)
12+
aws-eventstream (~> 1, >= 1.0.2)
13+
aws-partitions (~> 1, >= 1.239.0)
14+
aws-sigv4 (~> 1.1)
15+
jmespath (~> 1.0)
16+
aws-sigv4 (1.1.4)
17+
aws-eventstream (~> 1.0, >= 1.0.2)
18+
concurrent-ruby (1.1.6)
19+
cool.io (1.6.0)
20+
domain_name (0.5.20190701)
21+
unf (>= 0.0.5, < 1.0.0)
22+
ffi (1.13.0)
23+
ffi-compiler (1.0.1)
24+
ffi (>= 1.0.0)
25+
rake
26+
fluent-config-regexp-type (1.0.0)
27+
fluentd (> 1.0.0, < 2)
28+
fluent-plugin-cloudwatch-logs (0.9.4)
29+
aws-sdk-cloudwatchlogs (~> 1.0)
30+
fluentd (>= 1.8.0)
31+
fluent-plugin-concat (2.4.0)
32+
fluentd (>= 0.14.0, < 2)
33+
fluent-plugin-detect-exceptions (0.0.13)
34+
fluentd (>= 0.10)
35+
fluent-plugin-grok-parser (2.6.1)
36+
fluentd (>= 0.14.6, < 2)
37+
fluent-plugin-json-in-json-2 (1.0.2)
38+
fluentd (>= 0.14.0, < 2)
39+
yajl-ruby (~> 1.0)
40+
fluent-plugin-kubernetes_metadata_filter (2.3.0)
41+
fluentd (>= 0.14.0, < 2)
42+
kubeclient (< 5)
43+
lru_redux
44+
fluent-plugin-multi-format-parser (1.0.0)
45+
fluentd (>= 0.14.0, < 2)
46+
fluent-plugin-prometheus (1.6.1)
47+
fluentd (>= 0.14.20, < 2)
48+
prometheus-client (< 0.10)
49+
fluent-plugin-record-modifier (2.0.1)
50+
fluentd (>= 1.0, < 2)
51+
fluent-plugin-rewrite-tag-filter (2.2.0)
52+
fluent-config-regexp-type
53+
fluentd (>= 0.14.2, < 2)
54+
fluent-plugin-systemd (1.0.2)
55+
fluentd (>= 0.14.11, < 2)
56+
systemd-journal (~> 1.3.2)
57+
fluentd (1.11.0)
58+
cool.io (>= 1.4.5, < 2.0.0)
59+
http_parser.rb (>= 0.5.1, < 0.7.0)
60+
msgpack (>= 1.3.1, < 2.0.0)
61+
serverengine (>= 2.0.4, < 3.0.0)
62+
sigdump (~> 0.2.2)
63+
strptime (>= 0.2.2, < 1.0.0)
64+
tzinfo (>= 1.0, < 3.0)
65+
tzinfo-data (~> 1.0)
66+
yajl-ruby (~> 1.0)
67+
http (4.4.1)
68+
addressable (~> 2.3)
69+
http-cookie (~> 1.0)
70+
http-form_data (~> 2.2)
71+
http-parser (~> 1.2.0)
72+
http-accept (1.7.0)
73+
http-cookie (1.0.3)
74+
domain_name (~> 0.5)
75+
http-form_data (2.3.0)
76+
http-parser (1.2.1)
77+
ffi-compiler (>= 1.0, < 2.0)
78+
http_parser.rb (0.6.0)
79+
jmespath (1.4.0)
80+
kubeclient (4.6.0)
81+
http (>= 3.0, < 5.0)
82+
recursive-open-struct (~> 1.0, >= 1.0.4)
83+
rest-client (~> 2.0)
84+
lru_redux (1.1.0)
85+
mime-types (3.3.1)
86+
mime-types-data (~> 3.2015)
87+
mime-types-data (3.2020.0512)
88+
msgpack (1.3.3)
89+
netrc (0.11.0)
90+
oj (3.8.1)
91+
prometheus-client (0.9.0)
92+
quantile (~> 0.2.1)
93+
public_suffix (4.0.5)
94+
quantile (0.2.1)
95+
rake (13.0.1)
96+
recursive-open-struct (1.1.1)
97+
rest-client (2.1.0)
98+
http-accept (>= 1.7.0, < 2.0)
99+
http-cookie (>= 1.0.2, < 2.0)
100+
mime-types (>= 1.16, < 4.0)
101+
netrc (~> 0.8)
102+
serverengine (2.2.1)
103+
sigdump (~> 0.2.2)
104+
sigdump (0.2.4)
105+
strptime (0.2.4)
106+
systemd-journal (1.3.3)
107+
ffi (~> 1.9)
108+
tzinfo (2.0.2)
109+
concurrent-ruby (~> 1.0)
110+
tzinfo-data (1.2020.1)
111+
tzinfo (>= 1.0.0)
112+
unf (0.1.4)
113+
unf_ext
114+
unf_ext (0.0.7.7)
115+
yajl-ruby (1.4.1)
116+
117+
PLATFORMS
118+
ruby
119+
120+
DEPENDENCIES
121+
aws-sdk-cloudwatchlogs (~> 1.0)
122+
ffi
123+
fluent-plugin-cloudwatch-logs (~> 0.9.3)
124+
fluent-plugin-concat (~> 2.4.0)
125+
fluent-plugin-detect-exceptions (~> 0.0.12)
126+
fluent-plugin-grok-parser (~> 2.6.0)
127+
fluent-plugin-json-in-json-2 (>= 1.0.2)
128+
fluent-plugin-kubernetes_metadata_filter (~> 2.3.0)
129+
fluent-plugin-multi-format-parser (~> 1.0.0)
130+
fluent-plugin-prometheus (~> 1.6.1)
131+
fluent-plugin-record-modifier (~> 2.0.0)
132+
fluent-plugin-rewrite-tag-filter (~> 2.2.0)
133+
fluent-plugin-systemd (~> 1.0.1)
134+
fluentd (= 1.11.0)
135+
oj (= 3.8.1)
136+
137+
BUNDLED WITH
138+
2.1.4

Diff for: ‎docker-image/v1.11/debian-cloudwatch/conf/fluent.conf

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
# AUTOMATICALLY GENERATED
3+
# DO NOT EDIT THIS FILE DIRECTLY, USE /templates/conf/fluent.conf.erb
4+
5+
@include "#{ENV['FLUENTD_SYSTEMD_CONF'] || 'systemd'}.conf"
6+
@include "#{ENV['FLUENTD_PROMETHEUS_CONF'] || 'prometheus'}.conf"
7+
@include kubernetes.conf
8+
@include conf.d/*.conf
9+
10+
<match **>
11+
@type cloudwatch_logs
12+
@id out_cloudwatch_logs
13+
log_group_name "#{ENV['LOG_GROUP_NAME']}"
14+
auto_create_stream true
15+
use_tag_as_stream true
16+
retention_in_days "#{ENV['RETENTION_IN_DAYS'] || 'nil'}"
17+
json_handler yajl # To avoid UndefinedConversionError
18+
log_rejected_request "#{ENV['LOG_REJECTED_REQUEST']}" # Log rejected request for missing parts
19+
</match>

0 commit comments

Comments
 (0)