Skip to content
This repository was archived by the owner on Aug 17, 2023. It is now read-only.

Commit 900a31b

Browse files
author
Jonathan Chauncey
committed
feat(Dockerfile): upgrade fluentd and pin versions
* kubernetes metadata plugin to 0.25.3 * fluentd to 0.14.4 * nsq-ruby to 1.7.0 * elastic search to 1.6.0
1 parent f3b394b commit 900a31b

4 files changed

Lines changed: 5 additions & 14 deletions

File tree

manifests/deis-logger-fluentd-daemon.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ spec:
2222
- name: deis-logger-fluentd
2323
image: quay.io/deisci/fluentd:canary
2424
imagePullPolicy: Always
25-
securityContext:
26-
privileged: true
2725
volumeMounts:
2826
- name: varlog
2927
mountPath: /var/log
@@ -33,10 +31,6 @@ spec:
3331
env:
3432
- name: DEBUG
3533
value: "true"
36-
- name: SYSLOG_HOST
37-
value: $(DEIS_LOGGER_SERVICE_HOST)
38-
- name: SYSLOG_PORT
39-
value: $(DEIS_LOGGER_SERVICE_PORT_TRANSPORT)
4034
volumes:
4135
- name: varlog
4236
hostPath:

rootfs/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ RUN apt-get update \
99
make \
1010
ruby \
1111
ruby-dev \
12-
&& export FLUENTD_VERSION=0.14.0 \
12+
&& export FLUENTD_VERSION=0.14.4 \
1313
&& gem install --no-document fluentd -v $FLUENTD_VERSION \
1414
&& gem install bundler \
1515
&& bundle install --gemfile=/opt/fluentd/deis-output/Gemfile \
1616
&& rake --rakefile=/opt/fluentd/deis-output/Rakefile build \
17-
&& fluent-gem install --no-document fluent-plugin-kubernetes_metadata_filter \
18-
&& fluent-gem install --no-document fluent-plugin-elasticsearch \
17+
&& fluent-gem install --no-document fluent-plugin-kubernetes_metadata_filter -v 0.25.3 \
18+
&& fluent-gem install --no-document fluent-plugin-elasticsearch -v 1.6.0 \
1919
&& fluent-gem install --no-document fluent-plugin-remote_syslog -v 0.3.2 \
20-
&& fluent-gem install --no-document fluent-plugin-sumologic-mattk42 -v 0.0.4\
20+
&& fluent-gem install --no-document fluent-plugin-sumologic-mattk42 -v 0.0.4 \
2121
&& fluent-gem install --no-document influxdb -v 0.3.2 \
22-
&& fluent-gem install --no-document nsq-ruby \
22+
&& fluent-gem install --no-document nsq-ruby -v 1.7.0 \
2323
&& fluent-gem install --local /opt/fluentd/deis-output/pkg/fluent-plugin-deis_output-0.1.0.gem \
2424
&& apt-get remove -y --auto-remove --purge \
2525
g++ \

rootfs/opt/fluentd/sbin/stores/elastic_search

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ then
1919
cat << EOF >> $FLUENTD_CONF
2020
<store>
2121
@type elasticsearch
22-
log_level warn
2322
include_tag_key true
2423
time_key time
2524
host ${ELASTICSEARCH_HOST}

rootfs/opt/fluentd/sbin/stores/syslog

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ cat << EOF >> $FLUENTD_CONF
1313
@type remote_syslog
1414
host $host
1515
port $port
16-
log_level warn
1716
</store>
1817
EOF
1918
fi
@@ -27,7 +26,6 @@ cat << EOF >> $FLUENTD_CONF
2726
@type remote_syslog
2827
host $SYSLOG_HOST
2928
port $SYSLOG_PORT
30-
log_level warn
3129
</store>
3230
EOF
3331
fi

0 commit comments

Comments
 (0)