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

Fix fluentd config for ES backend #1247

Merged
merged 1 commit into from
Jun 18, 2018
Merged

Fix fluentd config for ES backend #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 0 additions & 19 deletions config/monitoring/150-elasticsearch-dev/100-fluentd-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ data:
# Add Kubernetes metadata
<filter kubernetes.**>
@type kubernetes_metadata
merge_json_log false # Don't parse json log
preserve_json_log false
</filter>
300.forward.input.conf: |-
# Takes the messages sent over TCP, e.g. request logs from Istio
Expand All @@ -59,23 +57,6 @@ data:
port 24224
</source>
900.output.conf: |-
# Parse json log before sending to Elastic Search
<filter **>
@type parser
key_name log
<parse>
@type multi_format
<pattern>
format json
time_key fluentd-time # fluentd-time is reserved for structured logs
time_format %Y-%m-%dT%H:%M:%S.%NZ
</pattern>
<pattern>
format none
message_key log
</pattern>
</parse>
</filter>
# Send to Elastic Search
<match **>
@id elasticsearch
Expand Down
19 changes: 0 additions & 19 deletions config/monitoring/150-elasticsearch-prod/100-fluentd-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ data:
# Add Kubernetes metadata
<filter kubernetes.**>
@type kubernetes_metadata
merge_json_log false # Don't parse json log
preserve_json_log false
</filter>
300.forward.input.conf: |-
# Takes the messages sent over TCP, e.g. request logs from Istio
Expand All @@ -59,23 +57,6 @@ data:
port 24224
</source>
900.output.conf: |-
# Parse json log before sending to Elastic Search
<filter **>
@type parser
key_name log
<parse>
@type multi_format
<pattern>
format json
time_key fluentd-time # fluentd-time is reserved for structured logs
time_format %Y-%m-%dT%H:%M:%S.%NZ
</pattern>
<pattern>
format none
message_key log
</pattern>
</parse>
</filter>
# Send to Elastic Search
<match **>
@id elasticsearch
Expand Down