Skip to content

Commit 1be6199

Browse files
repeatedlyrepeatedly
authored
Merge pull request #155 from naiduarvind/master
Include rewrite-tag-filter plugin for fluentd
2 parents 30cc62d + c578fa2 commit 1be6199

File tree

102 files changed

+380
-196
lines changed

Some content is hidden

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

102 files changed

+380
-196
lines changed

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,6 @@
1010

1111
### Debian
1212

13-
- `v1.2-debian-elasticsearch` [docker-image/v1.2/debian-elasticsearch/Dockerfile](docker-image/v1.2/debian-elasticsearch/Dockerfile)
14-
- `v1.2-debian-loggly` [docker-image/v1.2/debian-loggly/Dockerfile](docker-image/v1.2/debian-loggly/Dockerfile)
15-
- `v1.2-debian-logentries` [docker-image/v1.2/debian-logentries/Dockerfile](docker-image/v1.2/debian-logentries/Dockerfile)
16-
- `v1.2-debian-cloudwatch` [docker-image/v1.2/debian-cloudwatch/Dockerfile](docker-image/v1.2/debian-cloudwatch/Dockerfile)
17-
- `v1.2-debian-stackdriver` [docker-image/v1.2/debian-stackdriver/Dockerfile](docker-image/v1.2/debian-stackdriver/Dockerfile)
18-
- `v1.2-debian-s3` [docker-image/v1.2/debian-s3/Dockerfile](docker-image/v1.2/debian-s3/Dockerfile)
19-
- `v1.2-debian-syslog` [docker-image/v1.2/debian-syslog/Dockerfile](docker-image/v1.2/debian-syslog/Dockerfile)
20-
- `v1.2-debian-gcs` [docker-image/v1.2/debian-gcs/Dockerfile](docker-image/v1.2/debian-gcs/Dockerfile)
21-
- `v1.2-debian-graylog` [docker-image/v1.2/debian-graylog/Dockerfile](docker-image/v1.2/debian-graylog/Dockerfile)
22-
- `v1.2-debian-papertrail` [docker-image/v1.2/debian-papertrail/Dockerfile](docker-image/v1.2/debian-papertrail/Dockerfile)
23-
- `v1.2-debian-logzio` [docker-image/v1.2/debian-logzio/Dockerfile](docker-image/v1.2/debian-logzio/Dockerfile)
24-
- `v1.2-debian-kafka` [docker-image/v1.2/debian-kafka/Dockerfile](docker-image/v1.2/debian-kafka/Dockerfile)
2513
- `v0.12-debian-elasticsearch` [docker-image/v0.12/debian-elasticsearch/Dockerfile](docker-image/v0.12/debian-elasticsearch/Dockerfile)
2614
- `v0.12-debian-loggly` [docker-image/v0.12/debian-loggly/Dockerfile](docker-image/v0.12/debian-loggly/Dockerfile)
2715
- `v0.12-debian-logentries` [docker-image/v0.12/debian-logentries/Dockerfile](docker-image/v0.12/debian-logentries/Dockerfile)
@@ -34,6 +22,18 @@
3422
- `v0.12-debian-graylog` [docker-image/v0.12/debian-graylog/Dockerfile](docker-image/v0.12/debian-graylog/Dockerfile)
3523
- `v0.12-debian-logzio` [docker-image/v0.12/debian-logzio/Dockerfile](docker-image/v0.12/debian-logzio/Dockerfile)
3624
- `v0.12-debian-kafka` [docker-image/v0.12/debian-kafka/Dockerfile](docker-image/v0.12/debian-kafka/Dockerfile)
25+
- `v1.2-debian-elasticsearch` [docker-image/v1.2/debian-elasticsearch/Dockerfile](docker-image/v1.2/debian-elasticsearch/Dockerfile)
26+
- `v1.2-debian-loggly` [docker-image/v1.2/debian-loggly/Dockerfile](docker-image/v1.2/debian-loggly/Dockerfile)
27+
- `v1.2-debian-logentries` [docker-image/v1.2/debian-logentries/Dockerfile](docker-image/v1.2/debian-logentries/Dockerfile)
28+
- `v1.2-debian-cloudwatch` [docker-image/v1.2/debian-cloudwatch/Dockerfile](docker-image/v1.2/debian-cloudwatch/Dockerfile)
29+
- `v1.2-debian-stackdriver` [docker-image/v1.2/debian-stackdriver/Dockerfile](docker-image/v1.2/debian-stackdriver/Dockerfile)
30+
- `v1.2-debian-s3` [docker-image/v1.2/debian-s3/Dockerfile](docker-image/v1.2/debian-s3/Dockerfile)
31+
- `v1.2-debian-syslog` [docker-image/v1.2/debian-syslog/Dockerfile](docker-image/v1.2/debian-syslog/Dockerfile)
32+
- `v1.2-debian-gcs` [docker-image/v1.2/debian-gcs/Dockerfile](docker-image/v1.2/debian-gcs/Dockerfile)
33+
- `v1.2-debian-graylog` [docker-image/v1.2/debian-graylog/Dockerfile](docker-image/v1.2/debian-graylog/Dockerfile)
34+
- `v1.2-debian-papertrail` [docker-image/v1.2/debian-papertrail/Dockerfile](docker-image/v1.2/debian-papertrail/Dockerfile)
35+
- `v1.2-debian-logzio` [docker-image/v1.2/debian-logzio/Dockerfile](docker-image/v1.2/debian-logzio/Dockerfile)
36+
- `v1.2-debian-kafka` [docker-image/v1.2/debian-kafka/Dockerfile](docker-image/v1.2/debian-kafka/Dockerfile)
3737

3838
### Alpine Linux
3939

‎docker-image/v0.12/alpine-cloudwatch/Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ gem "fluentd", "0.12.33"
77
gem "oj", "3.5.1"
88
gem "fluent-plugin-secure-forward"
99
gem "fluent-plugin-record-reformer"
10+
gem "fluent-plugin-rewrite-tag-filter"
1011
gem "aws-sdk-cloudwatchlogs", "~> 1.0"
1112
gem "fluent-plugin-cloudwatch-logs", "0.4.5"
1213
gem "fluent-plugin-kubernetes_metadata_filter"

‎docker-image/v0.12/alpine-cloudwatch/Gemfile.lock

+11-6
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ GEM
88
tzinfo (~> 1.1)
99
addressable (2.5.2)
1010
public_suffix (>= 2.0.2, < 4.0)
11-
aws-partitions (1.82.0)
12-
aws-sdk-cloudwatchlogs (1.3.0)
11+
aws-eventstream (1.0.1)
12+
aws-partitions (1.94.0)
13+
aws-sdk-cloudwatchlogs (1.4.0)
1314
aws-sdk-core (~> 3)
1415
aws-sigv4 (~> 1.0)
15-
aws-sdk-core (3.20.2)
16+
aws-sdk-core (3.22.1)
17+
aws-eventstream (~> 1.0)
1618
aws-partitions (~> 1.0)
1719
aws-sigv4 (~> 1.0)
1820
jmespath (~> 1.0)
19-
aws-sigv4 (1.0.2)
21+
aws-sigv4 (1.0.3)
2022
concurrent-ruby (1.0.5)
2123
cool.io (1.5.3)
2224
domain_name (0.5.20180417)
@@ -28,12 +30,14 @@ GEM
2830
aws-sdk-cloudwatchlogs (~> 1.0)
2931
fluent-mixin-config-placeholders (>= 0.2.0)
3032
fluentd
31-
fluent-plugin-kubernetes_metadata_filter (1.0.2)
33+
fluent-plugin-kubernetes_metadata_filter (1.1.0)
3234
fluentd (>= 0.12.0)
3335
kubeclient (~> 1.1.4)
3436
lru_redux
3537
fluent-plugin-record-reformer (0.9.1)
3638
fluentd
39+
fluent-plugin-rewrite-tag-filter (1.6.0)
40+
fluentd (>= 0.12.0, < 0.14.0)
3741
fluent-plugin-secure-forward (0.4.5)
3842
fluentd (>= 0.10.46)
3943
proxifier
@@ -87,7 +91,7 @@ GEM
8791
thread_safe (0.3.6)
8892
tzinfo (1.2.5)
8993
thread_safe (~> 0.1)
90-
tzinfo-data (1.2018.4)
94+
tzinfo-data (1.2018.5)
9195
tzinfo (>= 1.0.0)
9296
unf (0.1.4)
9397
unf_ext
@@ -103,6 +107,7 @@ DEPENDENCIES
103107
fluent-plugin-cloudwatch-logs (= 0.4.5)
104108
fluent-plugin-kubernetes_metadata_filter
105109
fluent-plugin-record-reformer
110+
fluent-plugin-rewrite-tag-filter
106111
fluent-plugin-secure-forward
107112
fluentd (= 0.12.33)
108113
oj (= 3.5.1)

‎docker-image/v0.12/alpine-cloudwatch/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/dumb-init /bin/sh
22

33
set -e
44

‎docker-image/v0.12/alpine-elasticsearch/Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ gem "fluentd", "0.12.33"
77
gem "oj", "3.5.1"
88
gem "fluent-plugin-secure-forward"
99
gem "fluent-plugin-record-reformer"
10+
gem "fluent-plugin-rewrite-tag-filter"
1011
gem "fluent-plugin-elasticsearch"
1112
gem "fluent-plugin-kubernetes_metadata_filter"

‎docker-image/v0.12/alpine-elasticsearch/Gemfile.lock

+12-9
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,29 @@ GEM
1212
cool.io (1.5.3)
1313
domain_name (0.5.20180417)
1414
unf (>= 0.0.5, < 1.0.0)
15-
elasticsearch (6.0.2)
16-
elasticsearch-api (= 6.0.2)
17-
elasticsearch-transport (= 6.0.2)
18-
elasticsearch-api (6.0.2)
15+
elasticsearch (6.1.0)
16+
elasticsearch-api (= 6.1.0)
17+
elasticsearch-transport (= 6.1.0)
18+
elasticsearch-api (6.1.0)
1919
multi_json
20-
elasticsearch-transport (6.0.2)
20+
elasticsearch-transport (6.1.0)
2121
faraday
2222
multi_json
2323
excon (0.62.0)
24-
faraday (0.15.0)
24+
faraday (0.15.2)
2525
multipart-post (>= 1.2, < 3)
26-
fluent-plugin-elasticsearch (1.16.0)
26+
fluent-plugin-elasticsearch (1.17.0)
2727
elasticsearch
2828
excon
2929
fluentd (>= 0.12.10)
30-
fluent-plugin-kubernetes_metadata_filter (1.0.2)
30+
fluent-plugin-kubernetes_metadata_filter (1.1.0)
3131
fluentd (>= 0.12.0)
3232
kubeclient (~> 1.1.4)
3333
lru_redux
3434
fluent-plugin-record-reformer (0.9.1)
3535
fluentd
36+
fluent-plugin-rewrite-tag-filter (1.6.0)
37+
fluentd (>= 0.12.0, < 0.14.0)
3638
fluent-plugin-secure-forward (0.4.5)
3739
fluentd (>= 0.10.46)
3840
proxifier
@@ -87,7 +89,7 @@ GEM
8789
thread_safe (0.3.6)
8890
tzinfo (1.2.5)
8991
thread_safe (~> 0.1)
90-
tzinfo-data (1.2018.4)
92+
tzinfo-data (1.2018.5)
9193
tzinfo (>= 1.0.0)
9294
unf (0.1.4)
9395
unf_ext
@@ -101,6 +103,7 @@ DEPENDENCIES
101103
fluent-plugin-elasticsearch
102104
fluent-plugin-kubernetes_metadata_filter
103105
fluent-plugin-record-reformer
106+
fluent-plugin-rewrite-tag-filter
104107
fluent-plugin-secure-forward
105108
fluentd (= 0.12.33)
106109
oj (= 3.5.1)

‎docker-image/v0.12/alpine-elasticsearch/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/dumb-init /bin/sh
22

33
set -e
44

‎docker-image/v0.12/alpine-gcs/Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ gem "fluentd", "0.12.33"
77
gem "oj", "3.5.1"
88
gem "fluent-plugin-secure-forward"
99
gem "fluent-plugin-record-reformer"
10+
gem "fluent-plugin-rewrite-tag-filter"
1011
gem "fluent-plugin-gcs", "~>0.3"
1112
gem "fluent-plugin-kubernetes_metadata_filter"

‎docker-image/v0.12/alpine-gcs/Gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,19 @@ GEM
1313
digest-crc (0.4.1)
1414
domain_name (0.5.20180417)
1515
unf (>= 0.0.5, < 1.0.0)
16-
faraday (0.15.0)
16+
faraday (0.15.2)
1717
multipart-post (>= 1.2, < 3)
1818
fluent-plugin-gcs (0.3.0)
1919
fluentd (~> 0.12.0)
2020
google-cloud-storage (~> 0.23.2)
21-
fluent-plugin-kubernetes_metadata_filter (1.0.2)
21+
fluent-plugin-kubernetes_metadata_filter (1.1.0)
2222
fluentd (>= 0.12.0)
2323
kubeclient (~> 1.1.4)
2424
lru_redux
2525
fluent-plugin-record-reformer (0.9.1)
2626
fluentd
27+
fluent-plugin-rewrite-tag-filter (1.6.0)
28+
fluentd (>= 0.12.0, < 0.14.0)
2729
fluent-plugin-secure-forward (0.4.5)
2830
fluentd (>= 0.10.46)
2931
proxifier
@@ -117,7 +119,7 @@ GEM
117119
thread_safe (0.3.6)
118120
tzinfo (1.2.5)
119121
thread_safe (~> 0.1)
120-
tzinfo-data (1.2018.4)
122+
tzinfo-data (1.2018.5)
121123
tzinfo (>= 1.0.0)
122124
uber (0.0.15)
123125
unf (0.1.4)
@@ -132,6 +134,7 @@ DEPENDENCIES
132134
fluent-plugin-gcs (~> 0.3)
133135
fluent-plugin-kubernetes_metadata_filter
134136
fluent-plugin-record-reformer
137+
fluent-plugin-rewrite-tag-filter
135138
fluent-plugin-secure-forward
136139
fluentd (= 0.12.33)
137140
oj (= 3.5.1)

‎docker-image/v0.12/alpine-gcs/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/dumb-init /bin/sh
22

33
set -e
44

‎docker-image/v0.12/alpine-graylog/Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ gem "fluentd", "0.12.33"
77
gem "oj", "3.5.1"
88
gem "fluent-plugin-secure-forward"
99
gem "fluent-plugin-record-reformer"
10-
gem "gelf", git: "https://github.com/graylog-labs/gelf-rb.git"
10+
gem "fluent-plugin-rewrite-tag-filter"
11+
gem "gelf"
1112
gem "fluent-plugin-gelf-hs"
1213
gem "fluent-plugin-kubernetes_metadata_filter"

‎docker-image/v0.12/alpine-graylog/Gemfile.lock

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
GIT
2-
remote: https://github.com/graylog-labs/gelf-rb.git
3-
revision: de1cb44ea9c35687d725749a88763981d9d0d89e
4-
specs:
5-
gelf (3.0.0)
6-
json
7-
81
GEM
92
remote: https://rubygems.org/
103
specs:
@@ -19,15 +12,17 @@ GEM
1912
cool.io (1.5.3)
2013
domain_name (0.5.20180417)
2114
unf (>= 0.0.5, < 1.0.0)
22-
fluent-plugin-gelf-hs (1.0.6)
15+
fluent-plugin-gelf-hs (1.0.7)
2316
fluentd
2417
gelf (>= 2.0.0)
25-
fluent-plugin-kubernetes_metadata_filter (1.0.2)
18+
fluent-plugin-kubernetes_metadata_filter (1.1.0)
2619
fluentd (>= 0.12.0)
2720
kubeclient (~> 1.1.4)
2821
lru_redux
2922
fluent-plugin-record-reformer (0.9.1)
3023
fluentd
24+
fluent-plugin-rewrite-tag-filter (1.6.0)
25+
fluentd (>= 0.12.0, < 0.14.0)
3126
fluent-plugin-secure-forward (0.4.5)
3227
fluentd (>= 0.10.46)
3328
proxifier
@@ -42,6 +37,8 @@ GEM
4237
tzinfo (>= 1.0.0)
4338
tzinfo-data (>= 1.0.0)
4439
yajl-ruby (~> 1.0)
40+
gelf (3.0.0)
41+
json
4542
http (0.9.8)
4643
addressable (~> 2.3)
4744
http-cookie (~> 1.0)
@@ -80,7 +77,7 @@ GEM
8077
thread_safe (0.3.6)
8178
tzinfo (1.2.5)
8279
thread_safe (~> 0.1)
83-
tzinfo-data (1.2018.4)
80+
tzinfo-data (1.2018.5)
8481
tzinfo (>= 1.0.0)
8582
unf (0.1.4)
8683
unf_ext
@@ -94,9 +91,10 @@ DEPENDENCIES
9491
fluent-plugin-gelf-hs
9592
fluent-plugin-kubernetes_metadata_filter
9693
fluent-plugin-record-reformer
94+
fluent-plugin-rewrite-tag-filter
9795
fluent-plugin-secure-forward
9896
fluentd (= 0.12.33)
99-
gelf!
97+
gelf
10098
oj (= 3.5.1)
10199

102100
BUNDLED WITH

‎docker-image/v0.12/alpine-graylog/conf/fluent.conf

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
max_retry_wait 30
1818
disable_retry_limit
1919
num_threads 8
20+
</match>

‎docker-image/v0.12/alpine-graylog/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/dumb-init /bin/sh
22

33
set -e
44

‎docker-image/v0.12/alpine-kafka/Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ gem "fluentd", "0.12.33"
77
gem "oj", "3.5.1"
88
gem "fluent-plugin-secure-forward"
99
gem "fluent-plugin-record-reformer"
10+
gem "fluent-plugin-rewrite-tag-filter"
1011
gem "fluent-plugin-kafka"
1112
gem "fluent-plugin-kubernetes_metadata_filter"

‎docker-image/v0.12/alpine-kafka/Gemfile.lock

+7-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,18 @@ GEM
1212
cool.io (1.5.3)
1313
domain_name (0.5.20180417)
1414
unf (>= 0.0.5, < 1.0.0)
15-
fluent-plugin-kafka (0.7.2)
15+
fluent-plugin-kafka (0.7.3)
1616
fluentd (>= 0.10.58, < 2)
1717
ltsv
1818
ruby-kafka (>= 0.4.1, < 1.0.0)
19-
fluent-plugin-kubernetes_metadata_filter (1.0.2)
19+
fluent-plugin-kubernetes_metadata_filter (1.1.0)
2020
fluentd (>= 0.12.0)
2121
kubeclient (~> 1.1.4)
2222
lru_redux
2323
fluent-plugin-record-reformer (0.9.1)
2424
fluentd
25+
fluent-plugin-rewrite-tag-filter (1.6.0)
26+
fluentd (>= 0.12.0, < 0.14.0)
2527
fluent-plugin-secure-forward (0.4.5)
2628
fluentd (>= 0.10.46)
2729
proxifier
@@ -70,13 +72,13 @@ GEM
7072
http-cookie (>= 1.0.2, < 2.0)
7173
mime-types (>= 1.16, < 4.0)
7274
netrc (~> 0.8)
73-
ruby-kafka (0.5.5)
75+
ruby-kafka (0.6.7)
7476
sigdump (0.2.4)
7577
string-scrub (0.0.5)
7678
thread_safe (0.3.6)
7779
tzinfo (1.2.5)
7880
thread_safe (~> 0.1)
79-
tzinfo-data (1.2018.4)
81+
tzinfo-data (1.2018.5)
8082
tzinfo (>= 1.0.0)
8183
unf (0.1.4)
8284
unf_ext
@@ -90,6 +92,7 @@ DEPENDENCIES
9092
fluent-plugin-kafka
9193
fluent-plugin-kubernetes_metadata_filter
9294
fluent-plugin-record-reformer
95+
fluent-plugin-rewrite-tag-filter
9396
fluent-plugin-secure-forward
9497
fluentd (= 0.12.33)
9598
oj (= 3.5.1)

‎docker-image/v0.12/alpine-kafka/conf/fluent.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
max_send_limit_bytes "#{ENV['FLUENT_KAFKA_MAX_SEND_LIMIT_BYTES'] || nil}"
2929
discard_kafka_delivery_failed "#{ENV['FLUENT_KAFKA_DISCARD_KAFKA_DELIVERY_FAILED'] || false}"
3030
</match>
31-
31+

‎docker-image/v0.12/alpine-kafka/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/dumb-init /bin/sh
22

33
set -e
44

‎docker-image/v0.12/alpine-logentries/Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ gem "fluentd", "0.12.33"
77
gem "oj", "3.5.1"
88
gem "fluent-plugin-secure-forward"
99
gem "fluent-plugin-record-reformer"
10+
gem "fluent-plugin-rewrite-tag-filter"
1011
#gem "fluent-plugin-logentries"
1112
gem "fluent-plugin-kubernetes_metadata_filter"

0 commit comments

Comments
 (0)