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

Enable kubernetes_metadata by default for ELK stack #33584

Merged
merged 1 commit into from
Jan 11, 2017
Merged

Enable kubernetes_metadata by default for ELK stack #33584

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
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

PREFIX = gcr.io/google_containers
IMAGE = fluentd-elasticsearch
TAG = 1.20
TAG = 1.21

build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
Expand Down
7 changes: 3 additions & 4 deletions cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,9 @@
tag cluster-autoscaler
</source>

# Uncomment in a case of daemon-set usage
#<filter kubernetes.**>
# type kubernetes_metadata
#</filter>
<filter kubernetes.**>
type kubernetes_metadata
</filter>

<match **>
type elasticsearch
Expand Down