Update README and regenerates images with new version

Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
cosmo0920 · Apr 4, 2019 · d7d3152 · d7d3152
1 parent 2396bfa
commit d7d3152
Show file tree

Hide file tree

Showing 30 changed files with 78 additions and 64 deletions.
diff --git a/README.md b/README.md
@@ -82,6 +82,8 @@ Fluentd versioning is as follows:
 
 ### Run as root
 
+This is for v0.12 images.
+
 In Kubernetes and default setting, fluentd needs root permission to read logs in `/var/log` and write `pos_file` to `/var/log`.
 To avoid permission error, you need to set `FLUENT_UID` environment variable to `0` in your Kubernetes configuration.
 
@@ -97,6 +99,11 @@ If you don't setup systemd in the container, fluentd shows following messages by
 
 You can suppress these messages by setting `disable` to `FLUENTD_SYSTEMD_CONF` environment variable in your kubernetes configuration.
 
+### Disable prometheus input plugins
+
+By default, latest images launch `prometheus` plugins to monitor fluentd.
+You can disable prometheus input plugin by setting `disable` to `FLUENTD_PROMETHEUS_CONF` environment variable in your kubernetes configuration.
+
 ### Disable sed execution on elasticsearch image
 
 By historical reason, elasaticsearch image executes `sed` command during startup phase when `FLUENT_ELASTICSEARCH_USER` or `FLUENT_ELASTICSEARCH_PASSWORD` is specified. This sometimes causes a problem with read only mount.

diff --git a/docker-image/v1.3/debian-cloudwatch/Gemfile.lock b/docker-image/v1.3/debian-cloudwatch/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     aws-eventstream (1.0.2)
-    aws-partitions (1.148.0)
+    aws-partitions (1.149.0)
     aws-sdk-cloudwatchlogs (1.17.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
@@ -21,7 +21,7 @@ GEM
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
@@ -33,7 +33,7 @@ GEM
       fluentd (>= 0.14.15)
     fluent-plugin-concat (2.3.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
@@ -129,4 +129,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/docker-image/v1.3/debian-cloudwatch/hooks/post_push b/docker-image/v1.3/debian-cloudwatch/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-cloudwatch-1.3,v1.3-debian-cloudwatch-1}; do
+for tag in {v1.3.3-debian-cloudwatch-1.4,v1.3-debian-cloudwatch-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-elasticsearch/Gemfile.lock b/docker-image/v1.3/debian-elasticsearch/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
@@ -33,7 +33,7 @@ GEM
       elasticsearch
       excon
       fluentd (>= 0.14.22)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
@@ -129,4 +129,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/docker-image/v1.3/debian-elasticsearch/hooks/post_push b/docker-image/v1.3/debian-elasticsearch/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-elasticsearch-1.5,v1.3-debian-elasticsearch-1}; do
+for tag in {v1.3.3-debian-elasticsearch-1.6,v1.3-debian-elasticsearch-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-forward/Gemfile.lock b/docker-image/v1.3/debian-forward/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
@@ -18,7 +18,7 @@ GEM
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.3.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
@@ -111,4 +111,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/docker-image/v1.3/debian-forward/hooks/post_push b/docker-image/v1.3/debian-forward/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-forward-1.2,v1.3-debian-forward-1}; do
+for tag in {v1.3.3-debian-forward-1.3,v1.3-debian-forward-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-gcs/Gemfile.lock b/docker-image/v1.3/debian-gcs/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     declarative (0.0.10)
     declarative-option (0.1.0)
     dig_rb (1.0.1)
@@ -26,7 +26,7 @@ GEM
     fluent-plugin-gcs (0.4.0.beta1)
       fluentd (>= 0.14.0, < 2)
       google-cloud-storage (~> 1.1.0)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
@@ -159,4 +159,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/docker-image/v1.3/debian-gcs/hooks/post_push b/docker-image/v1.3/debian-gcs/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-gcs-1.2,v1.3-debian-gcs-1}; do
+for tag in {v1.3.3-debian-gcs-1.3,v1.3-debian-gcs-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-graylog/Gemfile.lock b/docker-image/v1.3/debian-graylog/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
@@ -21,7 +21,7 @@ GEM
     fluent-plugin-gelf-hs (1.0.8)
       fluentd
       gelf (>= 2.0.0)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
@@ -122,4 +122,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/docker-image/v1.3/debian-graylog/hooks/post_push b/docker-image/v1.3/debian-graylog/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-graylog-1.3,v1.3-debian-graylog-1}; do
+for tag in {v1.3.3-debian-graylog-1.4,v1.3-debian-graylog-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-kafka/Gemfile.lock b/docker-image/v1.3/debian-kafka/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
@@ -18,7 +18,7 @@ GEM
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.3.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kafka (0.7.9)
       fluentd (>= 0.10.58, < 2)
@@ -120,4 +120,4 @@ DEPENDENCIES
   snappy (~> 0.0.15)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/docker-image/v1.3/debian-kafka/hooks/post_push b/docker-image/v1.3/debian-kafka/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-kafka-1.2,v1.3-debian-kafka-1}; do
+for tag in {v1.3.3-debian-kafka-1.3,v1.3-debian-kafka-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-kinesis/Gemfile.lock b/docker-image/v1.3/debian-kinesis/Gemfile.lock
@@ -9,10 +9,10 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     aws-eventstream (1.0.2)
-    aws-partitions (1.148.0)
+    aws-partitions (1.149.0)
     aws-sdk (3.0.1)
       aws-sdk-resources (~> 3)
-    aws-sdk-acm (1.18.0)
+    aws-sdk-acm (1.19.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
     aws-sdk-acmpca (1.13.0)
@@ -60,7 +60,7 @@ GEM
     aws-sdk-backup (1.3.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-batch (1.15.0)
+    aws-sdk-batch (1.16.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
     aws-sdk-budgets (1.18.0)
@@ -129,7 +129,7 @@ GEM
     aws-sdk-cognitosync (1.9.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-comprehend (1.16.0)
+    aws-sdk-comprehend (1.17.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
     aws-sdk-comprehendmedical (1.3.0)
@@ -185,7 +185,7 @@ GEM
     aws-sdk-dynamodbstreams (1.9.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.77.0)
+    aws-sdk-ec2 (1.78.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.14.0)
@@ -624,7 +624,7 @@ GEM
     aws-sdk-secretsmanager (1.24.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.3.0)
+    aws-sdk-securityhub (1.4.0)
       aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
     aws-sdk-serverlessapplicationrepository (1.15.0)
@@ -715,7 +715,7 @@ GEM
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
@@ -724,7 +724,7 @@ GEM
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.3.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kinesis (2.1.1)
       aws-sdk (>= 2.9.9, < 4)
@@ -824,4 +824,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/docker-image/v1.3/debian-kinesis/hooks/post_push b/docker-image/v1.3/debian-kinesis/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-kinesis-1.2,v1.3-debian-kinesis-1}; do
+for tag in {v1.3.3-debian-kinesis-1.3,v1.3-debian-kinesis-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-logentries/Gemfile.lock b/docker-image/v1.3/debian-logentries/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
@@ -18,7 +18,7 @@ GEM
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.3.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
@@ -111,4 +111,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/docker-image/v1.3/debian-logentries/hooks/post_push b/docker-image/v1.3/debian-logentries/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-logentries-1.2,v1.3-debian-logentries-1}; do
+for tag in {v1.3.3-debian-logentries-1.3,v1.3-debian-logentries-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-loggly/Gemfile.lock b/docker-image/v1.3/debian-loggly/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
@@ -18,7 +18,7 @@ GEM
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.3.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
@@ -116,4 +116,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/docker-image/v1.3/debian-loggly/hooks/post_push b/docker-image/v1.3/debian-loggly/hooks/post_push
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
 repoName=${IMAGE_NAME:0:tagStart-1}
 
 # Tag and push image for each additional tag
-for tag in {v1.3.3-debian-loggly-1.2,v1.3-debian-loggly-1}; do
+for tag in {v1.3.3-debian-loggly-1.3,v1.3-debian-loggly-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 done
diff --git a/docker-image/v1.3/debian-logzio/Gemfile.lock b/docker-image/v1.3/debian-logzio/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     concurrent-ruby (1.1.5)
-    cool.io (1.5.3)
+    cool.io (1.5.4)
     dig_rb (1.0.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
@@ -18,7 +18,7 @@ GEM
       fluentd (> 1.0.0, < 2)
     fluent-plugin-concat (2.3.0)
       fluentd (>= 0.14.0, < 2)
-    fluent-plugin-grok-parser (2.5.0)
+    fluent-plugin-grok-parser (2.5.1)
       fluentd (>= 0.14.6, < 2)
     fluent-plugin-kubernetes_metadata_filter (2.1.6)
       fluentd (>= 0.14.0, < 2)
@@ -116,4 +116,4 @@ DEPENDENCIES
   oj (= 3.5.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.1