Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup Dockerfile and remove Dockerfile-debian #82

Merged
merged 2 commits into from
Jul 19, 2019
Merged

Cleanup Dockerfile and remove Dockerfile-debian #82

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40f70d5
Cleanup Dockerfile and remove Dockerfile-debian
Jul 18, 2019
e111ceb
Set kubernetes_sumologic version; Fix test fluent.conf file
Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deploy/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ RUN apk add --no-cache --update --virtual .build-deps sudo build-base ruby-dev \
&& gem install lru_redux \
&& gem install snappy

# FluentD plugins from RubyGems
RUN gem install fluent-plugin-s3 -v 1.1.4 \
&& gem install fluent-plugin-systemd -v 0.3.1 \
&& gem install fluent-plugin-record-modifier \
Expand All @@ -26,9 +27,8 @@ RUN gem install fluent-plugin-s3 -v 1.1.4 \
&& gem install fluent-plugin-prometheus -v 1.1.0 \
&& gem install fluent-plugin-kubernetes_sumologic
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually, is this correct? Are we missing a version here? In fact, are we using this gem anywhere? This is https://github.com/SumoLogic/fluentd-kubernetes-sumologic, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed that, you are right. We should include the version explicitly. WE are using it

https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/master/deploy/kubernetes/fluentd-sumologic.yaml.tmpl#L179

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should use 2.4.1

Copy link
Contributor

@lei-sumo lei-sumo Jul 19, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we using this gem? This is the fluend daemonset which should be removed from here as we have fluentbit now.


RUN gem install fluent-plugin-sumologic_output \
&& gem install fluent-plugin-carbon-v2 \
&& gem install fluent-plugin-prometheus-format \
# FluentD plugins from this repository
RUN gem install fluent-plugin-prometheus-format \
&& gem install fluent-plugin-enhance-k8s-metadata \
&& gem install fluent-plugin-datapoint \
&& gem install fluent-plugin-rewrite-tag-filter \
Expand Down
34 changes: 0 additions & 34 deletions deploy/docker/Dockerfile-debian
View file
Open in desktop

This file was deleted.