-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PTRENG-6186 - Fix metrics documentation + upgrade fluentd to 1.17.0
- Loading branch information
Showing
7 changed files
with
163 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Dockerfile for bitnami/fluentd sidecar image with all the necessary plugins for our log analytic providers | ||
FROM bitnami/fluentd:1.16.3 | ||
FROM bitnami/fluentd:1.17.0 | ||
LABEL maintainer="Partner Engineering <[email protected]>" | ||
|
||
## Build time Arguments, short circuit them to ENV Variables so they are available at run time also | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,13 @@ | ||
# Dockerfile for bitnami/fluentd sidecar image with all the necessary plugins for our log analytic providers | ||
FROM bitnami/fluentd:1.16.3 | ||
FROM bitnami/fluentd:1.17.0 | ||
LABEL maintainer "Partner Engineering <[email protected]>" | ||
|
||
USER root | ||
|
||
##Uninstall elastic plugin which is preinstalled in bitnami fluentd | ||
##Pin elastic gem version to 7.14 | ||
RUN fluent-gem uninstall elasticsearch -a --ignore-dependencies \ | ||
&& fluent-gem install elasticsearch -v 7.14 --no-document \ | ||
## Install custom Fluentd plugins | ||
&& fluent-gem install fluent-plugin-jfrog-siem --no-document \ | ||
## Install custom Fluentd plugins | ||
RUN fluent-gem install fluent-plugin-jfrog-siem --no-document \ | ||
&& fluent-gem install fluent-plugin-splunk-hec --no-document \ | ||
&& fluent-gem install fluent-plugin-datadog --no-document \ | ||
&& fluent-gem install fluent-plugin-elasticsearch --no-document \ | ||
&& fluent-gem install fluent-plugin-record-modifier --no-document \ | ||
&& fluent-gem install fluent-plugin-jfrog-metrics --no-document \ | ||
&& fluent-gem install fluent-plugin-jfrog-send-metrics --no-document \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters