diff --git a/Makefile b/Makefile index 04d1ad988..8c3a640ef 100644 --- a/Makefile +++ b/Makefile @@ -12,44 +12,44 @@ IMAGE_NAME := fluent/fluentd-kubernetes X86_IMAGES := \ - v1.16/debian-azureblob:v1.16.5-debian-azureblob-amd64-1.3,v1.16-debian-azureblob-amd64-2 \ - v1.16/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-amd64-1.3,v1.16-debian-elasticsearch8-amd64-2 \ - v1.16/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-amd64-1.3,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ - v1.16/debian-opensearch:v1.16.5-debian-opensearch-amd64-1.3,v1.16-debian-opensearch-amd64-2 \ - v1.16/debian-loggly:v1.16.5-debian-loggly-amd64-1.3,v1.16-debian-loggly-amd64-2 \ - v1.16/debian-logentries:v1.16.5-debian-logentries-amd64-1.3,v1.16-debian-logentries-amd64-2 \ - v1.16/debian-cloudwatch:v1.16.5-debian-cloudwatch-amd64-1.3,v1.16-debian-cloudwatch-amd64-2 \ - v1.16/debian-s3:v1.16.5-debian-s3-amd64-1.3,v1.16-debian-s3-amd64-2 \ - v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.3,v1.16-debian-syslog-amd64-2 \ - v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.3,v1.16-debian-forward-amd64-2 \ - v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.3,v1.16-debian-gcs-amd64-2 \ - v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.3,v1.16-debian-graylog-amd64-2 \ - v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.3,v1.16-debian-papertrail-amd64-2 \ - v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.3,v1.16-debian-logzio-amd64-2 \ - v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.3,v1.16-debian-kafka-amd64-2 \ - v1.16/debian-kafka2:v1.16.5-debian-kafka2-amd64-1.3,v1.16-debian-kafka2-amd64-2 \ - v1.16/debian-kinesis:v1.16.5-debian-kinesis-amd64-1.3,v1.16-debian-kinesis-amd64-2 + v1.16/debian-azureblob:v1.16.5-debian-azureblob-amd64-1.4,v1.16-debian-azureblob-amd64-2 \ + v1.16/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-amd64-1.4,v1.16-debian-elasticsearch8-amd64-2 \ + v1.16/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-amd64-1.4,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64 \ + v1.16/debian-opensearch:v1.16.5-debian-opensearch-amd64-1.4,v1.16-debian-opensearch-amd64-2 \ + v1.16/debian-loggly:v1.16.5-debian-loggly-amd64-1.4,v1.16-debian-loggly-amd64-2 \ + v1.16/debian-logentries:v1.16.5-debian-logentries-amd64-1.4,v1.16-debian-logentries-amd64-2 \ + v1.16/debian-cloudwatch:v1.16.5-debian-cloudwatch-amd64-1.4,v1.16-debian-cloudwatch-amd64-2 \ + v1.16/debian-s3:v1.16.5-debian-s3-amd64-1.4,v1.16-debian-s3-amd64-2 \ + v1.16/debian-syslog:v1.16.5-debian-syslog-amd64-1.4,v1.16-debian-syslog-amd64-2 \ + v1.16/debian-forward:v1.16.5-debian-forward-amd64-1.4,v1.16-debian-forward-amd64-2 \ + v1.16/debian-gcs:v1.16.5-debian-gcs-amd64-1.4,v1.16-debian-gcs-amd64-2 \ + v1.16/debian-graylog:v1.16.5-debian-graylog-amd64-1.4,v1.16-debian-graylog-amd64-2 \ + v1.16/debian-papertrail:v1.16.5-debian-papertrail-amd64-1.4,v1.16-debian-papertrail-amd64-2 \ + v1.16/debian-logzio:v1.16.5-debian-logzio-amd64-1.4,v1.16-debian-logzio-amd64-2 \ + v1.16/debian-kafka:v1.16.5-debian-kafka-amd64-1.4,v1.16-debian-kafka-amd64-2 \ + v1.16/debian-kafka2:v1.16.5-debian-kafka2-amd64-1.4,v1.16-debian-kafka2-amd64-2 \ + v1.16/debian-kinesis:v1.16.5-debian-kinesis-amd64-1.4,v1.16-debian-kinesis-amd64-2 # :,,,... ARM64_IMAGES := \ - v1.16/arm64/debian-azureblob:v1.16.5-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-arm64-2 \ - v1.16/arm64/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-arm64-1.3,v1.16-debian-elasticsearch8-arm64-2 \ - v1.16/arm64/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-arm64-1.3,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ - v1.16/arm64/debian-opensearch:v1.16.5-debian-opensearch-arm64-1.3,v1.16-debian-opensearch-arm64-2 \ - v1.16/arm64/debian-loggly:v1.16.5-debian-loggly-arm64-1.3,v1.16-debian-loggly-arm64-2 \ - v1.16/arm64/debian-logentries:v1.16.5-debian-logentries-arm64-1.3,v1.16-debian-logentries-arm64-2 \ - v1.16/arm64/debian-cloudwatch:v1.16.5-debian-cloudwatch-arm64-1.3,v1.16-debian-cloudwatch-arm64-2 \ - v1.16/arm64/debian-s3:v1.16.5-debian-s3-arm64-1.3,v1.16-debian-s3-arm64-2 \ - v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.3,v1.16-debian-syslog-arm64-2 \ - v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.3,v1.16-debian-forward-arm64-2 \ - v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.3,v1.16-debian-gcs-arm64-2 \ - v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.3,v1.16-debian-graylog-arm64-2 \ - v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.3,v1.16-debian-papertrail-arm64-2 \ - v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.3,v1.16-debian-logzio-arm64-2 \ - v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.3,v1.16-debian-kafka-arm64-2 \ - v1.16/arm64/debian-kafka2:v1.16.5-debian-kafka2-arm64-1.3,v1.16-debian-kafka2-arm64-2 \ - v1.16/arm64/debian-kinesis:v1.16.5-debian-kinesis-arm64-1.3,v1.16-debian-kinesis-arm64-2 + v1.16/arm64/debian-azureblob:v1.16.5-debian-azureblob-arm64-1.4,v1.16-debian-azureblob-arm64-2 \ + v1.16/arm64/debian-elasticsearch8:v1.16.5-debian-elasticsearch8-arm64-1.4,v1.16-debian-elasticsearch8-arm64-2 \ + v1.16/arm64/debian-elasticsearch7:v1.16.5-debian-elasticsearch7-arm64-1.4,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64 \ + v1.16/arm64/debian-opensearch:v1.16.5-debian-opensearch-arm64-1.4,v1.16-debian-opensearch-arm64-2 \ + v1.16/arm64/debian-loggly:v1.16.5-debian-loggly-arm64-1.4,v1.16-debian-loggly-arm64-2 \ + v1.16/arm64/debian-logentries:v1.16.5-debian-logentries-arm64-1.4,v1.16-debian-logentries-arm64-2 \ + v1.16/arm64/debian-cloudwatch:v1.16.5-debian-cloudwatch-arm64-1.4,v1.16-debian-cloudwatch-arm64-2 \ + v1.16/arm64/debian-s3:v1.16.5-debian-s3-arm64-1.4,v1.16-debian-s3-arm64-2 \ + v1.16/arm64/debian-syslog:v1.16.5-debian-syslog-arm64-1.4,v1.16-debian-syslog-arm64-2 \ + v1.16/arm64/debian-forward:v1.16.5-debian-forward-arm64-1.4,v1.16-debian-forward-arm64-2 \ + v1.16/arm64/debian-gcs:v1.16.5-debian-gcs-arm64-1.4,v1.16-debian-gcs-arm64-2 \ + v1.16/arm64/debian-graylog:v1.16.5-debian-graylog-arm64-1.4,v1.16-debian-graylog-arm64-2 \ + v1.16/arm64/debian-papertrail:v1.16.5-debian-papertrail-arm64-1.4,v1.16-debian-papertrail-arm64-2 \ + v1.16/arm64/debian-logzio:v1.16.5-debian-logzio-arm64-1.4,v1.16-debian-logzio-arm64-2 \ + v1.16/arm64/debian-kafka:v1.16.5-debian-kafka-arm64-1.4,v1.16-debian-kafka-arm64-2 \ + v1.16/arm64/debian-kafka2:v1.16.5-debian-kafka2-arm64-1.4,v1.16-debian-kafka2-arm64-2 \ + v1.16/arm64/debian-kinesis:v1.16.5-debian-kinesis-arm64-1.4,v1.16-debian-kinesis-arm64-2 ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES) diff --git a/README.md b/README.md index 16e9a522f..5da5698e2 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.5-debian-azureblob-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-azureblob-2` - `Elasticsearch8` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-elasticsearch8-2` - `Elasticsearch7` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-1.4` - `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.5-debian-opensearch-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-opensearch-2` - `Cloudwatch` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-cloudwatch-2` - `Forward` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-forward-2` - `Gcs` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-gcs-2` - `Graylog` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-graylog-2` - `Kafka` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka-2` - `Kafka2` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-1.4` - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16-debian-kafka2-2` - `Kinesis` - - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-1.4` - `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.5-debian-azureblob-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-amd64-1.4` - `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.5-debian-elasticsearch8-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-amd64-1.4` - `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.5-debian-elasticsearch7-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-amd64-1.4` - `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.5-debian-opensearch-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-amd64-1.4` - `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.5-debian-loggly-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-loggly-amd64-1.4` - `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.5-debian-logentries-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logentries-amd64-1.4` - `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.5-debian-cloudwatch-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-amd64-1.4` - `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.5-debian-s3-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-s3-amd64-1.4` - `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.5-debian-forward-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-amd64-1.4` - `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.5-debian-gcs-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-amd64-1.4` - `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.5-debian-graylog-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-amd64-1.4` - `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.5-debian-logzio-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-logzio-amd64-1.4` - `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.5-debian-kafka-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-amd64-1.4` - `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.5-debian-kafka2-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-amd64-1.4` - `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.5-debian-kinesis-amd64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-amd64-1.4` - `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.5-debian-azureblob-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-azureblob-arm64-1.4` - `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.5-debian-elasticsearch8-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch8-arm64-1.4` - `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.5-debian-elasticsearch7-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-elasticsearch7-arm64-1.4` - `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.5-debian-opensearch-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-opensearch-arm64-1.4` - `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.5-debian-cloudwatch-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-cloudwatch-arm64-1.4` - `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.5-debian-forward-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-forward-arm64-1.4` - `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.5-debian-gcs-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-gcs-arm64-1.4` - `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.5-debian-graylog-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-graylog-arm64-1.4` - `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.5-debian-kafka-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka-arm64-1.4` - `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.5-debian-kafka2-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kafka2-arm64-1.4` - `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.5-debian-kinesis-arm64-1.3` + - `docker pull fluent/fluentd-kubernetes-daemonset:v1.16.5-debian-kinesis-arm64-1.4` - `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 9b66c4568..51c2c9f78 100644 --- a/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-azureblob/Gemfile.lock @@ -12,7 +12,7 @@ GEM net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cool.io (1.8.1) domain_name (0.6.20240107) @@ -34,7 +34,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -114,7 +114,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -122,14 +122,14 @@ GEM net-http-persistent (4.0.2) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) - racc (1.8.0) + public_suffix (6.0.1) + racc (1.8.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 02644af67..ae37ae266 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.5-debian-azureblob-arm64-1.3,v1.16-debian-azureblob-arm64-2}; do +for tag in {v1.16.5-debian-azureblob-arm64-1.4,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 2e20422ce..e9252ec04 100644 --- a/docker-image/v1.16/arm64/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-cloudwatch/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.956.0) - aws-sdk-cloudwatchlogs (1.87.0) + aws-partitions (1.963.0) + aws-sdk-cloudwatchlogs (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.201.1) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -93,14 +93,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 d97d1fa2b..4fe8039b7 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.5-debian-cloudwatch-arm64-1.3,v1.16-debian-cloudwatch-arm64-2}; do +for tag in {v1.16.5-debian-cloudwatch-arm64-1.4,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 45c1cc4eb..8b3dca5b9 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch7/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) elasticsearch (7.17.11) @@ -37,7 +37,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -119,7 +119,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.4.1) @@ -127,7 +127,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 0bf96d948..373597e3d 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.5-debian-elasticsearch7-arm64-1.3,v1.16-debian-elasticsearch7-arm64-2,v1-debian-elasticsearch-arm64}; do +for tag in {v1.16.5-debian-elasticsearch7-arm64-1.4,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 df696130b..662dfeec9 100644 --- a/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-elasticsearch8/Gemfile.lock @@ -4,25 +4,25 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) elastic-transport (8.3.5) faraday (< 3) multi_json - elasticsearch (8.14.0) + elasticsearch (8.15.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.14.0) - elasticsearch-api (8.14.0) + elasticsearch-api (= 8.15.0) + elasticsearch-api (8.15.0) multi_json excon (0.111.0) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -103,7 +103,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -112,7 +112,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 85eab760f..61231945b 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.5-debian-elasticsearch8-arm64-1.3,v1.16-debian-elasticsearch8-arm64-2}; do +for tag in {v1.16.5-debian-elasticsearch8-arm64-1.4,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 3a057961b..9baa65215 100644 --- a/docker-image/v1.16/arm64/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-forward/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -77,14 +77,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 17ef5be0f..1ec36a054 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.5-debian-forward-arm64-1.3,v1.16-debian-forward-arm64-2}; do +for tag in {v1.16.5-debian-forward-arm64-1.4,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 0a4aca427..f6570f381 100644 --- a/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-gcs/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -64,19 +64,19 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-apis-core (0.15.0) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) - httpclient (>= 2.8.1, < 3.a) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml google-apis-iamcredentials_v1 (0.21.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.40.0) + google-apis-storage_v1 (0.42.0) google-apis-core (>= 0.15.0, < 2.a) - google-cloud-core (1.7.0) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (2.1.1) @@ -126,10 +126,11 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_mime (1.1.5) msgpack (1.7.2) multi_json (1.15.0) + mutex_m (0.2.0) net-http (0.4.1) uri netrc (0.11.0) @@ -137,7 +138,7 @@ GEM os (1.1.4) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) representable (3.2.0) 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 49b47de1a..659647362 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.5-debian-gcs-arm64-1.3,v1.16-debian-gcs-arm64-2}; do +for tag in {v1.16.5-debian-gcs-arm64-1.4,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 5816f6d5a..88dbfba93 100644 --- a/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-graylog/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -83,14 +83,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 a5ef7c9b7..e9ea61221 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.5-debian-graylog-arm64-1.3,v1.16-debian-graylog-arm64-2}; do +for tag in {v1.16.5-debian-graylog-arm64-1.4,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/Dockerfile b/docker-image/v1.16/arm64/debian-kafka/Dockerfile index 4d3f9c450..26193740e 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka/Dockerfile @@ -21,7 +21,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.2.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev" \ runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ diff --git a/docker-image/v1.16/arm64/debian-kafka/Gemfile b/docker-image/v1.16/arm64/debian-kafka/Gemfile index c18564fc5..dabdf9f88 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile @@ -15,11 +15,11 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" gem "fluent-plugin-systemd", "~> 1.0.5" diff --git a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock index f9c4fc4de..86fd2e905 100644 --- a/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka/Gemfile.lock @@ -3,10 +3,10 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - avro (1.11.3) + avro (1.12.0) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -29,7 +29,7 @@ GEM fluent-plugin-json-in-json-2 (1.0.2) fluentd (>= 0.14.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-kafka (0.19.2) + fluent-plugin-kafka (0.19.3) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) @@ -92,7 +92,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -100,9 +100,9 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) - rdkafka (0.11.1) + rdkafka (0.17.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) @@ -119,7 +119,7 @@ GEM serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) - snappy (0.0.17) + snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) systemd-journal (1.4.2) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-detect-exceptions (~> 0.0.13) fluent-plugin-grok-parser (~> 2.6.2) fluent-plugin-json-in-json-2 (>= 1.0.2) - fluent-plugin-kafka (~> 0.19.0) + fluent-plugin-kafka (~> 0.19.3) fluent-plugin-kubernetes_metadata_filter (~> 3.4.0) fluent-plugin-multi-format-parser (~> 1.0.0) fluent-plugin-parser-avro (~> 0.3.1) @@ -152,9 +152,9 @@ DEPENDENCIES fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) oj (~> 3.15.0) - rdkafka (~> 0.11.1) + rdkafka (~> 0.17.0) rexml (~> 3.2.5) - snappy (~> 0.0.15) + snappy (~> 0.4.0) BUNDLED WITH 2.4.19 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 0825b2162..a6807b821 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.5-debian-kafka-arm64-1.3,v1.16-debian-kafka-arm64-2}; do +for tag in {v1.16.5-debian-kafka-arm64-1.4,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/Dockerfile b/docker-image/v1.16/arm64/debian-kafka2/Dockerfile index 4d3f9c450..26193740e 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/arm64/debian-kafka2/Dockerfile @@ -21,7 +21,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.2.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev" \ runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ diff --git a/docker-image/v1.16/arm64/debian-kafka2/Gemfile b/docker-image/v1.16/arm64/debian-kafka2/Gemfile index c18564fc5..dabdf9f88 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile @@ -15,11 +15,11 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" gem "fluent-plugin-systemd", "~> 1.0.5" diff --git a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock index f9c4fc4de..86fd2e905 100644 --- a/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kafka2/Gemfile.lock @@ -3,10 +3,10 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - avro (1.11.3) + avro (1.12.0) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -29,7 +29,7 @@ GEM fluent-plugin-json-in-json-2 (1.0.2) fluentd (>= 0.14.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-kafka (0.19.2) + fluent-plugin-kafka (0.19.3) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) @@ -92,7 +92,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -100,9 +100,9 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) - rdkafka (0.11.1) + rdkafka (0.17.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) @@ -119,7 +119,7 @@ GEM serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) - snappy (0.0.17) + snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) systemd-journal (1.4.2) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-detect-exceptions (~> 0.0.13) fluent-plugin-grok-parser (~> 2.6.2) fluent-plugin-json-in-json-2 (>= 1.0.2) - fluent-plugin-kafka (~> 0.19.0) + fluent-plugin-kafka (~> 0.19.3) fluent-plugin-kubernetes_metadata_filter (~> 3.4.0) fluent-plugin-multi-format-parser (~> 1.0.0) fluent-plugin-parser-avro (~> 0.3.1) @@ -152,9 +152,9 @@ DEPENDENCIES fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) oj (~> 3.15.0) - rdkafka (~> 0.11.1) + rdkafka (~> 0.17.0) rexml (~> 3.2.5) - snappy (~> 0.0.15) + snappy (~> 0.4.0) BUNDLED WITH 2.4.19 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 967314341..dbc98e958 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.5-debian-kafka2-arm64-1.3,v1.16-debian-kafka2-arm64-2}; do +for tag in {v1.16.5-debian-kafka2-arm64-1.4,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 c671ad901..606c84201 100644 --- a/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-kinesis/Gemfile.lock @@ -4,22 +4,22 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.75.0) + aws-sdk-firehose (1.76.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.62.0) + aws-sdk-kinesis (1.63.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -73,7 +73,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-protobuf (3.25.3) + google-protobuf (3.25.4) http (5.2.0) addressable (~> 2.8) base64 (~> 0.1) @@ -99,14 +99,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 9218681fd..c0fc959d6 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.5-debian-kinesis-arm64-1.3,v1.16-debian-kinesis-arm64-2}; do +for tag in {v1.16.5-debian-kinesis-arm64-1.4,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 3a057961b..9baa65215 100644 --- a/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logentries/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -77,14 +77,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 d42f1767b..45967041e 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.5-debian-logentries-arm64-1.3,v1.16-debian-logentries-arm64-2}; do +for tag in {v1.16.5-debian-logentries-arm64-1.4,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 6f7c69caf..0d062e027 100644 --- a/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-loggly/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -80,7 +80,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (2.9.4) @@ -88,7 +88,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 44e54148e..3f956b1b2 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.5-debian-loggly-arm64-1.3,v1.16-debian-loggly-arm64-2}; do +for tag in {v1.16.5-debian-loggly-arm64-1.4,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 8cdb09d27..3a525de0d 100644 --- a/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-logzio/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cool.io (1.8.1) domain_name (0.6.20240107) @@ -82,7 +82,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (4.0.2) @@ -91,7 +91,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 231db38e9..8e8cbb1ba 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.5-debian-logzio-arm64-1.3,v1.16-debian-logzio-arm64-2}; do +for tag in {v1.16.5-debian-logzio-arm64-1.4,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 0151d9afc..5d23e95ad 100644 --- a/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-opensearch/Gemfile.lock @@ -4,26 +4,26 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) excon (0.111.0) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) @@ -108,7 +108,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -120,7 +120,7 @@ GEM multi_json (>= 1.0) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 cb87d2c1b..c7df3de9f 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.5-debian-opensearch-arm64-1.3,v1.16-debian-opensearch-arm64-2}; do +for tag in {v1.16.5-debian-opensearch-arm64-1.4,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 8c0a4d2f6..6055d7405 100644 --- a/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-papertrail/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -83,14 +83,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 be9bcd169..a42ab8834 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.5-debian-papertrail-arm64-1.3,v1.16-debian-papertrail-arm64-2}; do +for tag in {v1.16.5-debian-papertrail-arm64-1.4,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 01f52b500..8d580dd19 100644 --- a/docker-image/v1.16/arm64/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-s3/Gemfile.lock @@ -4,8 +4,8 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -13,17 +13,17 @@ GEM aws-sdk-kms (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.156.0) + aws-sdk-s3 (1.157.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sdk-sqs (1.80.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -101,14 +101,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) 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 09c880b60..ed68719a9 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.5-debian-s3-arm64-1.3,v1.16-debian-s3-arm64-2}; do +for tag in {v1.16.5-debian-s3-arm64-1.4,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 de091e8f9..6d5ac74a0 100644 --- a/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/arm64/debian-syslog/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -80,14 +80,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) remote_syslog_sender (1.2.2) 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 d0349d268..7b5e48733 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.5-debian-syslog-arm64-1.3,v1.16-debian-syslog-arm64-2}; do +for tag in {v1.16.5-debian-syslog-arm64-1.4,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 9b66c4568..51c2c9f78 100644 --- a/docker-image/v1.16/debian-azureblob/Gemfile.lock +++ b/docker-image/v1.16/debian-azureblob/Gemfile.lock @@ -12,7 +12,7 @@ GEM net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cool.io (1.8.1) domain_name (0.6.20240107) @@ -34,7 +34,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -114,7 +114,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -122,14 +122,14 @@ GEM net-http-persistent (4.0.2) connection_pool (~> 2.2) netrc (0.11.0) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) - racc (1.8.0) + public_suffix (6.0.1) + racc (1.8.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-azureblob/hooks/post_push b/docker-image/v1.16/debian-azureblob/hooks/post_push index 077eab031..73e2cc073 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.5-debian-azureblob-amd64-1.3,v1.16-debian-azureblob-amd64-2}; do +for tag in {v1.16.5-debian-azureblob-amd64-1.4,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 2e20422ce..e9252ec04 100644 --- a/docker-image/v1.16/debian-cloudwatch/Gemfile.lock +++ b/docker-image/v1.16/debian-cloudwatch/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.956.0) - aws-sdk-cloudwatchlogs (1.87.0) + aws-partitions (1.963.0) + aws-sdk-cloudwatchlogs (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.201.1) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -93,14 +93,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-cloudwatch/hooks/post_push b/docker-image/v1.16/debian-cloudwatch/hooks/post_push index 92a1990d1..c6d8c4320 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.5-debian-cloudwatch-amd64-1.3,v1.16-debian-cloudwatch-amd64-2}; do +for tag in {v1.16.5-debian-cloudwatch-amd64-1.4,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 45c1cc4eb..8b3dca5b9 100644 --- a/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch7/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) elasticsearch (7.17.11) @@ -37,7 +37,7 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) @@ -119,7 +119,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.4.1) @@ -127,7 +127,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-elasticsearch7/hooks/post_push b/docker-image/v1.16/debian-elasticsearch7/hooks/post_push index a0112b0fc..315cbdb43 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.5-debian-elasticsearch7-amd64-1.3,v1.16-debian-elasticsearch7-amd64-2,v1-debian-elasticsearch-amd64}; do +for tag in {v1.16.5-debian-elasticsearch7-amd64-1.4,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 df696130b..662dfeec9 100644 --- a/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock +++ b/docker-image/v1.16/debian-elasticsearch8/Gemfile.lock @@ -4,25 +4,25 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) elastic-transport (8.3.5) faraday (< 3) multi_json - elasticsearch (8.14.0) + elasticsearch (8.15.0) elastic-transport (~> 8.3) - elasticsearch-api (= 8.14.0) - elasticsearch-api (8.14.0) + elasticsearch-api (= 8.15.0) + elasticsearch-api (8.15.0) multi_json excon (0.111.0) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -103,7 +103,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -112,7 +112,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-elasticsearch8/hooks/post_push b/docker-image/v1.16/debian-elasticsearch8/hooks/post_push index 4d4ec0d10..8c0d72f83 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.5-debian-elasticsearch8-amd64-1.3,v1.16-debian-elasticsearch8-amd64-2}; do +for tag in {v1.16.5-debian-elasticsearch8-amd64-1.4,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 3a057961b..9baa65215 100644 --- a/docker-image/v1.16/debian-forward/Gemfile.lock +++ b/docker-image/v1.16/debian-forward/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -77,14 +77,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-forward/hooks/post_push b/docker-image/v1.16/debian-forward/hooks/post_push index 0773f4275..e66f13e35 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.5-debian-forward-amd64-1.3,v1.16-debian-forward-amd64-2}; do +for tag in {v1.16.5-debian-forward-amd64-1.4,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 0a4aca427..f6570f381 100644 --- a/docker-image/v1.16/debian-gcs/Gemfile.lock +++ b/docker-image/v1.16/debian-gcs/Gemfile.lock @@ -4,16 +4,16 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http ffi (1.17.0) ffi-compiler (1.3.2) @@ -64,19 +64,19 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-apis-core (0.15.0) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) - httpclient (>= 2.8.1, < 3.a) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml google-apis-iamcredentials_v1 (0.21.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.40.0) + google-apis-storage_v1 (0.42.0) google-apis-core (>= 0.15.0, < 2.a) - google-cloud-core (1.7.0) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (2.1.1) @@ -126,10 +126,11 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_mime (1.1.5) msgpack (1.7.2) multi_json (1.15.0) + mutex_m (0.2.0) net-http (0.4.1) uri netrc (0.11.0) @@ -137,7 +138,7 @@ GEM os (1.1.4) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) representable (3.2.0) diff --git a/docker-image/v1.16/debian-gcs/hooks/post_push b/docker-image/v1.16/debian-gcs/hooks/post_push index d64409f75..d487dc1b2 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.5-debian-gcs-amd64-1.3,v1.16-debian-gcs-amd64-2}; do +for tag in {v1.16.5-debian-gcs-amd64-1.4,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 5816f6d5a..88dbfba93 100644 --- a/docker-image/v1.16/debian-graylog/Gemfile.lock +++ b/docker-image/v1.16/debian-graylog/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -83,14 +83,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-graylog/hooks/post_push b/docker-image/v1.16/debian-graylog/hooks/post_push index bf2e82859..7c305c242 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.5-debian-graylog-amd64-1.3,v1.16-debian-graylog-amd64-2}; do +for tag in {v1.16.5-debian-graylog-amd64-1.4,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/Dockerfile b/docker-image/v1.16/debian-kafka/Dockerfile index 2b40f7fee..0d37b2760 100644 --- a/docker-image/v1.16/debian-kafka/Dockerfile +++ b/docker-image/v1.16/debian-kafka/Dockerfile @@ -13,7 +13,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.2.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev" \ runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ diff --git a/docker-image/v1.16/debian-kafka/Gemfile b/docker-image/v1.16/debian-kafka/Gemfile index c18564fc5..dabdf9f88 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile +++ b/docker-image/v1.16/debian-kafka/Gemfile @@ -15,11 +15,11 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" gem "fluent-plugin-systemd", "~> 1.0.5" diff --git a/docker-image/v1.16/debian-kafka/Gemfile.lock b/docker-image/v1.16/debian-kafka/Gemfile.lock index f9c4fc4de..86fd2e905 100644 --- a/docker-image/v1.16/debian-kafka/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka/Gemfile.lock @@ -3,10 +3,10 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - avro (1.11.3) + avro (1.12.0) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -29,7 +29,7 @@ GEM fluent-plugin-json-in-json-2 (1.0.2) fluentd (>= 0.14.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-kafka (0.19.2) + fluent-plugin-kafka (0.19.3) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) @@ -92,7 +92,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -100,9 +100,9 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) - rdkafka (0.11.1) + rdkafka (0.17.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) @@ -119,7 +119,7 @@ GEM serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) - snappy (0.0.17) + snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) systemd-journal (1.4.2) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-detect-exceptions (~> 0.0.13) fluent-plugin-grok-parser (~> 2.6.2) fluent-plugin-json-in-json-2 (>= 1.0.2) - fluent-plugin-kafka (~> 0.19.0) + fluent-plugin-kafka (~> 0.19.3) fluent-plugin-kubernetes_metadata_filter (~> 3.4.0) fluent-plugin-multi-format-parser (~> 1.0.0) fluent-plugin-parser-avro (~> 0.3.1) @@ -152,9 +152,9 @@ DEPENDENCIES fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) oj (~> 3.15.0) - rdkafka (~> 0.11.1) + rdkafka (~> 0.17.0) rexml (~> 3.2.5) - snappy (~> 0.0.15) + snappy (~> 0.4.0) BUNDLED WITH 2.4.19 diff --git a/docker-image/v1.16/debian-kafka/hooks/post_push b/docker-image/v1.16/debian-kafka/hooks/post_push index 47fa80c2f..7ef9edc65 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.5-debian-kafka-amd64-1.3,v1.16-debian-kafka-amd64-2}; do +for tag in {v1.16.5-debian-kafka-amd64-1.4,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/Dockerfile b/docker-image/v1.16/debian-kafka2/Dockerfile index 2b40f7fee..0d37b2760 100644 --- a/docker-image/v1.16/debian-kafka2/Dockerfile +++ b/docker-image/v1.16/debian-kafka2/Dockerfile @@ -13,7 +13,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.2.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev" \ runtimeDeps="krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2" \ && export DEBIAN_FRONTEND=noninteractive && apt-get update \ && apt-get upgrade -y \ diff --git a/docker-image/v1.16/debian-kafka2/Gemfile b/docker-image/v1.16/debian-kafka2/Gemfile index c18564fc5..dabdf9f88 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile +++ b/docker-image/v1.16/debian-kafka2/Gemfile @@ -15,11 +15,11 @@ gem "fluent-plugin-record-modifier", "~> 2.1.0" gem "fluent-plugin-detect-exceptions", "~> 0.0.13" gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0" gem "fluent-plugin-parser-cri", "~> 0.1.0" -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.4.0" gem "ffi" gem "fluent-plugin-systemd", "~> 1.0.5" diff --git a/docker-image/v1.16/debian-kafka2/Gemfile.lock b/docker-image/v1.16/debian-kafka2/Gemfile.lock index f9c4fc4de..86fd2e905 100644 --- a/docker-image/v1.16/debian-kafka2/Gemfile.lock +++ b/docker-image/v1.16/debian-kafka2/Gemfile.lock @@ -3,10 +3,10 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - avro (1.11.3) + avro (1.12.0) multi_json (~> 1.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -29,7 +29,7 @@ GEM fluent-plugin-json-in-json-2 (1.0.2) fluentd (>= 0.14.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-kafka (0.19.2) + fluent-plugin-kafka (0.19.3) fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) @@ -92,7 +92,7 @@ GEM ltsv (0.1.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) mini_portile2 (2.8.7) msgpack (1.7.2) multi_json (1.15.0) @@ -100,9 +100,9 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) - rdkafka (0.11.1) + rdkafka (0.17.0) ffi (~> 1.15) mini_portile2 (~> 2.6) rake (> 12) @@ -119,7 +119,7 @@ GEM serverengine (2.3.2) sigdump (~> 0.2.2) sigdump (0.2.5) - snappy (0.0.17) + snappy (0.4.0) strptime (0.2.5) strscan (3.1.0) systemd-journal (1.4.2) @@ -141,7 +141,7 @@ DEPENDENCIES fluent-plugin-detect-exceptions (~> 0.0.13) fluent-plugin-grok-parser (~> 2.6.2) fluent-plugin-json-in-json-2 (>= 1.0.2) - fluent-plugin-kafka (~> 0.19.0) + fluent-plugin-kafka (~> 0.19.3) fluent-plugin-kubernetes_metadata_filter (~> 3.4.0) fluent-plugin-multi-format-parser (~> 1.0.0) fluent-plugin-parser-avro (~> 0.3.1) @@ -152,9 +152,9 @@ DEPENDENCIES fluent-plugin-systemd (~> 1.0.5) fluentd (= 1.16.5) oj (~> 3.15.0) - rdkafka (~> 0.11.1) + rdkafka (~> 0.17.0) rexml (~> 3.2.5) - snappy (~> 0.0.15) + snappy (~> 0.4.0) BUNDLED WITH 2.4.19 diff --git a/docker-image/v1.16/debian-kafka2/hooks/post_push b/docker-image/v1.16/debian-kafka2/hooks/post_push index 1daaa4e9b..9682b3ecd 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.5-debian-kafka2-amd64-1.3,v1.16-debian-kafka2-amd64-2}; do +for tag in {v1.16.5-debian-kafka2-amd64-1.4,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 c671ad901..606c84201 100644 --- a/docker-image/v1.16/debian-kinesis/Gemfile.lock +++ b/docker-image/v1.16/debian-kinesis/Gemfile.lock @@ -4,22 +4,22 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.75.0) + aws-sdk-firehose (1.76.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.62.0) + aws-sdk-kinesis (1.63.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -73,7 +73,7 @@ GEM tzinfo-data (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-protobuf (3.25.3) + google-protobuf (3.25.4) http (5.2.0) addressable (~> 2.8) base64 (~> 0.1) @@ -99,14 +99,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-kinesis/hooks/post_push b/docker-image/v1.16/debian-kinesis/hooks/post_push index ef24c5ef7..0e4a78194 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.5-debian-kinesis-amd64-1.3,v1.16-debian-kinesis-amd64-2}; do +for tag in {v1.16.5-debian-kinesis-amd64-1.4,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 3a057961b..9baa65215 100644 --- a/docker-image/v1.16/debian-logentries/Gemfile.lock +++ b/docker-image/v1.16/debian-logentries/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -77,14 +77,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-logentries/hooks/post_push b/docker-image/v1.16/debian-logentries/hooks/post_push index eb13b3ef3..6c96c03b6 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.5-debian-logentries-amd64-1.3,v1.16-debian-logentries-amd64-2}; do +for tag in {v1.16.5-debian-logentries-amd64-1.4,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 6f7c69caf..0d062e027 100644 --- a/docker-image/v1.16/debian-loggly/Gemfile.lock +++ b/docker-image/v1.16/debian-loggly/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -80,7 +80,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (2.9.4) @@ -88,7 +88,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-loggly/hooks/post_push b/docker-image/v1.16/debian-loggly/hooks/post_push index 3936b7317..8a2f9b64a 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.5-debian-loggly-amd64-1.3,v1.16-debian-loggly-amd64-2}; do +for tag in {v1.16.5-debian-loggly-amd64-1.4,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 8cdb09d27..3a525de0d 100644 --- a/docker-image/v1.16/debian-logzio/Gemfile.lock +++ b/docker-image/v1.16/debian-logzio/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cool.io (1.8.1) domain_name (0.6.20240107) @@ -82,7 +82,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http-persistent (4.0.2) @@ -91,7 +91,7 @@ GEM oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-logzio/hooks/post_push b/docker-image/v1.16/debian-logzio/hooks/post_push index 1bc775825..998a056d3 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.5-debian-logzio-amd64-1.3,v1.16-debian-logzio-amd64-2}; do +for tag in {v1.16.5-debian-logzio-amd64-1.4,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 0151d9afc..5d23e95ad 100644 --- a/docker-image/v1.16/debian-opensearch/Gemfile.lock +++ b/docker-image/v1.16/debian-opensearch/Gemfile.lock @@ -4,26 +4,26 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) excon (0.111.0) - faraday (2.10.0) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) logger faraday-excon (2.1.0) excon (>= 0.27.4) faraday (~> 2.0) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) @@ -108,7 +108,7 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) net-http (0.4.1) @@ -120,7 +120,7 @@ GEM multi_json (>= 1.0) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-opensearch/hooks/post_push b/docker-image/v1.16/debian-opensearch/hooks/post_push index 5ee6cb7ce..dddf74578 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.5-debian-opensearch-amd64-1.3,v1.16-debian-opensearch-amd64-2}; do +for tag in {v1.16.5-debian-opensearch-amd64-1.4,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 8c0a4d2f6..6055d7405 100644 --- a/docker-image/v1.16/debian-papertrail/Gemfile.lock +++ b/docker-image/v1.16/debian-papertrail/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -83,14 +83,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-papertrail/hooks/post_push b/docker-image/v1.16/debian-papertrail/hooks/post_push index 880dff1f3..ec1c73259 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.5-debian-papertrail-amd64-1.3,v1.16-debian-papertrail-amd64-2}; do +for tag in {v1.16.5-debian-papertrail-amd64-1.4,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 01f52b500..8d580dd19 100644 --- a/docker-image/v1.16/debian-s3/Gemfile.lock +++ b/docker-image/v1.16/debian-s3/Gemfile.lock @@ -4,8 +4,8 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.956.0) - aws-sdk-core (3.201.1) + aws-partitions (1.963.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -13,17 +13,17 @@ GEM aws-sdk-kms (1.88.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.156.0) + aws-sdk-s3 (1.157.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sdk-sqs (1.80.0) aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -101,14 +101,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) rest-client (2.1.0) diff --git a/docker-image/v1.16/debian-s3/hooks/post_push b/docker-image/v1.16/debian-s3/hooks/post_push index 722d539b0..74383e515 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.5-debian-s3-amd64-1.3,v1.16-debian-s3-amd64-2}; do +for tag in {v1.16.5-debian-s3-amd64-1.4,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 de091e8f9..6d5ac74a0 100644 --- a/docker-image/v1.16/debian-syslog/Gemfile.lock +++ b/docker-image/v1.16/debian-syslog/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cool.io (1.8.1) domain_name (0.6.20240107) ffi (1.17.0) @@ -80,14 +80,14 @@ GEM lru_redux (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0702) + mime-types-data (3.2024.0806) msgpack (1.7.2) multi_json (1.15.0) netrc (0.11.0) oj (3.15.1) prometheus-client (4.2.3) base64 - public_suffix (6.0.0) + public_suffix (6.0.1) rake (13.2.1) recursive-open-struct (1.2.2) remote_syslog_sender (1.2.2) diff --git a/docker-image/v1.16/debian-syslog/hooks/post_push b/docker-image/v1.16/debian-syslog/hooks/post_push index c76f808f3..6ad2898bb 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.5-debian-syslog-amd64-1.3,v1.16-debian-syslog-amd64-2}; do +for tag in {v1.16.5-debian-syslog-amd64-1.4,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 diff --git a/templates/Dockerfile.erb b/templates/Dockerfile.erb index ae1b44285..f0b8968ed 100644 --- a/templates/Dockerfile.erb +++ b/templates/Dockerfile.erb @@ -29,7 +29,7 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/<%= ruby_version %>.0 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 COPY Gemfile* /fluentd/ -RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev<% if target == "graylog" %> build-essential patch zlib1g-dev liblzma-dev<% elsif target == "kafka" || target == "kafka2" %> build-essential autoconf automake libtool pkg-config libsasl2-dev<% elsif target == "s3" %> curl<% end %><% if requires_git %> git<% end %>" \ +RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev<% if target == "graylog" %> build-essential patch zlib1g-dev liblzma-dev<% elsif target == "kafka" || target == "kafka2" %> build-essential autoconf automake libtool pkg-config libsasl2-dev libssl-dev<% elsif target == "s3" %> curl<% end %><% if requires_git %> git<% end %>" \ runtimeDeps="<% if target == "kafka" || target == "kafka2" %>krb5-kdc libsasl2-modules-gssapi-mit libsasl2-2<% elsif target == "azureblob" %>pkg-config libxslt-dev libxml2-dev<% end %>" \ <% if target == "kafka" || target == "kafka2" %> && export DEBIAN_FRONTEND=noninteractive <% end %> && apt-get update \ && apt-get upgrade -y \ diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb index 1eb5ed4c3..a32a6d168 100644 --- a/templates/Gemfile.erb +++ b/templates/Gemfile.erb @@ -54,11 +54,11 @@ gem "fluent-plugin-papertrail", "~> 0.2.6" <% when "syslog" %> gem "fluent-plugin-remote_syslog" <% when "kafka", "kafka2" %> -gem "rdkafka", "~> 0.11.1" -gem "fluent-plugin-kafka", "~> 0.19.0" +gem "rdkafka", "~> 0.17.0" +gem "fluent-plugin-kafka", "~> 0.19.3" gem "fluent-plugin-avro", "~> 1.1.1" gem "fluent-plugin-parser-avro", "~> 0.3.1" -gem "snappy", "~> 0.0.15" +gem "snappy", "~> 0.4.0" <% when "kinesis" %> gem "fluent-plugin-kinesis", "~> 3.4.0" <% when "splunkhec" %>