From 93ad7c9d7969c39cd5139ae24e745178b03bac63 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Wed, 18 Dec 2024 16:56:26 +0900 Subject: [PATCH] Add v1.16.6-1.3 images Signed-off-by: Kentaro Hayashi --- README.md | 74 +++++++++---------- .../v1.16/arm64/debian-azureblob/Gemfile.lock | 44 ++++++----- .../debian-azureblob/conf/kubernetes.conf | 2 +- .../arm64/debian-azureblob/hooks/post_push | 2 +- .../arm64/debian-cloudwatch/Gemfile.lock | 42 ++++++----- .../debian-cloudwatch/conf/kubernetes.conf | 2 +- .../arm64/debian-cloudwatch/hooks/post_push | 2 +- .../arm64/debian-elasticsearch7/Gemfile.lock | 38 ++++++---- .../conf/kubernetes.conf | 2 +- .../debian-elasticsearch7/hooks/post_push | 2 +- .../arm64/debian-elasticsearch8/Gemfile.lock | 58 ++++++++------- .../conf/kubernetes.conf | 2 +- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/arm64/debian-forward/Gemfile.lock | 30 +++++--- .../arm64/debian-forward/conf/kubernetes.conf | 2 +- .../arm64/debian-forward/hooks/post_push | 2 +- .../v1.16/arm64/debian-gcs/Gemfile.lock | 62 +++++++++------- .../arm64/debian-gcs/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-gcs/hooks/post_push | 2 +- .../v1.16/arm64/debian-graylog/Gemfile.lock | 30 +++++--- .../arm64/debian-graylog/conf/kubernetes.conf | 2 +- .../arm64/debian-graylog/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka/Gemfile.lock | 32 ++++---- .../arm64/debian-kafka/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-kafka/hooks/post_push | 2 +- .../v1.16/arm64/debian-kafka2/Gemfile.lock | 32 ++++---- .../arm64/debian-kafka2/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-kafka2/hooks/post_push | 2 +- .../v1.16/arm64/debian-kinesis/Gemfile.lock | 48 ++++++------ .../arm64/debian-kinesis/conf/kubernetes.conf | 2 +- .../arm64/debian-kinesis/hooks/post_push | 2 +- .../arm64/debian-logentries/Gemfile.lock | 30 +++++--- .../debian-logentries/conf/kubernetes.conf | 2 +- .../arm64/debian-logentries/hooks/post_push | 2 +- .../v1.16/arm64/debian-loggly/Gemfile.lock | 30 +++++--- .../arm64/debian-loggly/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-loggly/hooks/post_push | 2 +- .../v1.16/arm64/debian-logzio/Gemfile.lock | 32 ++++---- .../arm64/debian-logzio/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-logzio/hooks/post_push | 2 +- .../arm64/debian-opensearch/Gemfile.lock | 64 ++++++++-------- .../debian-opensearch/conf/kubernetes.conf | 2 +- .../arm64/debian-opensearch/hooks/post_push | 2 +- .../arm64/debian-papertrail/Gemfile.lock | 30 +++++--- .../debian-papertrail/conf/kubernetes.conf | 2 +- .../arm64/debian-papertrail/hooks/post_push | 2 +- .../v1.16/arm64/debian-s3/Gemfile.lock | 50 +++++++------ .../arm64/debian-s3/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-s3/hooks/post_push | 2 +- .../v1.16/arm64/debian-syslog/Gemfile.lock | 30 +++++--- .../arm64/debian-syslog/conf/kubernetes.conf | 2 +- .../v1.16/arm64/debian-syslog/hooks/post_push | 2 +- .../v1.16/debian-azureblob/Gemfile.lock | 44 ++++++----- .../debian-azureblob/conf/kubernetes.conf | 2 +- .../v1.16/debian-azureblob/hooks/post_push | 2 +- .../v1.16/debian-cloudwatch/Gemfile.lock | 42 ++++++----- .../debian-cloudwatch/conf/kubernetes.conf | 2 +- .../v1.16/debian-cloudwatch/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch7/Gemfile.lock | 38 ++++++---- .../conf/kubernetes.conf | 2 +- .../debian-elasticsearch7/hooks/post_push | 2 +- .../v1.16/debian-elasticsearch8/Gemfile.lock | 58 ++++++++------- .../conf/kubernetes.conf | 2 +- .../debian-elasticsearch8/hooks/post_push | 2 +- .../v1.16/debian-forward/Gemfile.lock | 30 +++++--- .../v1.16/debian-forward/conf/kubernetes.conf | 2 +- .../v1.16/debian-forward/hooks/post_push | 2 +- docker-image/v1.16/debian-gcs/Gemfile.lock | 62 +++++++++------- .../v1.16/debian-gcs/conf/kubernetes.conf | 2 +- docker-image/v1.16/debian-gcs/hooks/post_push | 2 +- .../v1.16/debian-graylog/Gemfile.lock | 30 +++++--- .../v1.16/debian-graylog/conf/kubernetes.conf | 2 +- .../v1.16/debian-graylog/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka/Gemfile.lock | 32 ++++---- .../v1.16/debian-kafka/conf/kubernetes.conf | 2 +- .../v1.16/debian-kafka/hooks/post_push | 2 +- docker-image/v1.16/debian-kafka2/Gemfile.lock | 32 ++++---- .../v1.16/debian-kafka2/conf/kubernetes.conf | 2 +- .../v1.16/debian-kafka2/hooks/post_push | 2 +- .../v1.16/debian-kinesis/Gemfile.lock | 48 ++++++------ .../v1.16/debian-kinesis/conf/kubernetes.conf | 2 +- .../v1.16/debian-kinesis/hooks/post_push | 2 +- .../v1.16/debian-logentries/Gemfile.lock | 30 +++++--- .../debian-logentries/conf/kubernetes.conf | 2 +- .../v1.16/debian-logentries/hooks/post_push | 2 +- docker-image/v1.16/debian-loggly/Gemfile.lock | 30 +++++--- .../v1.16/debian-loggly/conf/kubernetes.conf | 2 +- .../v1.16/debian-loggly/hooks/post_push | 2 +- docker-image/v1.16/debian-logzio/Gemfile.lock | 32 ++++---- .../v1.16/debian-logzio/conf/kubernetes.conf | 2 +- .../v1.16/debian-logzio/hooks/post_push | 2 +- .../v1.16/debian-opensearch/Gemfile.lock | 64 ++++++++-------- .../debian-opensearch/conf/kubernetes.conf | 2 +- .../v1.16/debian-opensearch/hooks/post_push | 2 +- .../v1.16/debian-papertrail/Gemfile.lock | 30 +++++--- .../debian-papertrail/conf/kubernetes.conf | 2 +- .../v1.16/debian-papertrail/hooks/post_push | 2 +- docker-image/v1.16/debian-s3/Gemfile.lock | 50 +++++++------ .../v1.16/debian-s3/conf/kubernetes.conf | 2 +- docker-image/v1.16/debian-s3/hooks/post_push | 2 +- docker-image/v1.16/debian-syslog/Gemfile.lock | 30 +++++--- .../v1.16/debian-syslog/conf/kubernetes.conf | 2 +- .../v1.16/debian-syslog/hooks/post_push | 2 +- 103 files changed, 891 insertions(+), 683 deletions(-) diff --git a/README.md b/README.md index 5e6db2d6f..1efb11ec6 100644 --- a/README.md +++ b/README.md @@ -25,130 +25,130 @@ If you want to use above non published images, build it by yourself. Dockerfile ##### Multi-Arch images - `Azureblob` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2` - `Elasticsearch8` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2` - `Elasticsearch7` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch` - `Opensearch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-2` - `Cloudwatch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-2` - `Forward` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-2` - `Gcs` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-2` - `Graylog` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-2` - `Kafka` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2` - `Kafka2` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-2` - `Kinesis` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-2` ##### x86_64 images - `Azureblob` [Dockerfile](docker-image/v1.16/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-amd64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-amd64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-amd64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-amd64` - `Opensearch` [Dockerfile](docker-image/v1.16/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-amd64-2` - `Loggly` [Dockerfile](docker-image/v1.16/debian-loggly/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-loggly-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-loggly-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-loggly-amd64-2` - `Logentries` [Dockerfile](docker-image/v1.16/debian-logentries/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logentries-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logentries-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logentries-amd64-2` - `Cloudwatch` [Dockerfile](docker-image/v1.16/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-amd64-2` - `S3` [Dockerfile](docker-image/v1.16/debian-s3/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-s3-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-s3-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-s3-amd64-2` - `Syslog` [Dockerfile](docker-image/v1.16/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-amd64-2` - `Gcs` [Dockerfile](docker-image/v1.16/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-amd64-2` - `Graylog` [Dockerfile](docker-image/v1.16/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-amd64-2` - `Papertrail` [Dockerfile](docker-image/v1.16/debian-papertrail/Dockerfile) - `Logzio` [Dockerfile](docker-image/v1.16/debian-logzio/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logzio-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-logzio-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-logzio-amd64-2` - `Kafka` [Dockerfile](docker-image/v1.16/debian-kafka/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-amd64-2` - `Kafka2` [Dockerfile](docker-image/v1.16/debian-kafka2/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-amd64-2` - `Kinesis` [Dockerfile](docker-image/v1.16/debian-kinesis/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-amd64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-amd64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-amd64-2` ##### arm64 images - `Azureblob` [Dockerfile](docker-image/v1.16/arm64/debian-azureblob/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-azureblob-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-arm64-2` - `Elasticsearch8` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch8/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch8-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-arm64-2` - `Elasticsearch7` [Dockerfile](docker-image/v1.16/arm64/debian-elasticsearch7/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-elasticsearch7-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch7-arm64-2` - `docker pull fluent/fluentd-kubernetes-daemonset:v1-debian-elasticsearch-arm64` - `Opensearch` [Dockerfile](docker-image/v1.16/arm64/debian-opensearch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-opensearch-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-arm64-2` - `Loggly` [Dockerfile](docker-image/v1.16/arm64/debian-loggly/Dockerfile) - `Logentries` [Dockerfile](docker-image/v1.16/arm64/debian-logentries/Dockerfile) - `Cloudwatch` [Dockerfile](docker-image/v1.16/arm64/debian-cloudwatch/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-cloudwatch-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-arm64-2` - `S3` [Dockerfile](docker-image/v1.16/arm64/debian-s3/Dockerfile) - `Syslog` [Dockerfile](docker-image/v1.16/arm64/debian-syslog/Dockerfile) - `Forward` [Dockerfile](docker-image/v1.16/arm64/debian-forward/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-forward-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-arm64-2` - `Gcs` [Dockerfile](docker-image/v1.16/arm64/debian-gcs/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-gcs-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-arm64-2` - `Graylog` [Dockerfile](docker-image/v1.16/arm64/debian-graylog/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-graylog-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-arm64-2` - `Papertrail` [Dockerfile](docker-image/v1.16/arm64/debian-papertrail/Dockerfile) - `Logzio` [Dockerfile](docker-image/v1.16/arm64/debian-logzio/Dockerfile) - `Kafka` [Dockerfile](docker-image/v1.16/arm64/debian-kafka/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-arm64-2` - `Kafka2` [Dockerfile](docker-image/v1.16/arm64/debian-kafka2/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kafka2-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-arm64-2` - `Kinesis` [Dockerfile](docker-image/v1.16/arm64/debian-kinesis/Dockerfile) - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-arm64-1.2` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.6-debian-kinesis-arm64-1.3` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kinesis-arm64-2` diff --git a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock index 9912c3ee4..674619835 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock @@ -18,9 +18,9 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) - faraday (1.10.3) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -36,14 +36,14 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) ffi (1.17.0) ffi-compiler (1.3.2) @@ -60,8 +60,8 @@ GEM fluentd (>= 0.14.10, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -106,11 +106,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -121,27 +121,31 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) multipart-post (2.4.1) - net-http-persistent (4.0.4) + net-http-persistent (4.0.5) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.7) + nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) racc (1.8.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -150,18 +154,20 @@ GEM rexml (3.2.9) strscan ruby2_keywords (0.0.5) - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-azureblob/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-azureblob/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-azureblob/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push b/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push index c2d23c1b6..7af481656 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-azureblob/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-azureblob-arm64-1.2,v1.16-debian-azureblob-arm64-2}; do +for tag in {v1.16.6-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock index 71071dd89..19666e2b7 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-cloudwatchlogs (1.92.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-partitions (1.1026.0) + aws-sdk-cloudwatchlogs (1.105.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.204.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -21,7 +21,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -38,8 +38,8 @@ GEM fluentd (>= 1.8.0) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -84,12 +84,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -100,19 +100,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -120,18 +124,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-cloudwatch/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-cloudwatch/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push index bb75dcdbc..1dacadac1 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-cloudwatch/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-cloudwatch-arm64-1.2,v1.16-debian-cloudwatch-arm64-2}; do +for tag in {v1.16.6-debian-cloudwatch-arm64-1.3,v1.16-debian-cloudwatch-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock index 0aa571267..9d454aff7 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) elasticsearch (7.17.11) elasticsearch-api (= 7.17.11) @@ -22,8 +22,8 @@ GEM multi_json elasticsearch-xpack (7.17.11) elasticsearch-api (>= 6) - excon (0.111.0) - faraday (1.10.3) + excon (1.2.2) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -39,8 +39,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -60,8 +60,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-dedot_filter (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-elasticsearch (5.2.5) elasticsearch excon @@ -111,11 +111,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -126,20 +126,24 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) multipart-post (2.4.1) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -148,18 +152,20 @@ GEM rexml (3.2.9) strscan ruby2_keywords (0.0.5) - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-elasticsearch7/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push index 5f4424fec..3e1f1f9fa 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-elasticsearch7-arm64-1.2,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; do +for tag in {v1.16.6-debian-elasticsearch7-arm64-1.3,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock index f23b61a25..214638136 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock @@ -9,25 +9,26 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) elastic-transport (8.3.5) faraday (< 3) multi_json - elasticsearch (8.15.0) + elasticsearch (8.17.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.15.0) - elasticsearch-api (8.15.0) + elasticsearch-api (= 8.17.0) + elasticsearch-api (8.17.0) multi_json - excon (0.111.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + excon (1.2.2) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-excon (2.1.0) - excon (>= 0.27.4) - faraday (~> 2.0) - faraday-net_http (3.3.0) - net-http + faraday-excon (2.3.0) + excon (>= 1.0.0) + faraday (>= 2.11.0, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) @@ -42,8 +43,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-dedot_filter (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-elasticsearch (5.3.0) elasticsearch excon @@ -94,11 +95,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -109,22 +110,25 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -132,19 +136,21 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-elasticsearch8/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push index 9e452d51f..63f834ba2 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-elasticsearch8-arm64-1.2,v1.16-debian-elasticsearch8-arm64-2}; do +for tag in {v1.16.6-debian-elasticsearch8-arm64-1.3,v1.16-debian-elasticsearch8-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock index ae33ce151..9195e7283 100644 --- a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -69,11 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -84,19 +84,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -104,18 +108,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-forward/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-forward/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-forward/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-forward/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-forward/hooks/post_push b/docker-image/v1.16/arm64/debian-forward/hooks/post_push index 568aa68a5..13db2248f 100644 --- a/docker-image/v1.16/arm64/debian-forward/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-forward/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-forward-arm64-1.2,v1.16-debian-forward-arm64-2}; do +for tag in {v1.16.6-debian-forward-arm64-1.3,v1.16-debian-forward-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock index 50c19dea6..eb07e4be4 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock @@ -9,16 +9,17 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-net_http (3.3.0) - net-http + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) @@ -31,8 +32,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-gcs (0.4.2) fluentd (>= 0.14.22, < 2) google-cloud-storage (~> 1.1) @@ -81,17 +82,17 @@ GEM mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - google-apis-iamcredentials_v1 (0.21.0) + google-apis-iamcredentials_v1 (0.22.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.44.0) + google-apis-storage_v1 (0.49.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.2.0) + google-cloud-env (2.2.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) - google-cloud-storage (1.52.0) + google-cloud-storage (1.54.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (~> 0.13) @@ -100,9 +101,11 @@ GEM google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.11.0) + google-logging-utils (0.1.0) + googleauth (1.12.2) faraday (>= 1.0, < 3.a) - google-cloud-env (~> 2.1) + google-cloud-env (~> 2.2) + google-logging-utils (~> 0.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -114,15 +117,15 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) httpclient (2.8.3) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json - jwt (2.8.2) + jwt (2.9.3) base64 kubeclient (4.12.0) http (>= 3.0, < 6.0) @@ -132,25 +135,28 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) + mime-types-data (3.2024.1203) mini_mime (1.1.5) - msgpack (1.7.2) + msgpack (1.7.5) multi_json (1.15.0) - mutex_m (0.2.0) - net-http (0.4.1) + mutex_m (0.3.0) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) os (1.1.4) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -163,7 +169,9 @@ GEM retriable (3.1.2) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) signet (0.19.0) @@ -172,7 +180,7 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) trailblazer-option (0.1.2) @@ -181,8 +189,8 @@ GEM tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uber (0.1.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-gcs/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-gcs/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-gcs/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-gcs/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push b/docker-image/v1.16/arm64/debian-gcs/hooks/post_push index 52d8f5b59..979857e07 100644 --- a/docker-image/v1.16/arm64/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-gcs/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-gcs-arm64-1.2,v1.16-debian-gcs-arm64-2}; do +for tag in {v1.16.6-debian-gcs-arm64-1.3,v1.16-debian-gcs-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock index fcd0ede28..6500796de 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-gelf-hs (1.0.8) fluentd gelf (>= 2.0.0) @@ -74,11 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -89,19 +89,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -109,18 +113,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-graylog/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-graylog/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-graylog/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-graylog/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push index d3b197c32..74fe0e7d7 100644 --- a/docker-image/v1.16/arm64/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-graylog/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-graylog-arm64-1.2,v1.16-debian-graylog-arm64-2}; do +for tag in {v1.16.6-debian-graylog-arm64-1.3,v1.16-debian-graylog-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock index 2de8df3ae..606b432d4 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock @@ -11,7 +11,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) @@ -30,8 +30,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -83,11 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -98,16 +98,19 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) ltsv (0.1.2) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) @@ -116,7 +119,8 @@ GEM ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,19 +130,21 @@ GEM strscan ruby-kafka (1.5.0) digest-crc - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) snappy (0.4.0) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-kafka/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-kafka/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-kafka/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-kafka/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-kafka/hooks/post_push b/docker-image/v1.16/arm64/debian-kafka/hooks/post_push index 3ef7ae251..0ea8ed508 100644 --- a/docker-image/v1.16/arm64/debian-kafka/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kafka/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kafka-arm64-1.2,v1.16-debian-kafka-arm64-2}; do +for tag in {v1.16.6-debian-kafka-arm64-1.3,v1.16-debian-kafka-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock index 2de8df3ae..606b432d4 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock @@ -11,7 +11,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) @@ -30,8 +30,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -83,11 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -98,16 +98,19 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) ltsv (0.1.2) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) @@ -116,7 +119,8 @@ GEM ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,19 +130,21 @@ GEM strscan ruby-kafka (1.5.0) digest-crc - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) snappy (0.4.0) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-kafka2/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-kafka2/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-kafka2/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-kafka2/hooks/post_push b/docker-image/v1.16/arm64/debian-kafka2/hooks/post_push index a23da9a06..de3cada00 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kafka2/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kafka2-arm64-1.2,v1.16-debian-kafka2-arm64-2}; do +for tag in {v1.16.6-debian-kafka2-arm64-1.3,v1.16-debian-kafka2-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock index 9abace9b2..51a96465a 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock @@ -4,19 +4,19 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.78.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-firehose (1.85.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.65.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-kinesis (1.71.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -24,7 +24,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -38,8 +38,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -82,7 +82,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-protobuf (3.25.4) + google-protobuf (3.25.5) http (5.2.0) addressable (~> 2.8) base64 (~> 0.1) @@ -90,12 +90,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -106,19 +106,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,18 +130,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-kinesis/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-kinesis/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-kinesis/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push b/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push index 7171a11bf..9997d53dc 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-kinesis/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kinesis-arm64-1.2,v1.16-debian-kinesis-arm64-2}; do +for tag in {v1.16.6-debian-kinesis-arm64-1.3,v1.16-debian-kinesis-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock index ae33ce151..9195e7283 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -69,11 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -84,19 +84,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -104,18 +108,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-logentries/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-logentries/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-logentries/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-logentries/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push b/docker-image/v1.16/arm64/debian-logentries/hooks/post_push index b300bec70..b47cc52db 100644 --- a/docker-image/v1.16/arm64/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logentries/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-logentries-arm64-1.2,v1.16-debian-logentries-arm64-2}; do +for tag in {v1.16.6-debian-logentries-arm64-1.3,v1.16-debian-logentries-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock index 9f4ef01c0..8ecd7b55c 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -72,11 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -87,20 +87,24 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) net-http-persistent (2.9.4) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -108,18 +112,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-loggly/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-loggly/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-loggly/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-loggly/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push b/docker-image/v1.16/arm64/debian-loggly/hooks/post_push index a591c4248..7a81173d0 100644 --- a/docker-image/v1.16/arm64/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-loggly/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-loggly-arm64-1.2,v1.16-debian-loggly-arm64-2}; do +for tag in {v1.16.6-debian-loggly-arm64-1.3,v1.16-debian-loggly-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock index a115977f1..4b704b795 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock @@ -10,7 +10,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -24,8 +24,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -74,11 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -89,21 +89,25 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http-persistent (4.0.4) + net-http-persistent (4.0.5) connection_pool (~> 2.2) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -111,18 +115,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-logzio/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-logzio/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-logzio/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-logzio/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push b/docker-image/v1.16/arm64/debian-logzio/hooks/post_push index 5ae483270..8233226b2 100644 --- a/docker-image/v1.16/arm64/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-logzio/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-logzio-arm64-1.2,v1.16-debian-logzio-arm64-2}; do +for tag in {v1.16.6-debian-logzio-arm64-1.3,v1.16-debian-logzio-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock index 9e505d549..303c6d67e 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock @@ -4,13 +4,13 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -18,17 +18,18 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) - excon (0.111.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + excon (1.2.2) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-excon (2.1.0) - excon (>= 0.27.4) - faraday (~> 2.0) - faraday-net_http (3.3.0) - net-http + faraday-excon (2.3.0) + excon (>= 1.0.0) + faraday (>= 2.11.0, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) @@ -44,8 +45,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -57,14 +58,14 @@ GEM lru_redux fluent-plugin-multi-format-parser (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-opensearch (1.1.4) + fluent-plugin-opensearch (1.1.5) aws-sdk-core (~> 3) excon faraday (>= 2.0.0) faraday-excon (>= 2.0.0) faraday_middleware-aws-sigv4 (~> 1.0.1) fluentd (>= 0.14.22) - opensearch-ruby + opensearch-ruby (>= 3.0.1) fluent-plugin-parser-cri (0.1.1) fluentd (>= 1) fluent-plugin-prometheus (2.1.0) @@ -98,12 +99,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -114,25 +115,28 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) opensearch-ruby (3.4.0) faraday (>= 1.0, < 3) multi_json (>= 1.0) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -140,19 +144,21 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-opensearch/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-opensearch/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-opensearch/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push b/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push index 38f1019c3..fb8dfd0cb 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-opensearch/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-opensearch-arm64-1.2,v1.16-debian-opensearch-arm64-2}; do +for tag in {v1.16.6-debian-opensearch-arm64-1.3,v1.16-debian-opensearch-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock index daa4c3625..0df2abeb4 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -26,8 +26,8 @@ GEM uuidtools (>= 2.1.5) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -75,11 +75,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -90,19 +90,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -110,11 +114,13 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) @@ -122,7 +128,7 @@ GEM tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uuidtools (2.2.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-papertrail/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-papertrail/conf/kubernetes.conf index cf7f9c536..875787b33 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-papertrail/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push b/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push index edff39ef1..7a7f4ebca 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-papertrail/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-papertrail-arm64-1.2,v1.16-debian-papertrail-arm64-2}; do +for tag in {v1.16.6-debian-papertrail-arm64-1.3,v1.16-debian-papertrail-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock index 12e6bd626..f6ddbfa9f 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock @@ -4,23 +4,23 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.90.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.161.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-s3 (1.176.1) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.82.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-sqs (1.89.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -28,7 +28,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -42,8 +42,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -92,12 +92,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -108,19 +108,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -128,18 +132,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-s3/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-s3/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-s3/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-s3/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-s3/hooks/post_push b/docker-image/v1.16/arm64/debian-s3/hooks/post_push index a9bcac4f5..b0f7f9c12 100644 --- a/docker-image/v1.16/arm64/debian-s3/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-s3/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-s3-arm64-1.2,v1.16-debian-s3-arm64-2}; do +for tag in {v1.16.6-debian-s3-arm64-1.3,v1.16-debian-s3-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock index 840d50a84..8e4fb7a3e 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -72,11 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -87,19 +87,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct remote_syslog_sender (1.2.2) syslog_protocol rest-client (2.1.0) @@ -109,11 +113,13 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) syslog_protocol (0.9.2) systemd-journal (2.0.0) ffi (~> 1.9) @@ -121,7 +127,7 @@ GEM concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/arm64/debian-syslog/conf/kubernetes.conf b/docker-image/v1.16/arm64/debian-syslog/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/arm64/debian-syslog/conf/kubernetes.conf +++ b/docker-image/v1.16/arm64/debian-syslog/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push b/docker-image/v1.16/arm64/debian-syslog/hooks/post_push index b92c5b5d7..d0fb02a99 100644 --- a/docker-image/v1.16/arm64/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/arm64/debian-syslog/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-syslog-arm64-1.2,v1.16-debian-syslog-arm64-2}; do +for tag in {v1.16.6-debian-syslog-arm64-1.3,v1.16-debian-syslog-arm64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-azureblob/Gemfile.lock b/docker-image/v1.16/debian-azureblob/Gemfile.lock index 9912c3ee4..674619835 100644 --- a/docker-image/v1.16/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/debian-azureblob/Gemfile.lock @@ -18,9 +18,9 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) - faraday (1.10.3) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -36,14 +36,14 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) ffi (1.17.0) ffi-compiler (1.3.2) @@ -60,8 +60,8 @@ GEM fluentd (>= 0.14.10, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -106,11 +106,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -121,27 +121,31 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) multipart-post (2.4.1) - net-http-persistent (4.0.4) + net-http-persistent (4.0.5) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.7) + nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) racc (1.8.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -150,18 +154,20 @@ GEM rexml (3.2.9) strscan ruby2_keywords (0.0.5) - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-azureblob/conf/kubernetes.conf b/docker-image/v1.16/debian-azureblob/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-azureblob/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-azureblob/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-azureblob/hooks/post_push b/docker-image/v1.16/debian-azureblob/hooks/post_push index 1ac63978c..614af1483 100644 --- a/docker-image/v1.16/debian-azureblob/hooks/post_push +++ b/docker-image/v1.16/debian-azureblob/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-azureblob-amd64-1.2,v1.16-debian-azureblob-amd64-2}; do +for tag in {v1.16.6-debian-azureblob-amd64-1.3,v1.16-debian-azureblob-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock index 71071dd89..19666e2b7 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/debian-cloudwatch/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-cloudwatchlogs (1.92.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-partitions (1.1026.0) + aws-sdk-cloudwatchlogs (1.105.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.204.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -21,7 +21,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -38,8 +38,8 @@ GEM fluentd (>= 1.8.0) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -84,12 +84,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -100,19 +100,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -120,18 +124,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-cloudwatch/conf/kubernetes.conf b/docker-image/v1.16/debian-cloudwatch/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-cloudwatch/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-cloudwatch/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/debian-cloudwatch/hooks/post_push index 181dfa701..0625b5ae4 100644 --- a/docker-image/v1.16/debian-cloudwatch/hooks/post_push +++ b/docker-image/v1.16/debian-cloudwatch/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-cloudwatch-amd64-1.2,v1.16-debian-cloudwatch-amd64-2}; do +for tag in {v1.16.6-debian-cloudwatch-amd64-1.3,v1.16-debian-cloudwatch-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock index 0aa571267..9d454aff7 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) elasticsearch (7.17.11) elasticsearch-api (= 7.17.11) @@ -22,8 +22,8 @@ GEM multi_json elasticsearch-xpack (7.17.11) elasticsearch-api (>= 6) - excon (0.111.0) - faraday (1.10.3) + excon (1.2.2) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -39,8 +39,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -60,8 +60,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-dedot_filter (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-elasticsearch (5.2.5) elasticsearch excon @@ -111,11 +111,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -126,20 +126,24 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) multipart-post (2.4.1) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -148,18 +152,20 @@ GEM rexml (3.2.9) strscan ruby2_keywords (0.0.5) - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-elasticsearch7/conf/kubernetes.conf b/docker-image/v1.16/debian-elasticsearch7/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-elasticsearch7/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-elasticsearch7/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/debian-elasticsearch7/hooks/post_push index 69d7f8354..14b38ba22 100644 --- a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch7/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-elasticsearch7-amd64-1.2,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; do +for tag in {v1.16.6-debian-elasticsearch7-amd64-1.3,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock index f23b61a25..214638136 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock @@ -9,25 +9,26 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) elastic-transport (8.3.5) faraday (< 3) multi_json - elasticsearch (8.15.0) + elasticsearch (8.17.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.15.0) - elasticsearch-api (8.15.0) + elasticsearch-api (= 8.17.0) + elasticsearch-api (8.17.0) multi_json - excon (0.111.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + excon (1.2.2) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-excon (2.1.0) - excon (>= 0.27.4) - faraday (~> 2.0) - faraday-net_http (3.3.0) - net-http + faraday-excon (2.3.0) + excon (>= 1.0.0) + faraday (>= 2.11.0, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) @@ -42,8 +43,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-dedot_filter (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-elasticsearch (5.3.0) elasticsearch excon @@ -94,11 +95,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -109,22 +110,25 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -132,19 +136,21 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-elasticsearch8/conf/kubernetes.conf b/docker-image/v1.16/debian-elasticsearch8/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-elasticsearch8/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-elasticsearch8/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/debian-elasticsearch8/hooks/post_push index 5924eb30d..013b48d4b 100644 --- a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push +++ b/docker-image/v1.16/debian-elasticsearch8/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-elasticsearch8-amd64-1.2,v1.16-debian-elasticsearch8-amd64-2}; do +for tag in {v1.16.6-debian-elasticsearch8-amd64-1.3,v1.16-debian-elasticsearch8-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-forward/Gemfile.lock b/docker-image/v1.16/debian-forward/Gemfile.lock index ae33ce151..9195e7283 100644 --- a/docker-image/v1.16/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/debian-forward/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -69,11 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -84,19 +84,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -104,18 +108,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-forward/conf/kubernetes.conf b/docker-image/v1.16/debian-forward/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-forward/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-forward/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-forward/hooks/post_push b/docker-image/v1.16/debian-forward/hooks/post_push index 71a83747d..cbe5d0874 100644 --- a/docker-image/v1.16/debian-forward/hooks/post_push +++ b/docker-image/v1.16/debian-forward/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-forward-amd64-1.2,v1.16-debian-forward-amd64-2}; do +for tag in {v1.16.6-debian-forward-amd64-1.3,v1.16-debian-forward-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-gcs/Gemfile.lock b/docker-image/v1.16/debian-gcs/Gemfile.lock index 50c19dea6..eb07e4be4 100644 --- a/docker-image/v1.16/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/debian-gcs/Gemfile.lock @@ -9,16 +9,17 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-net_http (3.3.0) - net-http + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) @@ -31,8 +32,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-gcs (0.4.2) fluentd (>= 0.14.22, < 2) google-cloud-storage (~> 1.1) @@ -81,17 +82,17 @@ GEM mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - google-apis-iamcredentials_v1 (0.21.0) + google-apis-iamcredentials_v1 (0.22.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.44.0) + google-apis-storage_v1 (0.49.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.2.0) + google-cloud-env (2.2.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) - google-cloud-storage (1.52.0) + google-cloud-storage (1.54.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (~> 0.13) @@ -100,9 +101,11 @@ GEM google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.11.0) + google-logging-utils (0.1.0) + googleauth (1.12.2) faraday (>= 1.0, < 3.a) - google-cloud-env (~> 2.1) + google-cloud-env (~> 2.2) + google-logging-utils (~> 0.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -114,15 +117,15 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) httpclient (2.8.3) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json - jwt (2.8.2) + jwt (2.9.3) base64 kubeclient (4.12.0) http (>= 3.0, < 6.0) @@ -132,25 +135,28 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) + mime-types-data (3.2024.1203) mini_mime (1.1.5) - msgpack (1.7.2) + msgpack (1.7.5) multi_json (1.15.0) - mutex_m (0.2.0) - net-http (0.4.1) + mutex_m (0.3.0) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) os (1.1.4) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -163,7 +169,9 @@ GEM retriable (3.1.2) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) signet (0.19.0) @@ -172,7 +180,7 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) trailblazer-option (0.1.2) @@ -181,8 +189,8 @@ GEM tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uber (0.1.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-gcs/conf/kubernetes.conf b/docker-image/v1.16/debian-gcs/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-gcs/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-gcs/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-gcs/hooks/post_push b/docker-image/v1.16/debian-gcs/hooks/post_push index f36c4e765..522df8f4d 100644 --- a/docker-image/v1.16/debian-gcs/hooks/post_push +++ b/docker-image/v1.16/debian-gcs/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-gcs-amd64-1.2,v1.16-debian-gcs-amd64-2}; do +for tag in {v1.16.6-debian-gcs-amd64-1.3,v1.16-debian-gcs-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-graylog/Gemfile.lock b/docker-image/v1.16/debian-graylog/Gemfile.lock index fcd0ede28..6500796de 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/debian-graylog/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-gelf-hs (1.0.8) fluentd gelf (>= 2.0.0) @@ -74,11 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -89,19 +89,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -109,18 +113,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-graylog/conf/kubernetes.conf b/docker-image/v1.16/debian-graylog/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-graylog/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-graylog/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push index 890caf4ce..8a388e53c 100644 --- a/docker-image/v1.16/debian-graylog/hooks/post_push +++ b/docker-image/v1.16/debian-graylog/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-graylog-amd64-1.2,v1.16-debian-graylog-amd64-2}; do +for tag in {v1.16.6-debian-graylog-amd64-1.3,v1.16-debian-graylog-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-kafka/Gemfile.lock b/docker-image/v1.16/debian-kafka/Gemfile.lock index 2de8df3ae..606b432d4 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka/Gemfile.lock @@ -11,7 +11,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) @@ -30,8 +30,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -83,11 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -98,16 +98,19 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) ltsv (0.1.2) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) @@ -116,7 +119,8 @@ GEM ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,19 +130,21 @@ GEM strscan ruby-kafka (1.5.0) digest-crc - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) snappy (0.4.0) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-kafka/conf/kubernetes.conf b/docker-image/v1.16/debian-kafka/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-kafka/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-kafka/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-kafka/hooks/post_push b/docker-image/v1.16/debian-kafka/hooks/post_push index 7665a8444..fe868f748 100644 --- a/docker-image/v1.16/debian-kafka/hooks/post_push +++ b/docker-image/v1.16/debian-kafka/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kafka-amd64-1.2,v1.16-debian-kafka-amd64-2}; do +for tag in {v1.16.6-debian-kafka-amd64-1.3,v1.16-debian-kafka-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-kafka2/Gemfile.lock b/docker-image/v1.16/debian-kafka2/Gemfile.lock index 2de8df3ae..606b432d4 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka2/Gemfile.lock @@ -11,7 +11,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) @@ -30,8 +30,8 @@ GEM fluentd (>= 0.14.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -83,11 +83,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -98,16 +98,19 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) ltsv (0.1.2) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - mini_portile2 (2.8.7) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + mini_portile2 (2.8.8) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) @@ -116,7 +119,8 @@ GEM ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,19 +130,21 @@ GEM strscan ruby-kafka (1.5.0) digest-crc - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) snappy (0.4.0) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-kafka2/conf/kubernetes.conf b/docker-image/v1.16/debian-kafka2/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-kafka2/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-kafka2/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-kafka2/hooks/post_push b/docker-image/v1.16/debian-kafka2/hooks/post_push index 3cde0e476..03241ba07 100644 --- a/docker-image/v1.16/debian-kafka2/hooks/post_push +++ b/docker-image/v1.16/debian-kafka2/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kafka2-amd64-1.2,v1.16-debian-kafka2-amd64-2}; do +for tag in {v1.16.6-debian-kafka2-amd64-1.3,v1.16-debian-kafka2-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-kinesis/Gemfile.lock b/docker-image/v1.16/debian-kinesis/Gemfile.lock index 9abace9b2..51a96465a 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/debian-kinesis/Gemfile.lock @@ -4,19 +4,19 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.78.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-firehose (1.85.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.65.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-kinesis (1.71.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -24,7 +24,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -38,8 +38,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -82,7 +82,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-protobuf (3.25.4) + google-protobuf (3.25.5) http (5.2.0) addressable (~> 2.8) base64 (~> 0.1) @@ -90,12 +90,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -106,19 +106,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -126,18 +130,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-kinesis/conf/kubernetes.conf b/docker-image/v1.16/debian-kinesis/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-kinesis/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-kinesis/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-kinesis/hooks/post_push b/docker-image/v1.16/debian-kinesis/hooks/post_push index 7757e66e3..9911d683e 100644 --- a/docker-image/v1.16/debian-kinesis/hooks/post_push +++ b/docker-image/v1.16/debian-kinesis/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-kinesis-amd64-1.2,v1.16-debian-kinesis-amd64-2}; do +for tag in {v1.16.6-debian-kinesis-amd64-1.3,v1.16-debian-kinesis-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-logentries/Gemfile.lock b/docker-image/v1.16/debian-logentries/Gemfile.lock index ae33ce151..9195e7283 100644 --- a/docker-image/v1.16/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/debian-logentries/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -69,11 +69,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -84,19 +84,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -104,18 +108,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-logentries/conf/kubernetes.conf b/docker-image/v1.16/debian-logentries/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-logentries/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-logentries/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-logentries/hooks/post_push b/docker-image/v1.16/debian-logentries/hooks/post_push index ab830b5fa..659e9fab8 100644 --- a/docker-image/v1.16/debian-logentries/hooks/post_push +++ b/docker-image/v1.16/debian-logentries/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-logentries-amd64-1.2,v1.16-debian-logentries-amd64-2}; do +for tag in {v1.16.6-debian-logentries-amd64-1.3,v1.16-debian-logentries-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-loggly/Gemfile.lock b/docker-image/v1.16/debian-loggly/Gemfile.lock index 9f4ef01c0..8ecd7b55c 100644 --- a/docker-image/v1.16/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/debian-loggly/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -72,11 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -87,20 +87,24 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) net-http-persistent (2.9.4) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -108,18 +112,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-loggly/conf/kubernetes.conf b/docker-image/v1.16/debian-loggly/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-loggly/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-loggly/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-loggly/hooks/post_push b/docker-image/v1.16/debian-loggly/hooks/post_push index 70ec7e62b..e9480f55b 100644 --- a/docker-image/v1.16/debian-loggly/hooks/post_push +++ b/docker-image/v1.16/debian-loggly/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-loggly-amd64-1.2,v1.16-debian-loggly-amd64-2}; do +for tag in {v1.16.6-debian-loggly-amd64-1.3,v1.16-debian-loggly-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-logzio/Gemfile.lock b/docker-image/v1.16/debian-logzio/Gemfile.lock index a115977f1..4b704b795 100644 --- a/docker-image/v1.16/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/debian-logzio/Gemfile.lock @@ -10,7 +10,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -24,8 +24,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -74,11 +74,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -89,21 +89,25 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http-persistent (4.0.4) + net-http-persistent (4.0.5) connection_pool (~> 2.2) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -111,18 +115,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-logzio/conf/kubernetes.conf b/docker-image/v1.16/debian-logzio/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-logzio/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-logzio/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-logzio/hooks/post_push b/docker-image/v1.16/debian-logzio/hooks/post_push index 5c4299992..9bb6c094a 100644 --- a/docker-image/v1.16/debian-logzio/hooks/post_push +++ b/docker-image/v1.16/debian-logzio/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-logzio-amd64-1.2,v1.16-debian-logzio-amd64-2}; do +for tag in {v1.16.6-debian-logzio-amd64-1.3,v1.16-debian-logzio-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-opensearch/Gemfile.lock b/docker-image/v1.16/debian-opensearch/Gemfile.lock index 9e505d549..303c6d67e 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/debian-opensearch/Gemfile.lock @@ -4,13 +4,13 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -18,17 +18,18 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) - excon (0.111.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + excon (1.2.2) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-excon (2.1.0) - excon (>= 0.27.4) - faraday (~> 2.0) - faraday-net_http (3.3.0) - net-http + faraday-excon (2.3.0) + excon (>= 1.0.0) + faraday (>= 2.11.0, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) faraday (>= 2.0, < 3) @@ -44,8 +45,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -57,14 +58,14 @@ GEM lru_redux fluent-plugin-multi-format-parser (1.0.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-opensearch (1.1.4) + fluent-plugin-opensearch (1.1.5) aws-sdk-core (~> 3) excon faraday (>= 2.0.0) faraday-excon (>= 2.0.0) faraday_middleware-aws-sigv4 (~> 1.0.1) fluentd (>= 0.14.22) - opensearch-ruby + opensearch-ruby (>= 3.0.1) fluent-plugin-parser-cri (0.1.1) fluentd (>= 1) fluent-plugin-prometheus (2.1.0) @@ -98,12 +99,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -114,25 +115,28 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.1) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) oj (3.15.1) opensearch-ruby (3.4.0) faraday (>= 1.0, < 3) multi_json (>= 1.0) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -140,19 +144,21 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uri (0.13.1) - webrick (1.8.1) + uri (1.0.2) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-opensearch/conf/kubernetes.conf b/docker-image/v1.16/debian-opensearch/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-opensearch/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-opensearch/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-opensearch/hooks/post_push b/docker-image/v1.16/debian-opensearch/hooks/post_push index e9dc27318..87ad883af 100644 --- a/docker-image/v1.16/debian-opensearch/hooks/post_push +++ b/docker-image/v1.16/debian-opensearch/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-opensearch-amd64-1.2,v1.16-debian-opensearch-amd64-2}; do +for tag in {v1.16.6-debian-opensearch-amd64-1.3,v1.16-debian-opensearch-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-papertrail/Gemfile.lock b/docker-image/v1.16/debian-papertrail/Gemfile.lock index daa4c3625..0df2abeb4 100644 --- a/docker-image/v1.16/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/debian-papertrail/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -26,8 +26,8 @@ GEM uuidtools (>= 2.1.5) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -75,11 +75,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -90,19 +90,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -110,11 +114,13 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) @@ -122,7 +128,7 @@ GEM tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uuidtools (2.2.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-papertrail/conf/kubernetes.conf b/docker-image/v1.16/debian-papertrail/conf/kubernetes.conf index cf7f9c536..875787b33 100644 --- a/docker-image/v1.16/debian-papertrail/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-papertrail/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-papertrail/hooks/post_push b/docker-image/v1.16/debian-papertrail/hooks/post_push index 6058188d8..25e3c251c 100644 --- a/docker-image/v1.16/debian-papertrail/hooks/post_push +++ b/docker-image/v1.16/debian-papertrail/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-papertrail-amd64-1.2,v1.16-debian-papertrail-amd64-2}; do +for tag in {v1.16.6-debian-papertrail-amd64-1.3,v1.16-debian-papertrail-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-s3/Gemfile.lock b/docker-image/v1.16/debian-s3/Gemfile.lock index 12e6bd626..f6ddbfa9f 100644 --- a/docker-image/v1.16/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/debian-s3/Gemfile.lock @@ -4,23 +4,23 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.973.0) - aws-sdk-core (3.204.0) + aws-partitions (1.1026.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.90.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.161.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-s3 (1.176.1) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.82.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-sqs (1.89.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) concurrent-ruby (1.3.4) @@ -28,7 +28,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -42,8 +42,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -92,12 +92,12 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) jmespath (1.6.2) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -108,19 +108,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -128,18 +132,20 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) systemd-journal (2.0.0) ffi (~> 1.9) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-s3/conf/kubernetes.conf b/docker-image/v1.16/debian-s3/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-s3/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-s3/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-s3/hooks/post_push b/docker-image/v1.16/debian-s3/hooks/post_push index e1e33863d..faa0e409d 100644 --- a/docker-image/v1.16/debian-s3/hooks/post_push +++ b/docker-image/v1.16/debian-s3/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-s3-amd64-1.2,v1.16-debian-s3-amd64-2}; do +for tag in {v1.16.6-debian-s3-amd64-1.3,v1.16-debian-s3-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed diff --git a/docker-image/v1.16/debian-syslog/Gemfile.lock b/docker-image/v1.16/debian-syslog/Gemfile.lock index 840d50a84..8e4fb7a3e 100644 --- a/docker-image/v1.16/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/debian-syslog/Gemfile.lock @@ -9,7 +9,7 @@ GEM fiber-annotation fiber-local json - cool.io (1.8.1) + cool.io (1.9.0) domain_name (0.6.20240107) ffi (1.17.0) ffi-compiler (1.3.2) @@ -23,8 +23,8 @@ GEM fluentd (> 1.0.0, < 2) fluent-plugin-concat (2.5.0) fluentd (>= 0.14.0, < 2) - fluent-plugin-detect-exceptions (0.0.15) - fluentd (>= 0.10) + fluent-plugin-detect-exceptions (0.0.16) + fluentd (>= 1.14.2) fluent-plugin-grok-parser (2.6.2) fluentd (>= 0.14.6, < 2) fluent-plugin-json-in-json-2 (1.0.2) @@ -72,11 +72,11 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - json (2.7.2) + json (2.9.1) jsonpath (1.1.5) multi_json kubeclient (4.12.0) @@ -87,19 +87,23 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.4) lru_redux (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) - msgpack (1.7.2) + mime-types-data (3.2024.1203) + msgpack (1.7.5) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) + ostruct (0.6.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.2.2) + recursive-open-struct (1.3.1) + ostruct remote_syslog_sender (1.2.2) syslog_protocol rest-client (2.1.0) @@ -109,11 +113,13 @@ GEM netrc (~> 0.8) rexml (3.2.9) strscan - serverengine (2.3.2) + serverengine (2.4.0) + base64 (~> 0.1) + logger (~> 1.4) sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) - strscan (3.1.0) + strscan (3.1.2) syslog_protocol (0.9.2) systemd-journal (2.0.0) ffi (~> 1.9) @@ -121,7 +127,7 @@ GEM concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - webrick (1.8.1) + webrick (1.9.1) yajl-ruby (1.4.3) PLATFORMS diff --git a/docker-image/v1.16/debian-syslog/conf/kubernetes.conf b/docker-image/v1.16/debian-syslog/conf/kubernetes.conf index 29c0987a0..bbdd453d6 100644 --- a/docker-image/v1.16/debian-syslog/conf/kubernetes.conf +++ b/docker-image/v1.16/debian-syslog/conf/kubernetes.conf @@ -27,7 +27,7 @@ @type kubernetes_metadata @id filter_kube_metadata - kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}" + kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || (host = ENV.fetch('KUBERNETES_SERVICE_HOST'); port = ENV.fetch('KUBERNETES_SERVICE_PORT'); host = (IPAddr.new(host).ipv6? ? '[' + host + ']' : host rescue host); 'https://' + host + ':' + port + '/api')}" verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}" ca_file "#{ENV['KUBERNETES_CA_FILE']}" skip_labels "#{ENV['FLUENT_KUBERNETES_METADATA_SKIP_LABELS'] || 'false'}" diff --git a/docker-image/v1.16/debian-syslog/hooks/post_push b/docker-image/v1.16/debian-syslog/hooks/post_push index 4f1345808..db31094d5 100644 --- a/docker-image/v1.16/debian-syslog/hooks/post_push +++ b/docker-image/v1.16/debian-syslog/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image and manifest list for each additional tag -for tag in {v1.16.6-debian-syslog-amd64-1.2,v1.16-debian-syslog-amd64-2}; do +for tag in {v1.16.6-debian-syslog-amd64-1.3,v1.16-debian-syslog-amd64-2}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} # Note: this will fail until both the amd64 and arm64 images have been pushed