github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

updated fluentd-es-image to use fluentd 1.1.0

Browse Source
This commit is contained in:
André Bauer 2018-01-19 17:20:30 +01:00
parent 5080ef24ce
commit e457d6c14b
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
View File

@ -21,6 +21,8 @@
FROM debian:stretch-slim FROM debian:stretch-slim
ARG DEBIAN_FRONTEND=noninteractive
COPY clean-apt /usr/bin COPY clean-apt /usr/bin
COPY clean-install /usr/bin COPY clean-install /usr/bin
COPY Gemfile /Gemfile COPY Gemfile /Gemfile

16
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
View File

@ -1,11 +1,11 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'fluentd', '~>0.12.32' gem 'fluentd', '<=1.1.0'
gem 'activesupport', '~>4.2.6' gem 'activesupport', '~>5.1.4'
gem 'fluent-plugin-kubernetes_metadata_filter', '~>0.27.0' gem 'fluent-plugin-kubernetes_metadata_filter', '~>1.0.0'
gem 'fluent-plugin-elasticsearch', '~>1.9.5' gem 'fluent-plugin-elasticsearch', '~>2.4.1'
gem 'fluent-plugin-systemd', '~>0.0.8' gem 'fluent-plugin-systemd', '~>0.3.1'
gem 'fluent-plugin-detect-exceptions', '~>0.0.8' gem 'fluent-plugin-detect-exceptions', git: 'https://github.com/monotek/fluent-plugin-detect-exceptions'
gem 'fluent-plugin-prometheus', '~>0.3.0' gem 'fluent-plugin-prometheus', '~>0.3.0'
gem 'fluent-plugin-multi-format-parser', '~>0.1.1' gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
gem 'oj', '~>2.18.1' gem 'oj', '~>3.3.1.0'

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -16,7 +16,7 @@
PREFIX = gcr.io/google-containers PREFIX = gcr.io/google-containers
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = v2.0.2 TAG = v2.0.4
build: build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/fluent.conf
View File

@ -2,7 +2,7 @@
# Do not collect fluentd's own logs to avoid infinite loops. # Do not collect fluentd's own logs to avoid infinite loops.
<match fluent.**> <match fluent.**>
type null @type null
</match> </match>
@include /etc/fluent/config.d/*.conf @include /etc/fluent/config.d/*.conf