Merge pull request #155 from naiduarvind/master

Include rewrite-tag-filter plugin for fluentd
fluent · Jul 3, 2018 · 1be6199 · 1be6199
2 parents 30cc62d + c578fa2
commit 1be6199
Show file tree

Hide file tree

Showing 102 changed files with 380 additions and 196 deletions.
diff --git a/README.md b/README.md
@@ -10,18 +10,6 @@
 
 ### Debian
 
-- `v1.2-debian-elasticsearch` [docker-image/v1.2/debian-elasticsearch/Dockerfile](docker-image/v1.2/debian-elasticsearch/Dockerfile)
-- `v1.2-debian-loggly` [docker-image/v1.2/debian-loggly/Dockerfile](docker-image/v1.2/debian-loggly/Dockerfile)
-- `v1.2-debian-logentries` [docker-image/v1.2/debian-logentries/Dockerfile](docker-image/v1.2/debian-logentries/Dockerfile)
-- `v1.2-debian-cloudwatch` [docker-image/v1.2/debian-cloudwatch/Dockerfile](docker-image/v1.2/debian-cloudwatch/Dockerfile)
-- `v1.2-debian-stackdriver` [docker-image/v1.2/debian-stackdriver/Dockerfile](docker-image/v1.2/debian-stackdriver/Dockerfile)
-- `v1.2-debian-s3` [docker-image/v1.2/debian-s3/Dockerfile](docker-image/v1.2/debian-s3/Dockerfile)
-- `v1.2-debian-syslog` [docker-image/v1.2/debian-syslog/Dockerfile](docker-image/v1.2/debian-syslog/Dockerfile)
-- `v1.2-debian-gcs` [docker-image/v1.2/debian-gcs/Dockerfile](docker-image/v1.2/debian-gcs/Dockerfile)
-- `v1.2-debian-graylog` [docker-image/v1.2/debian-graylog/Dockerfile](docker-image/v1.2/debian-graylog/Dockerfile)
-- `v1.2-debian-papertrail` [docker-image/v1.2/debian-papertrail/Dockerfile](docker-image/v1.2/debian-papertrail/Dockerfile)
-- `v1.2-debian-logzio` [docker-image/v1.2/debian-logzio/Dockerfile](docker-image/v1.2/debian-logzio/Dockerfile)
-- `v1.2-debian-kafka` [docker-image/v1.2/debian-kafka/Dockerfile](docker-image/v1.2/debian-kafka/Dockerfile)
 - `v0.12-debian-elasticsearch` [docker-image/v0.12/debian-elasticsearch/Dockerfile](docker-image/v0.12/debian-elasticsearch/Dockerfile)
 - `v0.12-debian-loggly` [docker-image/v0.12/debian-loggly/Dockerfile](docker-image/v0.12/debian-loggly/Dockerfile)
 - `v0.12-debian-logentries` [docker-image/v0.12/debian-logentries/Dockerfile](docker-image/v0.12/debian-logentries/Dockerfile)
@@ -34,6 +22,18 @@
 - `v0.12-debian-graylog` [docker-image/v0.12/debian-graylog/Dockerfile](docker-image/v0.12/debian-graylog/Dockerfile)
 - `v0.12-debian-logzio` [docker-image/v0.12/debian-logzio/Dockerfile](docker-image/v0.12/debian-logzio/Dockerfile)
 - `v0.12-debian-kafka` [docker-image/v0.12/debian-kafka/Dockerfile](docker-image/v0.12/debian-kafka/Dockerfile)
+- `v1.2-debian-elasticsearch` [docker-image/v1.2/debian-elasticsearch/Dockerfile](docker-image/v1.2/debian-elasticsearch/Dockerfile)
+- `v1.2-debian-loggly` [docker-image/v1.2/debian-loggly/Dockerfile](docker-image/v1.2/debian-loggly/Dockerfile)
+- `v1.2-debian-logentries` [docker-image/v1.2/debian-logentries/Dockerfile](docker-image/v1.2/debian-logentries/Dockerfile)
+- `v1.2-debian-cloudwatch` [docker-image/v1.2/debian-cloudwatch/Dockerfile](docker-image/v1.2/debian-cloudwatch/Dockerfile)
+- `v1.2-debian-stackdriver` [docker-image/v1.2/debian-stackdriver/Dockerfile](docker-image/v1.2/debian-stackdriver/Dockerfile)
+- `v1.2-debian-s3` [docker-image/v1.2/debian-s3/Dockerfile](docker-image/v1.2/debian-s3/Dockerfile)
+- `v1.2-debian-syslog` [docker-image/v1.2/debian-syslog/Dockerfile](docker-image/v1.2/debian-syslog/Dockerfile)
+- `v1.2-debian-gcs` [docker-image/v1.2/debian-gcs/Dockerfile](docker-image/v1.2/debian-gcs/Dockerfile)
+- `v1.2-debian-graylog` [docker-image/v1.2/debian-graylog/Dockerfile](docker-image/v1.2/debian-graylog/Dockerfile)
+- `v1.2-debian-papertrail` [docker-image/v1.2/debian-papertrail/Dockerfile](docker-image/v1.2/debian-papertrail/Dockerfile)
+- `v1.2-debian-logzio` [docker-image/v1.2/debian-logzio/Dockerfile](docker-image/v1.2/debian-logzio/Dockerfile)
+- `v1.2-debian-kafka` [docker-image/v1.2/debian-kafka/Dockerfile](docker-image/v1.2/debian-kafka/Dockerfile)
 
 ### Alpine Linux
 

diff --git a/docker-image/v0.12/alpine-cloudwatch/Gemfile b/docker-image/v0.12/alpine-cloudwatch/Gemfile
@@ -7,6 +7,7 @@ gem "fluentd", "0.12.33"
 gem "oj", "3.5.1"
 gem "fluent-plugin-secure-forward"
 gem "fluent-plugin-record-reformer"
+gem "fluent-plugin-rewrite-tag-filter"
 gem "aws-sdk-cloudwatchlogs", "~> 1.0"
 gem "fluent-plugin-cloudwatch-logs", "0.4.5"
 gem "fluent-plugin-kubernetes_metadata_filter"
diff --git a/docker-image/v0.12/alpine-cloudwatch/Gemfile.lock b/docker-image/v0.12/alpine-cloudwatch/Gemfile.lock
@@ -8,15 +8,17 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    aws-partitions (1.82.0)
-    aws-sdk-cloudwatchlogs (1.3.0)
+    aws-eventstream (1.0.1)
+    aws-partitions (1.94.0)
+    aws-sdk-cloudwatchlogs (1.4.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.20.2)
+    aws-sdk-core (3.22.1)
+      aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sigv4 (1.0.2)
+    aws-sigv4 (1.0.3)
     concurrent-ruby (1.0.5)
     cool.io (1.5.3)
     domain_name (0.5.20180417)
@@ -28,12 +30,14 @@ GEM
       aws-sdk-cloudwatchlogs (~> 1.0)
       fluent-mixin-config-placeholders (>= 0.2.0)
       fluentd
-    fluent-plugin-kubernetes_metadata_filter (1.0.2)
+    fluent-plugin-kubernetes_metadata_filter (1.1.0)
       fluentd (>= 0.12.0)
       kubeclient (~> 1.1.4)
       lru_redux
     fluent-plugin-record-reformer (0.9.1)
       fluentd
+    fluent-plugin-rewrite-tag-filter (1.6.0)
+      fluentd (>= 0.12.0, < 0.14.0)
     fluent-plugin-secure-forward (0.4.5)
       fluentd (>= 0.10.46)
       proxifier
@@ -87,7 +91,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.4)
+    tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -103,6 +107,7 @@ DEPENDENCIES
   fluent-plugin-cloudwatch-logs (= 0.4.5)
   fluent-plugin-kubernetes_metadata_filter
   fluent-plugin-record-reformer
+  fluent-plugin-rewrite-tag-filter
   fluent-plugin-secure-forward
   fluentd (= 0.12.33)
   oj (= 3.5.1)

diff --git a/docker-image/v0.12/alpine-cloudwatch/entrypoint.sh b/docker-image/v0.12/alpine-cloudwatch/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/dumb-init /bin/sh
 
 set -e
 

diff --git a/docker-image/v0.12/alpine-elasticsearch/Gemfile b/docker-image/v0.12/alpine-elasticsearch/Gemfile
@@ -7,5 +7,6 @@ gem "fluentd", "0.12.33"
 gem "oj", "3.5.1"
 gem "fluent-plugin-secure-forward"
 gem "fluent-plugin-record-reformer"
+gem "fluent-plugin-rewrite-tag-filter"
 gem "fluent-plugin-elasticsearch"
 gem "fluent-plugin-kubernetes_metadata_filter"
diff --git a/docker-image/v0.12/alpine-elasticsearch/Gemfile.lock b/docker-image/v0.12/alpine-elasticsearch/Gemfile.lock
@@ -12,27 +12,29 @@ GEM
     cool.io (1.5.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    elasticsearch (6.0.2)
-      elasticsearch-api (= 6.0.2)
-      elasticsearch-transport (= 6.0.2)
-    elasticsearch-api (6.0.2)
+    elasticsearch (6.1.0)
+      elasticsearch-api (= 6.1.0)
+      elasticsearch-transport (= 6.1.0)
+    elasticsearch-api (6.1.0)
       multi_json
-    elasticsearch-transport (6.0.2)
+    elasticsearch-transport (6.1.0)
       faraday
       multi_json
     excon (0.62.0)
-    faraday (0.15.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    fluent-plugin-elasticsearch (1.16.0)
+    fluent-plugin-elasticsearch (1.17.0)
       elasticsearch
       excon
       fluentd (>= 0.12.10)
-    fluent-plugin-kubernetes_metadata_filter (1.0.2)
+    fluent-plugin-kubernetes_metadata_filter (1.1.0)
       fluentd (>= 0.12.0)
       kubeclient (~> 1.1.4)
       lru_redux
     fluent-plugin-record-reformer (0.9.1)
       fluentd
+    fluent-plugin-rewrite-tag-filter (1.6.0)
+      fluentd (>= 0.12.0, < 0.14.0)
     fluent-plugin-secure-forward (0.4.5)
       fluentd (>= 0.10.46)
       proxifier
@@ -87,7 +89,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.4)
+    tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -101,6 +103,7 @@ DEPENDENCIES
   fluent-plugin-elasticsearch
   fluent-plugin-kubernetes_metadata_filter
   fluent-plugin-record-reformer
+  fluent-plugin-rewrite-tag-filter
   fluent-plugin-secure-forward
   fluentd (= 0.12.33)
   oj (= 3.5.1)

diff --git a/docker-image/v0.12/alpine-elasticsearch/entrypoint.sh b/docker-image/v0.12/alpine-elasticsearch/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/dumb-init /bin/sh
 
 set -e
 

diff --git a/docker-image/v0.12/alpine-gcs/Gemfile b/docker-image/v0.12/alpine-gcs/Gemfile
@@ -7,5 +7,6 @@ gem "fluentd", "0.12.33"
 gem "oj", "3.5.1"
 gem "fluent-plugin-secure-forward"
 gem "fluent-plugin-record-reformer"
+gem "fluent-plugin-rewrite-tag-filter"
 gem "fluent-plugin-gcs", "~>0.3"
 gem "fluent-plugin-kubernetes_metadata_filter"
diff --git a/docker-image/v0.12/alpine-gcs/Gemfile.lock b/docker-image/v0.12/alpine-gcs/Gemfile.lock
@@ -13,17 +13,19 @@ GEM
     digest-crc (0.4.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (0.15.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     fluent-plugin-gcs (0.3.0)
       fluentd (~> 0.12.0)
       google-cloud-storage (~> 0.23.2)
-    fluent-plugin-kubernetes_metadata_filter (1.0.2)
+    fluent-plugin-kubernetes_metadata_filter (1.1.0)
       fluentd (>= 0.12.0)
       kubeclient (~> 1.1.4)
       lru_redux
     fluent-plugin-record-reformer (0.9.1)
       fluentd
+    fluent-plugin-rewrite-tag-filter (1.6.0)
+      fluentd (>= 0.12.0, < 0.14.0)
     fluent-plugin-secure-forward (0.4.5)
       fluentd (>= 0.10.46)
       proxifier
@@ -117,7 +119,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.4)
+    tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
     uber (0.0.15)
     unf (0.1.4)
@@ -132,6 +134,7 @@ DEPENDENCIES
   fluent-plugin-gcs (~> 0.3)
   fluent-plugin-kubernetes_metadata_filter
   fluent-plugin-record-reformer
+  fluent-plugin-rewrite-tag-filter
   fluent-plugin-secure-forward
   fluentd (= 0.12.33)
   oj (= 3.5.1)

diff --git a/docker-image/v0.12/alpine-gcs/entrypoint.sh b/docker-image/v0.12/alpine-gcs/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/dumb-init /bin/sh
 
 set -e
 

diff --git a/docker-image/v0.12/alpine-graylog/Gemfile b/docker-image/v0.12/alpine-graylog/Gemfile
@@ -7,6 +7,7 @@ gem "fluentd", "0.12.33"
 gem "oj", "3.5.1"
 gem "fluent-plugin-secure-forward"
 gem "fluent-plugin-record-reformer"
-gem "gelf", git: "https://github.com/graylog-labs/gelf-rb.git"
+gem "fluent-plugin-rewrite-tag-filter"
+gem "gelf"
 gem "fluent-plugin-gelf-hs"
 gem "fluent-plugin-kubernetes_metadata_filter"
diff --git a/docker-image/v0.12/alpine-graylog/Gemfile.lock b/docker-image/v0.12/alpine-graylog/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: https://github.com/graylog-labs/gelf-rb.git
-  revision: de1cb44ea9c35687d725749a88763981d9d0d89e
-  specs:
-    gelf (3.0.0)
-      json
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -19,15 +12,17 @@ GEM
     cool.io (1.5.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    fluent-plugin-gelf-hs (1.0.6)
+    fluent-plugin-gelf-hs (1.0.7)
       fluentd
       gelf (>= 2.0.0)
-    fluent-plugin-kubernetes_metadata_filter (1.0.2)
+    fluent-plugin-kubernetes_metadata_filter (1.1.0)
       fluentd (>= 0.12.0)
       kubeclient (~> 1.1.4)
       lru_redux
     fluent-plugin-record-reformer (0.9.1)
       fluentd
+    fluent-plugin-rewrite-tag-filter (1.6.0)
+      fluentd (>= 0.12.0, < 0.14.0)
     fluent-plugin-secure-forward (0.4.5)
       fluentd (>= 0.10.46)
       proxifier
@@ -42,6 +37,8 @@ GEM
       tzinfo (>= 1.0.0)
       tzinfo-data (>= 1.0.0)
       yajl-ruby (~> 1.0)
+    gelf (3.0.0)
+      json
     http (0.9.8)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -80,7 +77,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.4)
+    tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -94,9 +91,10 @@ DEPENDENCIES
   fluent-plugin-gelf-hs
   fluent-plugin-kubernetes_metadata_filter
   fluent-plugin-record-reformer
+  fluent-plugin-rewrite-tag-filter
   fluent-plugin-secure-forward
   fluentd (= 0.12.33)
-  gelf!
+  gelf
   oj (= 3.5.1)
 
 BUNDLED WITH

diff --git a/docker-image/v0.12/alpine-graylog/conf/fluent.conf b/docker-image/v0.12/alpine-graylog/conf/fluent.conf
@@ -17,3 +17,4 @@
    max_retry_wait 30
    disable_retry_limit
    num_threads 8
+</match>
diff --git a/docker-image/v0.12/alpine-graylog/entrypoint.sh b/docker-image/v0.12/alpine-graylog/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/dumb-init /bin/sh
 
 set -e
 

diff --git a/docker-image/v0.12/alpine-kafka/Gemfile b/docker-image/v0.12/alpine-kafka/Gemfile
@@ -7,5 +7,6 @@ gem "fluentd", "0.12.33"
 gem "oj", "3.5.1"
 gem "fluent-plugin-secure-forward"
 gem "fluent-plugin-record-reformer"
+gem "fluent-plugin-rewrite-tag-filter"
 gem "fluent-plugin-kafka"
 gem "fluent-plugin-kubernetes_metadata_filter"
diff --git a/docker-image/v0.12/alpine-kafka/Gemfile.lock b/docker-image/v0.12/alpine-kafka/Gemfile.lock
@@ -12,16 +12,18 @@ GEM
     cool.io (1.5.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    fluent-plugin-kafka (0.7.2)
+    fluent-plugin-kafka (0.7.3)
       fluentd (>= 0.10.58, < 2)
       ltsv
       ruby-kafka (>= 0.4.1, < 1.0.0)
-    fluent-plugin-kubernetes_metadata_filter (1.0.2)
+    fluent-plugin-kubernetes_metadata_filter (1.1.0)
       fluentd (>= 0.12.0)
       kubeclient (~> 1.1.4)
       lru_redux
     fluent-plugin-record-reformer (0.9.1)
       fluentd
+    fluent-plugin-rewrite-tag-filter (1.6.0)
+      fluentd (>= 0.12.0, < 0.14.0)
     fluent-plugin-secure-forward (0.4.5)
       fluentd (>= 0.10.46)
       proxifier
@@ -70,13 +72,13 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    ruby-kafka (0.5.5)
+    ruby-kafka (0.6.7)
     sigdump (0.2.4)
     string-scrub (0.0.5)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.4)
+    tzinfo-data (1.2018.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -90,6 +92,7 @@ DEPENDENCIES
   fluent-plugin-kafka
   fluent-plugin-kubernetes_metadata_filter
   fluent-plugin-record-reformer
+  fluent-plugin-rewrite-tag-filter
   fluent-plugin-secure-forward
   fluentd (= 0.12.33)
   oj (= 3.5.1)

diff --git a/docker-image/v0.12/alpine-kafka/conf/fluent.conf b/docker-image/v0.12/alpine-kafka/conf/fluent.conf
@@ -28,4 +28,4 @@
   max_send_limit_bytes "#{ENV['FLUENT_KAFKA_MAX_SEND_LIMIT_BYTES'] || nil}"
   discard_kafka_delivery_failed "#{ENV['FLUENT_KAFKA_DISCARD_KAFKA_DELIVERY_FAILED'] || false}"
 </match>
-  
+
diff --git a/docker-image/v0.12/alpine-kafka/entrypoint.sh b/docker-image/v0.12/alpine-kafka/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/dumb-init /bin/sh
 
 set -e
 

diff --git a/docker-image/v0.12/alpine-logentries/Gemfile b/docker-image/v0.12/alpine-logentries/Gemfile
@@ -7,5 +7,6 @@ gem "fluentd", "0.12.33"
 gem "oj", "3.5.1"
 gem "fluent-plugin-secure-forward"
 gem "fluent-plugin-record-reformer"
+gem "fluent-plugin-rewrite-tag-filter"
 #gem "fluent-plugin-logentries"
 gem "fluent-plugin-kubernetes_metadata_filter"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,4 @@
		max_send_limit_bytes "#{ENV['FLUENT_KAFKA_MAX_SEND_LIMIT_BYTES'] \|\| nil}"
		discard_kafka_delivery_failed "#{ENV['FLUENT_KAFKA_DISCARD_KAFKA_DELIVERY_FAILED'] \|\| false}"
		</match>