diff --git a/README.md b/README.md index cd3788792..516814a42 100644 --- 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 index 05b7f7b0f..8beb7890d 100644 --- 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 index aa58f2ea8..f9e483986 100644 --- 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 index 64a4005e4..1852ba9d6 100755 --- 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 index 0efc55d53..62d5d109c 100644 --- 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 index f86c356e6..efb0a2779 100644 --- 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 index 64a4005e4..1852ba9d6 100755 --- 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 index 3d7a653cb..535c73d15 100644 --- 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 index f12a60863..736e2aeb3 100644 --- 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 index 64a4005e4..1852ba9d6 100755 --- 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 index cef7615bb..27624c983 100644 --- 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 index 2baedcc0f..b126093f3 100644 --- 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 index 64d1095f6..206e3cb37 100644 --- 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 + diff --git a/docker-image/v0.12/alpine-graylog/entrypoint.sh b/docker-image/v0.12/alpine-graylog/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- 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 index 5e4b7a385..5116cd466 100644 --- 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 index a014698ad..76e33a34a 100644 --- 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 index d50d4ccd1..7a1635beb 100644 --- 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}" - + diff --git a/docker-image/v0.12/alpine-kafka/entrypoint.sh b/docker-image/v0.12/alpine-kafka/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- 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 index 8a6eb83a4..98637ade4 100644 --- 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" diff --git a/docker-image/v0.12/alpine-logentries/Gemfile.lock b/docker-image/v0.12/alpine-logentries/Gemfile.lock index d1a60e22c..0072eeda3 100644 --- a/docker-image/v0.12/alpine-logentries/Gemfile.lock +++ b/docker-image/v0.12/alpine-logentries/Gemfile.lock @@ -12,12 +12,14 @@ GEM cool.io (1.5.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 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,7 +72,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 @@ -83,6 +85,7 @@ PLATFORMS DEPENDENCIES 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-logentries/entrypoint.sh b/docker-image/v0.12/alpine-logentries/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/alpine-logentries/entrypoint.sh +++ b/docker-image/v0.12/alpine-logentries/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/alpine-loggly/Gemfile b/docker-image/v0.12/alpine-loggly/Gemfile index 3a130a8ce..f0eebb096 100644 --- a/docker-image/v0.12/alpine-loggly/Gemfile +++ b/docker-image/v0.12/alpine-loggly/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-loggly" gem "fluent-plugin-kubernetes_metadata_filter" diff --git a/docker-image/v0.12/alpine-loggly/Gemfile.lock b/docker-image/v0.12/alpine-loggly/Gemfile.lock index fd2682b11..b576a2305 100644 --- a/docker-image/v0.12/alpine-loggly/Gemfile.lock +++ b/docker-image/v0.12/alpine-loggly/Gemfile.lock @@ -12,7 +12,7 @@ GEM cool.io (1.5.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 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 @@ -21,6 +21,8 @@ GEM yajl-ruby (~> 1.0) 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 @@ -74,7 +76,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 @@ -88,6 +90,7 @@ DEPENDENCIES fluent-plugin-kubernetes_metadata_filter fluent-plugin-loggly 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-loggly/entrypoint.sh b/docker-image/v0.12/alpine-loggly/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/alpine-loggly/entrypoint.sh +++ b/docker-image/v0.12/alpine-loggly/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/alpine-logzio/Gemfile b/docker-image/v0.12/alpine-logzio/Gemfile index 3e104e6d2..529c2a7ae 100644 --- a/docker-image/v0.12/alpine-logzio/Gemfile +++ b/docker-image/v0.12/alpine-logzio/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-logzio" gem "fluent-plugin-kubernetes_metadata_filter" diff --git a/docker-image/v0.12/alpine-logzio/Gemfile.lock b/docker-image/v0.12/alpine-logzio/Gemfile.lock index 04201e119..537173bd4 100644 --- a/docker-image/v0.12/alpine-logzio/Gemfile.lock +++ b/docker-image/v0.12/alpine-logzio/Gemfile.lock @@ -12,7 +12,7 @@ GEM cool.io (1.5.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 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 @@ -21,6 +21,8 @@ GEM net-http-persistent (~> 2.7) 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 @@ -74,7 +76,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 @@ -88,6 +90,7 @@ DEPENDENCIES fluent-plugin-kubernetes_metadata_filter fluent-plugin-logzio 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-logzio/entrypoint.sh b/docker-image/v0.12/alpine-logzio/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/alpine-logzio/entrypoint.sh +++ b/docker-image/v0.12/alpine-logzio/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/alpine-papertrail/Gemfile b/docker-image/v0.12/alpine-papertrail/Gemfile index b6b23ae42..6184c191a 100644 --- a/docker-image/v0.12/alpine-papertrail/Gemfile +++ b/docker-image/v0.12/alpine-papertrail/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-papertrail" gem "fluent-plugin-kubernetes_metadata_filter" diff --git a/docker-image/v0.12/alpine-papertrail/Gemfile.lock b/docker-image/v0.12/alpine-papertrail/Gemfile.lock index 8411051ec..49b0926ae 100644 --- a/docker-image/v0.12/alpine-papertrail/Gemfile.lock +++ b/docker-image/v0.12/alpine-papertrail/Gemfile.lock @@ -15,16 +15,18 @@ GEM fluent-mixin-config-placeholders (0.4.0) fluentd uuidtools (>= 2.1.5) - 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-papertrail (0.2.3) + fluent-plugin-papertrail (0.2.4) fluent-mixin-config-placeholders (~> 0.4.0) fluentd (>= 0.10, < 2) syslog_protocol 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 @@ -78,7 +80,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 @@ -93,6 +95,7 @@ DEPENDENCIES fluent-plugin-kubernetes_metadata_filter fluent-plugin-papertrail 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-papertrail/entrypoint.sh b/docker-image/v0.12/alpine-papertrail/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/alpine-papertrail/entrypoint.sh +++ b/docker-image/v0.12/alpine-papertrail/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/alpine-s3/Gemfile b/docker-image/v0.12/alpine-s3/Gemfile index c9b4c3d34..4509f0443 100644 --- a/docker-image/v0.12/alpine-s3/Gemfile +++ b/docker-image/v0.12/alpine-s3/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-s3", "~>0.8" gem "fluent-plugin-kubernetes_metadata_filter" diff --git a/docker-image/v0.12/alpine-s3/Gemfile.lock b/docker-image/v0.12/alpine-s3/Gemfile.lock index 989a5c432..a6980836e 100644 --- a/docker-image/v0.12/alpine-s3/Gemfile.lock +++ b/docker-image/v0.12/alpine-s3/Gemfile.lock @@ -8,24 +8,26 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - aws-sdk (2.11.40) - aws-sdk-resources (= 2.11.40) - aws-sdk-core (2.11.40) + aws-sdk (2.11.80) + aws-sdk-resources (= 2.11.80) + aws-sdk-core (2.11.80) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.40) - aws-sdk-core (= 2.11.40) - aws-sigv4 (1.0.2) + aws-sdk-resources (2.11.80) + aws-sdk-core (= 2.11.80) + aws-sigv4 (1.0.3) concurrent-ruby (1.0.5) cool.io (1.5.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 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-s3 (0.8.7) aws-sdk (>= 2.3.22, < 3) fluentd (>= 0.10.58, < 2) @@ -82,7 +84,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 @@ -95,6 +97,7 @@ PLATFORMS DEPENDENCIES fluent-plugin-kubernetes_metadata_filter fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-s3 (~> 0.8) fluent-plugin-secure-forward fluentd (= 0.12.33) diff --git a/docker-image/v0.12/alpine-s3/entrypoint.sh b/docker-image/v0.12/alpine-s3/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/alpine-s3/entrypoint.sh +++ b/docker-image/v0.12/alpine-s3/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/alpine-stackdriver/Gemfile b/docker-image/v0.12/alpine-stackdriver/Gemfile index 5bceceb8e..e7ec6adac 100644 --- a/docker-image/v0.12/alpine-stackdriver/Gemfile +++ b/docker-image/v0.12/alpine-stackdriver/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-google-cloud" gem "fluent-plugin-kubernetes_metadata_filter" diff --git a/docker-image/v0.12/alpine-stackdriver/Gemfile.lock b/docker-image/v0.12/alpine-stackdriver/Gemfile.lock index ec10182bf..de070ba7b 100644 --- a/docker-image/v0.12/alpine-stackdriver/Gemfile.lock +++ b/docker-image/v0.12/alpine-stackdriver/Gemfile.lock @@ -14,9 +14,9 @@ GEM declarative-option (0.1.0) 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-google-cloud (0.6.18) + fluent-plugin-google-cloud (0.6.21) fluentd (~> 0.10) google-api-client (~> 0.17) google-cloud-logging (~> 1.3, >= 1.3.2) @@ -24,12 +24,14 @@ GEM googleauth (~> 0.6) grpc (~> 1.0) json (~> 1.8) - 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 @@ -44,28 +46,28 @@ GEM tzinfo (>= 1.0.0) tzinfo-data (>= 1.0.0) yajl-ruby (~> 1.0) - google-api-client (0.20.1) + google-api-client (0.23.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-cloud-core (1.2.0) + google-cloud-core (1.2.1) google-cloud-env (~> 1.0) - google-cloud-env (1.0.1) + google-cloud-env (1.0.2) faraday (~> 0.11) google-cloud-logging (1.5.0) google-cloud-core (~> 1.2) google-gax (~> 1.0) stackdriver-core (~> 1.3) - google-gax (1.2.0) + google-gax (1.3.0) google-protobuf (~> 3.2) googleapis-common-protos (>= 1.3.5, < 2.0) googleauth (~> 0.6.2) grpc (>= 1.7.2, < 2.0) rly (~> 0.2.3) - google-protobuf (3.5.1.2) + google-protobuf (3.6.0) googleapis-common-protos (1.3.7) google-protobuf (~> 3.0) googleapis-common-protos-types (~> 1.0) @@ -80,7 +82,7 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.11.0) + grpc (1.12.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) @@ -131,7 +133,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retriable (3.1.1) + retriable (3.1.2) rly (0.2.3) sigdump (0.2.4) signet (0.8.1) @@ -145,7 +147,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.1.0) unf (0.1.4) @@ -160,6 +162,7 @@ DEPENDENCIES fluent-plugin-google-cloud 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-stackdriver/entrypoint.sh b/docker-image/v0.12/alpine-stackdriver/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/alpine-stackdriver/entrypoint.sh +++ b/docker-image/v0.12/alpine-stackdriver/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/alpine-syslog/Gemfile b/docker-image/v0.12/alpine-syslog/Gemfile index e4e6ef445..44506acd3 100644 --- a/docker-image/v0.12/alpine-syslog/Gemfile +++ b/docker-image/v0.12/alpine-syslog/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-kubernetes_remote_syslog" gem "fluent-plugin-kubernetes_metadata_filter" diff --git a/docker-image/v0.12/alpine-syslog/Gemfile.lock b/docker-image/v0.12/alpine-syslog/Gemfile.lock index fb94b06eb..a7d99064f 100644 --- a/docker-image/v0.12/alpine-syslog/Gemfile.lock +++ b/docker-image/v0.12/alpine-syslog/Gemfile.lock @@ -32,6 +32,8 @@ GEM remote_syslog_sender (~> 1.2.1) 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 @@ -103,6 +105,7 @@ DEPENDENCIES fluent-plugin-kubernetes_metadata_filter fluent-plugin-kubernetes_remote_syslog 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-syslog/entrypoint.sh b/docker-image/v0.12/alpine-syslog/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/alpine-syslog/entrypoint.sh +++ b/docker-image/v0.12/alpine-syslog/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-cloudwatch/Gemfile b/docker-image/v0.12/debian-cloudwatch/Gemfile index 9d690a7dc..2408b3fb4 100644 --- a/docker-image/v0.12/debian-cloudwatch/Gemfile +++ b/docker-image/v0.12/debian-cloudwatch/Gemfile @@ -7,8 +7,9 @@ gem "fluentd", "0.12.33" gem "oj", "3.5.1" gem "fluent-plugin-secure-forward" gem "fluent-plugin-record-reformer" -gem "aws-sdk-core", "2.10.50" -gem "fluent-plugin-cloudwatch-logs", "0.4.0" +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" gem "ffi" gem "fluent-plugin-systemd" diff --git a/docker-image/v0.12/debian-cloudwatch/Gemfile.lock b/docker-image/v0.12/debian-cloudwatch/Gemfile.lock index d3934b619..6d16a6c75 100644 --- a/docker-image/v0.12/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v0.12/debian-cloudwatch/Gemfile.lock @@ -8,10 +8,17 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - aws-sdk-core (2.10.50) + 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.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) @@ -20,16 +27,18 @@ GEM fluent-mixin-config-placeholders (0.4.0) fluentd uuidtools (>= 2.1.5) - fluent-plugin-cloudwatch-logs (0.4.0) - aws-sdk-core (>= 2.0.7) + fluent-plugin-cloudwatch-logs (0.4.5) + 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 @@ -88,7 +97,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 @@ -100,15 +109,16 @@ PLATFORMS ruby DEPENDENCIES - aws-sdk-core (= 2.10.50) + aws-sdk-cloudwatchlogs (~> 1.0) ffi - fluent-plugin-cloudwatch-logs (= 0.4.0) + 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 fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-cloudwatch/entrypoint.sh b/docker-image/v0.12/debian-cloudwatch/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-cloudwatch/entrypoint.sh +++ b/docker-image/v0.12/debian-cloudwatch/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-elasticsearch/Gemfile b/docker-image/v0.12/debian-elasticsearch/Gemfile index 8afba768d..add1b9e05 100644 --- a/docker-image/v0.12/debian-elasticsearch/Gemfile +++ b/docker-image/v0.12/debian-elasticsearch/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 "fluent-plugin-elasticsearch" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-elasticsearch/Gemfile.lock b/docker-image/v0.12/debian-elasticsearch/Gemfile.lock index 0752827bf..9f0f4e04e 100644 --- a/docker-image/v0.12/debian-elasticsearch/Gemfile.lock +++ b/docker-image/v0.12/debian-elasticsearch/Gemfile.lock @@ -12,28 +12,30 @@ 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) ffi (1.9.25) + 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 @@ -108,10 +110,11 @@ DEPENDENCIES fluent-plugin-elasticsearch fluent-plugin-kubernetes_metadata_filter fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-elasticsearch/entrypoint.sh b/docker-image/v0.12/debian-elasticsearch/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-elasticsearch/entrypoint.sh +++ b/docker-image/v0.12/debian-elasticsearch/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-gcs/Gemfile b/docker-image/v0.12/debian-gcs/Gemfile index 9581b1aa0..9d7712e39 100644 --- a/docker-image/v0.12/debian-gcs/Gemfile +++ b/docker-image/v0.12/debian-gcs/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 "fluent-plugin-gcs", "~>0.3" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-gcs/Gemfile.lock b/docker-image/v0.12/debian-gcs/Gemfile.lock index 774bcf151..7f659dfbb 100644 --- a/docker-image/v0.12/debian-gcs/Gemfile.lock +++ b/docker-image/v0.12/debian-gcs/Gemfile.lock @@ -13,18 +13,20 @@ 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) ffi (1.9.25) 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 @@ -139,10 +141,11 @@ DEPENDENCIES fluent-plugin-gcs (~> 0.3) fluent-plugin-kubernetes_metadata_filter fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-gcs/entrypoint.sh b/docker-image/v0.12/debian-gcs/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-gcs/entrypoint.sh +++ b/docker-image/v0.12/debian-gcs/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-graylog/Gemfile b/docker-image/v0.12/debian-graylog/Gemfile index 2850ebc9a..f605838b2 100644 --- a/docker-image/v0.12/debian-graylog/Gemfile +++ b/docker-image/v0.12/debian-graylog/Gemfile @@ -7,7 +7,8 @@ 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" gem "ffi" diff --git a/docker-image/v0.12/debian-graylog/Gemfile.lock b/docker-image/v0.12/debian-graylog/Gemfile.lock index 15dba78a6..cd59831db 100644 --- a/docker-image/v0.12/debian-graylog/Gemfile.lock +++ b/docker-image/v0.12/debian-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,16 +12,18 @@ 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) ffi (1.9.25) + 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 @@ -46,6 +41,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) @@ -101,11 +98,12 @@ DEPENDENCIES fluent-plugin-gelf-hs fluent-plugin-kubernetes_metadata_filter fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) - gelf! + gelf oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-graylog/conf/fluent.conf b/docker-image/v0.12/debian-graylog/conf/fluent.conf index f56bc2868..255eed63b 100644 --- a/docker-image/v0.12/debian-graylog/conf/fluent.conf +++ b/docker-image/v0.12/debian-graylog/conf/fluent.conf @@ -18,3 +18,4 @@ max_retry_wait 30 disable_retry_limit num_threads 8 + diff --git a/docker-image/v0.12/debian-graylog/entrypoint.sh b/docker-image/v0.12/debian-graylog/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-graylog/entrypoint.sh +++ b/docker-image/v0.12/debian-graylog/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-kafka/Gemfile b/docker-image/v0.12/debian-kafka/Gemfile index 388bc61dd..8617da534 100644 --- a/docker-image/v0.12/debian-kafka/Gemfile +++ b/docker-image/v0.12/debian-kafka/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 "fluent-plugin-kafka" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-kafka/Gemfile.lock b/docker-image/v0.12/debian-kafka/Gemfile.lock index c200c8f67..5f26fdc91 100644 --- a/docker-image/v0.12/debian-kafka/Gemfile.lock +++ b/docker-image/v0.12/debian-kafka/Gemfile.lock @@ -12,17 +12,19 @@ GEM cool.io (1.5.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - fluent-plugin-kafka (0.7.2) ffi (1.9.25) + 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 @@ -74,15 +76,15 @@ 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) - systemd-journal (1.3.1) + systemd-journal (1.3.2) ffi (~> 1.9) 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 @@ -97,10 +99,11 @@ DEPENDENCIES fluent-plugin-kafka fluent-plugin-kubernetes_metadata_filter fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-kafka/conf/fluent.conf b/docker-image/v0.12/debian-kafka/conf/fluent.conf index c47b3fc8e..c6558a594 100644 --- a/docker-image/v0.12/debian-kafka/conf/fluent.conf +++ b/docker-image/v0.12/debian-kafka/conf/fluent.conf @@ -29,4 +29,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}" - + diff --git a/docker-image/v0.12/debian-kafka/entrypoint.sh b/docker-image/v0.12/debian-kafka/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-kafka/entrypoint.sh +++ b/docker-image/v0.12/debian-kafka/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-logentries/Gemfile b/docker-image/v0.12/debian-logentries/Gemfile index a851605f9..a35044383 100644 --- a/docker-image/v0.12/debian-logentries/Gemfile +++ b/docker-image/v0.12/debian-logentries/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 "fluent-plugin-logentries" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-logentries/Gemfile.lock b/docker-image/v0.12/debian-logentries/Gemfile.lock index 50e81f12e..fba7901e6 100644 --- a/docker-image/v0.12/debian-logentries/Gemfile.lock +++ b/docker-image/v0.12/debian-logentries/Gemfile.lock @@ -12,13 +12,15 @@ GEM cool.io (1.5.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - fluent-plugin-kubernetes_metadata_filter (1.0.2) ffi (1.9.25) + 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 @@ -76,7 +78,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 @@ -90,10 +92,11 @@ DEPENDENCIES ffi fluent-plugin-kubernetes_metadata_filter fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-logentries/entrypoint.sh b/docker-image/v0.12/debian-logentries/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-logentries/entrypoint.sh +++ b/docker-image/v0.12/debian-logentries/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-loggly/Gemfile b/docker-image/v0.12/debian-loggly/Gemfile index c83071359..4fe4e0a1e 100644 --- a/docker-image/v0.12/debian-loggly/Gemfile +++ b/docker-image/v0.12/debian-loggly/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 "fluent-plugin-loggly" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-loggly/Gemfile.lock b/docker-image/v0.12/debian-loggly/Gemfile.lock index ac620cc37..1fcd30e1d 100644 --- a/docker-image/v0.12/debian-loggly/Gemfile.lock +++ b/docker-image/v0.12/debian-loggly/Gemfile.lock @@ -12,8 +12,8 @@ GEM cool.io (1.5.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - fluent-plugin-kubernetes_metadata_filter (1.0.2) ffi (1.9.25) + fluent-plugin-kubernetes_metadata_filter (1.1.0) fluentd (>= 0.12.0) kubeclient (~> 1.1.4) lru_redux @@ -22,6 +22,8 @@ GEM yajl-ruby (~> 1.0) 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 @@ -80,7 +82,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 @@ -95,10 +97,11 @@ DEPENDENCIES fluent-plugin-kubernetes_metadata_filter fluent-plugin-loggly fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-loggly/entrypoint.sh b/docker-image/v0.12/debian-loggly/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-loggly/entrypoint.sh +++ b/docker-image/v0.12/debian-loggly/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-logzio/Gemfile b/docker-image/v0.12/debian-logzio/Gemfile index ba54c58d5..b0298458b 100644 --- a/docker-image/v0.12/debian-logzio/Gemfile +++ b/docker-image/v0.12/debian-logzio/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 "fluent-plugin-logzio" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-logzio/Gemfile.lock b/docker-image/v0.12/debian-logzio/Gemfile.lock index e8eb0902a..1ca1332b4 100644 --- a/docker-image/v0.12/debian-logzio/Gemfile.lock +++ b/docker-image/v0.12/debian-logzio/Gemfile.lock @@ -12,8 +12,8 @@ GEM cool.io (1.5.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - fluent-plugin-kubernetes_metadata_filter (1.0.2) ffi (1.9.25) + fluent-plugin-kubernetes_metadata_filter (1.1.0) fluentd (>= 0.12.0) kubeclient (~> 1.1.4) lru_redux @@ -22,6 +22,8 @@ GEM net-http-persistent (~> 2.7) 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 @@ -80,7 +82,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 @@ -95,10 +97,11 @@ DEPENDENCIES fluent-plugin-kubernetes_metadata_filter fluent-plugin-logzio fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-logzio/entrypoint.sh b/docker-image/v0.12/debian-logzio/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-logzio/entrypoint.sh +++ b/docker-image/v0.12/debian-logzio/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-papertrail/Gemfile b/docker-image/v0.12/debian-papertrail/Gemfile index 6b3759066..3c051852f 100644 --- a/docker-image/v0.12/debian-papertrail/Gemfile +++ b/docker-image/v0.12/debian-papertrail/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 "fluent-plugin-papertrail" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-papertrail/Gemfile.lock b/docker-image/v0.12/debian-papertrail/Gemfile.lock index 58080c8cf..fc074cc12 100644 --- a/docker-image/v0.12/debian-papertrail/Gemfile.lock +++ b/docker-image/v0.12/debian-papertrail/Gemfile.lock @@ -16,16 +16,18 @@ GEM fluent-mixin-config-placeholders (0.4.0) fluentd uuidtools (>= 2.1.5) - 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-papertrail (0.2.3) + fluent-plugin-papertrail (0.2.4) fluent-mixin-config-placeholders (~> 0.4.0) fluentd (>= 0.10, < 2) syslog_protocol 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 @@ -100,10 +102,11 @@ DEPENDENCIES fluent-plugin-kubernetes_metadata_filter fluent-plugin-papertrail fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-papertrail/entrypoint.sh b/docker-image/v0.12/debian-papertrail/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-papertrail/entrypoint.sh +++ b/docker-image/v0.12/debian-papertrail/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-s3/Gemfile b/docker-image/v0.12/debian-s3/Gemfile index ea10b02da..ce9bb4c0a 100644 --- a/docker-image/v0.12/debian-s3/Gemfile +++ b/docker-image/v0.12/debian-s3/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 "fluent-plugin-s3", "~>0.8" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-s3/Gemfile.lock b/docker-image/v0.12/debian-s3/Gemfile.lock index 8492d8539..4045f9584 100644 --- a/docker-image/v0.12/debian-s3/Gemfile.lock +++ b/docker-image/v0.12/debian-s3/Gemfile.lock @@ -8,25 +8,27 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - aws-sdk (2.11.40) - aws-sdk-resources (= 2.11.40) - aws-sdk-core (2.11.40) + aws-sdk (2.11.80) + aws-sdk-resources (= 2.11.80) + aws-sdk-core (2.11.80) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.40) - aws-sdk-core (= 2.11.40) - aws-sigv4 (1.0.2) + aws-sdk-resources (2.11.80) + aws-sdk-core (= 2.11.80) + aws-sigv4 (1.0.3) concurrent-ruby (1.0.5) cool.io (1.5.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - fluent-plugin-kubernetes_metadata_filter (1.0.2) ffi (1.9.25) + 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-s3 (0.8.7) aws-sdk (>= 2.3.22, < 3) fluentd (>= 0.10.58, < 2) @@ -88,7 +90,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 @@ -102,6 +104,7 @@ DEPENDENCIES ffi fluent-plugin-kubernetes_metadata_filter fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-s3 (~> 0.8) fluent-plugin-secure-forward fluent-plugin-systemd @@ -109,4 +112,4 @@ DEPENDENCIES oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-s3/entrypoint.sh b/docker-image/v0.12/debian-s3/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-s3/entrypoint.sh +++ b/docker-image/v0.12/debian-s3/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-stackdriver/Gemfile b/docker-image/v0.12/debian-stackdriver/Gemfile index 7ee11b8b4..79012bce5 100644 --- a/docker-image/v0.12/debian-stackdriver/Gemfile +++ b/docker-image/v0.12/debian-stackdriver/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 "fluent-plugin-google-cloud" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-stackdriver/Gemfile.lock b/docker-image/v0.12/debian-stackdriver/Gemfile.lock index f436cb74e..4bef5df76 100644 --- a/docker-image/v0.12/debian-stackdriver/Gemfile.lock +++ b/docker-image/v0.12/debian-stackdriver/Gemfile.lock @@ -14,10 +14,10 @@ GEM declarative-option (0.1.0) 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-google-cloud (0.6.18) ffi (1.9.25) + fluent-plugin-google-cloud (0.6.21) fluentd (~> 0.10) google-api-client (~> 0.17) google-cloud-logging (~> 1.3, >= 1.3.2) @@ -25,12 +25,14 @@ GEM googleauth (~> 0.6) grpc (~> 1.0) json (~> 1.8) - 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 @@ -48,28 +50,28 @@ GEM tzinfo (>= 1.0.0) tzinfo-data (>= 1.0.0) yajl-ruby (~> 1.0) - google-api-client (0.20.1) + google-api-client (0.23.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-cloud-core (1.2.0) + google-cloud-core (1.2.1) google-cloud-env (~> 1.0) - google-cloud-env (1.0.1) + google-cloud-env (1.0.2) faraday (~> 0.11) google-cloud-logging (1.5.0) google-cloud-core (~> 1.2) google-gax (~> 1.0) stackdriver-core (~> 1.3) - google-gax (1.2.0) + google-gax (1.3.0) google-protobuf (~> 3.2) googleapis-common-protos (>= 1.3.5, < 2.0) googleauth (~> 0.6.2) grpc (>= 1.7.2, < 2.0) rly (~> 0.2.3) - google-protobuf (3.5.1.2) + google-protobuf (3.6.0) googleapis-common-protos (1.3.7) google-protobuf (~> 3.0) googleapis-common-protos-types (~> 1.0) @@ -84,7 +86,7 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.11.0) + grpc (1.12.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) @@ -135,7 +137,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retriable (3.1.1) + retriable (3.1.2) rly (0.2.3) sigdump (0.2.4) signet (0.8.1) @@ -151,7 +153,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.1.0) unf (0.1.4) @@ -167,10 +169,11 @@ DEPENDENCIES fluent-plugin-google-cloud fluent-plugin-kubernetes_metadata_filter fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-stackdriver/entrypoint.sh b/docker-image/v0.12/debian-stackdriver/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-stackdriver/entrypoint.sh +++ b/docker-image/v0.12/debian-stackdriver/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v0.12/debian-syslog/Gemfile b/docker-image/v0.12/debian-syslog/Gemfile index b7774b680..323109c81 100644 --- a/docker-image/v0.12/debian-syslog/Gemfile +++ b/docker-image/v0.12/debian-syslog/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 "fluent-plugin-kubernetes_remote_syslog" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v0.12/debian-syslog/Gemfile.lock b/docker-image/v0.12/debian-syslog/Gemfile.lock index 401b03aed..0a3ceb7d0 100644 --- a/docker-image/v0.12/debian-syslog/Gemfile.lock +++ b/docker-image/v0.12/debian-syslog/Gemfile.lock @@ -33,6 +33,8 @@ GEM remote_syslog_sender (~> 1.2.1) 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 @@ -110,10 +112,11 @@ DEPENDENCIES fluent-plugin-kubernetes_metadata_filter fluent-plugin-kubernetes_remote_syslog fluent-plugin-record-reformer + fluent-plugin-rewrite-tag-filter fluent-plugin-secure-forward fluent-plugin-systemd fluentd (= 0.12.33) oj (= 3.5.1) BUNDLED WITH - 1.16.2 + 1.16.1 diff --git a/docker-image/v0.12/debian-syslog/entrypoint.sh b/docker-image/v0.12/debian-syslog/entrypoint.sh index 64a4005e4..1852ba9d6 100755 --- a/docker-image/v0.12/debian-syslog/entrypoint.sh +++ b/docker-image/v0.12/debian-syslog/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/dumb-init /bin/sh set -e diff --git a/docker-image/v1.2/debian-cloudwatch/Gemfile b/docker-image/v1.2/debian-cloudwatch/Gemfile index b32464380..36dd6dc8f 100644 --- a/docker-image/v1.2/debian-cloudwatch/Gemfile +++ b/docker-image/v1.2/debian-cloudwatch/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "aws-sdk-cloudwatchlogs", "~> 1.0" gem "fluent-plugin-cloudwatch-logs", ">=0.5" gem "fluent-plugin-kubernetes_metadata_filter" diff --git a/docker-image/v1.2/debian-cloudwatch/Gemfile.lock b/docker-image/v1.2/debian-cloudwatch/Gemfile.lock index b3c727245..55242f04e 100644 --- a/docker-image/v1.2/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.2/debian-cloudwatch/Gemfile.lock @@ -8,23 +8,25 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - aws-eventstream (1.0.0) - aws-partitions (1.91.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.21.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) dig_rb (1.0.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-plugin-cloudwatch-logs (0.5.0) aws-sdk-cloudwatchlogs (~> 1.0) fluentd (>= 0.14.15) @@ -32,6 +34,9 @@ GEM fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) lru_redux + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -101,6 +106,7 @@ DEPENDENCIES ffi fluent-plugin-cloudwatch-logs (>= 0.5) fluent-plugin-kubernetes_metadata_filter + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/docker-image/v1.2/debian-elasticsearch/Gemfile b/docker-image/v1.2/debian-elasticsearch/Gemfile index 7e00c00c0..815036fa8 100644 --- a/docker-image/v1.2/debian-elasticsearch/Gemfile +++ b/docker-image/v1.2/debian-elasticsearch/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "fluent-plugin-elasticsearch" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v1.2/debian-elasticsearch/Gemfile.lock b/docker-image/v1.2/debian-elasticsearch/Gemfile.lock index 3d3f024aa..77d52fdd2 100644 --- a/docker-image/v1.2/debian-elasticsearch/Gemfile.lock +++ b/docker-image/v1.2/debian-elasticsearch/Gemfile.lock @@ -13,19 +13,21 @@ GEM dig_rb (1.0.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - elasticsearch (6.0.3) - elasticsearch-api (= 6.0.3) - elasticsearch-transport (= 6.0.3) - elasticsearch-api (6.0.3) + 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.3) + elasticsearch-transport (6.1.0) faraday multi_json excon (0.62.0) faraday (0.15.2) multipart-post (>= 1.2, < 3) ffi (1.9.25) - fluent-plugin-elasticsearch (2.10.3) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) + fluent-plugin-elasticsearch (2.11.1) elasticsearch excon fluentd (>= 0.14.20) @@ -33,6 +35,9 @@ GEM fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) lru_redux + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -102,6 +107,7 @@ DEPENDENCIES ffi fluent-plugin-elasticsearch fluent-plugin-kubernetes_metadata_filter + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/docker-image/v1.2/debian-gcs/Gemfile b/docker-image/v1.2/debian-gcs/Gemfile index 50c6ab9c2..86a881213 100644 --- a/docker-image/v1.2/debian-gcs/Gemfile +++ b/docker-image/v1.2/debian-gcs/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "fluent-plugin-gcs", "0.4.0.beta1" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v1.2/debian-gcs/Gemfile.lock b/docker-image/v1.2/debian-gcs/Gemfile.lock index 3cb273b63..a71c7e990 100644 --- a/docker-image/v1.2/debian-gcs/Gemfile.lock +++ b/docker-image/v1.2/debian-gcs/Gemfile.lock @@ -19,6 +19,8 @@ GEM faraday (0.15.2) multipart-post (>= 1.2, < 3) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-plugin-gcs (0.4.0.beta1) fluentd (>= 0.14.0, < 2) google-cloud-storage (~> 1.1.0) @@ -26,6 +28,9 @@ GEM fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) lru_redux + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -47,9 +52,9 @@ GEM mime-types (>= 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-cloud-core (1.2.0) + google-cloud-core (1.2.1) google-cloud-env (~> 1.0) - google-cloud-env (1.0.1) + google-cloud-env (1.0.2) faraday (~> 0.11) google-cloud-storage (1.1.0) digest-crc (~> 0.4) @@ -137,6 +142,7 @@ DEPENDENCIES ffi fluent-plugin-gcs (= 0.4.0.beta1) fluent-plugin-kubernetes_metadata_filter + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/docker-image/v1.2/debian-graylog/Gemfile b/docker-image/v1.2/debian-graylog/Gemfile index 23a7d62e3..06e664ff3 100644 --- a/docker-image/v1.2/debian-graylog/Gemfile +++ b/docker-image/v1.2/debian-graylog/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "gelf" gem "fluent-plugin-gelf-hs" gem "fluent-plugin-kubernetes_metadata_filter" diff --git a/docker-image/v1.2/debian-graylog/Gemfile.lock b/docker-image/v1.2/debian-graylog/Gemfile.lock index 7b2936c53..9e35fa0cd 100644 --- a/docker-image/v1.2/debian-graylog/Gemfile.lock +++ b/docker-image/v1.2/debian-graylog/Gemfile.lock @@ -14,6 +14,8 @@ GEM domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-plugin-gelf-hs (1.0.7) fluentd gelf (>= 2.0.0) @@ -21,6 +23,9 @@ GEM fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) lru_redux + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -91,6 +96,7 @@ DEPENDENCIES ffi fluent-plugin-gelf-hs fluent-plugin-kubernetes_metadata_filter + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) gelf diff --git a/docker-image/v1.2/debian-kafka/Gemfile b/docker-image/v1.2/debian-kafka/Gemfile index 222aeda8f..8fa7fc275 100644 --- a/docker-image/v1.2/debian-kafka/Gemfile +++ b/docker-image/v1.2/debian-kafka/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "fluent-plugin-kafka" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v1.2/debian-kafka/Gemfile.lock b/docker-image/v1.2/debian-kafka/Gemfile.lock index 9e2f55034..8c5e36c54 100644 --- a/docker-image/v1.2/debian-kafka/Gemfile.lock +++ b/docker-image/v1.2/debian-kafka/Gemfile.lock @@ -14,6 +14,8 @@ GEM domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-plugin-kafka (0.7.3) fluentd (>= 0.10.58, < 2) ltsv @@ -22,6 +24,9 @@ GEM fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) lru_redux + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -91,6 +96,7 @@ DEPENDENCIES ffi fluent-plugin-kafka fluent-plugin-kubernetes_metadata_filter + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/docker-image/v1.2/debian-logentries/Gemfile b/docker-image/v1.2/debian-logentries/Gemfile index 743b2723a..2bedecb64 100644 --- a/docker-image/v1.2/debian-logentries/Gemfile +++ b/docker-image/v1.2/debian-logentries/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" #gem "fluent-plugin-logentries" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v1.2/debian-logentries/Gemfile.lock b/docker-image/v1.2/debian-logentries/Gemfile.lock index c694363ec..4ed548e56 100644 --- a/docker-image/v1.2/debian-logentries/Gemfile.lock +++ b/docker-image/v1.2/debian-logentries/Gemfile.lock @@ -14,10 +14,15 @@ GEM domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-plugin-kubernetes_metadata_filter (2.1.2) fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) lru_redux + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -84,6 +89,7 @@ PLATFORMS DEPENDENCIES ffi fluent-plugin-kubernetes_metadata_filter + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/docker-image/v1.2/debian-loggly/Gemfile b/docker-image/v1.2/debian-loggly/Gemfile index 32cee1e5c..c9438ac41 100644 --- a/docker-image/v1.2/debian-loggly/Gemfile +++ b/docker-image/v1.2/debian-loggly/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "fluent-plugin-loggly" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v1.2/debian-loggly/Gemfile.lock b/docker-image/v1.2/debian-loggly/Gemfile.lock index 2c6897bda..d3cdb51fc 100644 --- a/docker-image/v1.2/debian-loggly/Gemfile.lock +++ b/docker-image/v1.2/debian-loggly/Gemfile.lock @@ -14,6 +14,8 @@ GEM domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-plugin-kubernetes_metadata_filter (2.1.2) fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) @@ -21,6 +23,9 @@ GEM fluent-plugin-loggly (0.0.9) net-http-persistent (~> 2.7) yajl-ruby (~> 1.0) + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -89,6 +94,7 @@ DEPENDENCIES ffi fluent-plugin-kubernetes_metadata_filter fluent-plugin-loggly + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/docker-image/v1.2/debian-logzio/Gemfile b/docker-image/v1.2/debian-logzio/Gemfile index 9db246737..ef9cf642a 100644 --- a/docker-image/v1.2/debian-logzio/Gemfile +++ b/docker-image/v1.2/debian-logzio/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "fluent-plugin-logzio" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v1.2/debian-logzio/Gemfile.lock b/docker-image/v1.2/debian-logzio/Gemfile.lock index f4fa9de2e..a30675a25 100644 --- a/docker-image/v1.2/debian-logzio/Gemfile.lock +++ b/docker-image/v1.2/debian-logzio/Gemfile.lock @@ -14,13 +14,18 @@ GEM domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-plugin-kubernetes_metadata_filter (2.1.2) fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) lru_redux - fluent-plugin-logzio (0.0.16) + fluent-plugin-logzio (0.0.17) fluentd (>= 0.14.0, < 2) net-http-persistent (~> 2.9) + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -89,6 +94,7 @@ DEPENDENCIES ffi fluent-plugin-kubernetes_metadata_filter fluent-plugin-logzio + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/docker-image/v1.2/debian-papertrail/Gemfile b/docker-image/v1.2/debian-papertrail/Gemfile index af9603738..8426d6710 100644 --- a/docker-image/v1.2/debian-papertrail/Gemfile +++ b/docker-image/v1.2/debian-papertrail/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "fluent-plugin-papertrail" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v1.2/debian-papertrail/Gemfile.lock b/docker-image/v1.2/debian-papertrail/Gemfile.lock index 99d1b9109..f0d016513 100644 --- a/docker-image/v1.2/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.2/debian-papertrail/Gemfile.lock @@ -14,6 +14,8 @@ GEM domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-mixin-config-placeholders (0.4.0) fluentd uuidtools (>= 2.1.5) @@ -25,6 +27,9 @@ GEM fluent-mixin-config-placeholders (~> 0.4.0) fluentd (>= 0.10, < 2) syslog_protocol + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -94,6 +99,7 @@ DEPENDENCIES ffi fluent-plugin-kubernetes_metadata_filter fluent-plugin-papertrail + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/docker-image/v1.2/debian-s3/Gemfile b/docker-image/v1.2/debian-s3/Gemfile index 2549836e2..35f7a2ae2 100644 --- a/docker-image/v1.2/debian-s3/Gemfile +++ b/docker-image/v1.2/debian-s3/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "aws-sdk-s3", "~> 1.0" gem "fluent-plugin-s3", "~>1.0" gem "fluent-plugin-kubernetes_metadata_filter" diff --git a/docker-image/v1.2/debian-s3/Gemfile.lock b/docker-image/v1.2/debian-s3/Gemfile.lock index 8ae017673..00f5cae0a 100644 --- a/docker-image/v1.2/debian-s3/Gemfile.lock +++ b/docker-image/v1.2/debian-s3/Gemfile.lock @@ -8,34 +8,39 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - aws-eventstream (1.0.0) - aws-partitions (1.91.0) - aws-sdk-core (3.21.2) + aws-eventstream (1.0.1) + aws-partitions (1.94.0) + aws-sdk-core (3.22.1) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-kms (1.5.0) + aws-sdk-kms (1.6.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.13.0) + aws-sdk-s3 (1.16.0) aws-sdk-core (~> 3, >= 3.21.2) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) - aws-sdk-sqs (1.3.0) + aws-sdk-sqs (1.4.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sigv4 (1.0.2) + aws-sigv4 (1.0.3) concurrent-ruby (1.0.5) cool.io (1.5.3) dig_rb (1.0.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-plugin-kubernetes_metadata_filter (2.1.2) fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) lru_redux + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-s3 (1.1.3) aws-sdk-s3 (~> 1.0) aws-sdk-sqs (~> 1.0) @@ -108,6 +113,7 @@ DEPENDENCIES aws-sdk-s3 (~> 1.0) ffi fluent-plugin-kubernetes_metadata_filter + fluent-plugin-rewrite-tag-filter fluent-plugin-s3 (~> 1.0) fluent-plugin-systemd fluentd (= 1.2.2) diff --git a/docker-image/v1.2/debian-stackdriver/Gemfile b/docker-image/v1.2/debian-stackdriver/Gemfile index 8c9ecf682..fec426ff4 100644 --- a/docker-image/v1.2/debian-stackdriver/Gemfile +++ b/docker-image/v1.2/debian-stackdriver/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "fluent-plugin-google-cloud" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v1.2/debian-stackdriver/Gemfile.lock b/docker-image/v1.2/debian-stackdriver/Gemfile.lock index 8b51c53b0..5ab0d67a4 100644 --- a/docker-image/v1.2/debian-stackdriver/Gemfile.lock +++ b/docker-image/v1.2/debian-stackdriver/Gemfile.lock @@ -21,6 +21,8 @@ GEM faraday (0.15.2) multipart-post (>= 1.2, < 3) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-plugin-google-cloud (0.4.10) fluentd (>= 0.10) google-api-client (~> 0.8.6) @@ -30,6 +32,9 @@ GEM fluentd (>= 0.14.0, < 2) kubeclient (~> 1.1.4) lru_redux + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -134,6 +139,7 @@ DEPENDENCIES ffi fluent-plugin-google-cloud fluent-plugin-kubernetes_metadata_filter + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/docker-image/v1.2/debian-syslog/Gemfile b/docker-image/v1.2/debian-syslog/Gemfile index badd030f8..e8d051b11 100644 --- a/docker-image/v1.2/debian-syslog/Gemfile +++ b/docker-image/v1.2/debian-syslog/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "fluentd", "1.2.2" gem "oj", "3.5.1" +gem "fluent-plugin-rewrite-tag-filter" gem "fluent-plugin-kubernetes_remote_syslog" gem "fluent-plugin-kubernetes_metadata_filter" gem "ffi" diff --git a/docker-image/v1.2/debian-syslog/Gemfile.lock b/docker-image/v1.2/debian-syslog/Gemfile.lock index 4ce253ffe..0b954890c 100644 --- a/docker-image/v1.2/debian-syslog/Gemfile.lock +++ b/docker-image/v1.2/debian-syslog/Gemfile.lock @@ -14,6 +14,8 @@ GEM domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) ffi (1.9.25) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) fluent-mixin-config-placeholders (0.4.0) fluentd uuidtools (>= 2.1.5) @@ -32,6 +34,9 @@ GEM fluent-mixin-rewrite-tag-name fluentd remote_syslog_sender (~> 1.2.1) + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) fluent-plugin-systemd (1.0.1) fluentd (>= 0.14.11, < 2) systemd-journal (~> 1.3.2) @@ -104,6 +109,7 @@ DEPENDENCIES ffi fluent-plugin-kubernetes_metadata_filter fluent-plugin-kubernetes_remote_syslog + fluent-plugin-rewrite-tag-filter fluent-plugin-systemd fluentd (= 1.2.2) oj (= 3.5.1) diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb index fff1f925e..2865c2042 100644 --- a/templates/Gemfile.erb +++ b/templates/Gemfile.erb @@ -12,6 +12,9 @@ gem "oj", "3.5.1" <% if !is_v1 %> gem "fluent-plugin-secure-forward" gem "fluent-plugin-record-reformer" +gem "fluent-plugin-rewrite-tag-filter" +<% else %> +gem "fluent-plugin-rewrite-tag-filter" <% end %> <% case target when "elasticsearch" %> gem "fluent-plugin-elasticsearch"