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

Jump to bottom

Automated cherry pick of #12240 upstream release 1.0 #12244

Merged
merged 2 commits into from
Aug 5, 2015
Merged

Automated cherry pick of #12240 upstream release 1.0 #12244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
139d719
Collect more of the VM's log files (monit, salt) in fluentd-gcp.
a-robinson Aug 5, 2015
f4b61b0
Collect more of the VM's log files (monit, salt) in fluentd-es.
a-robinson Aug 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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
@@ -1,7 +1,7 @@
.PHONY: build push

IMAGE = fluentd-elasticsearch
TAG = 1.7
TAG = 1.8

build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
Expand Down
16 changes: 16 additions & 0 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 @@ -78,6 +78,22 @@
tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
</match>

<source>
type tail
format none
path /varlog/monit.log
pos_file /varlog/gcp-monit.log.pos
tag monit
</source>

<source>
type tail
format none
path /varlog/salt/minion
pos_file /varlog/gcp-salt.pos
tag salt
</source>

<source>
type tail
format none
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

.PHONY: kbuild kpush

TAG = 1.10
TAG = 1.11

# Rules for building the test image for deployment to Dockerhub with user kubernetes.

Expand Down
16 changes: 16 additions & 0 deletions cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,22 @@
tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
</match>

<source>
type tail
format none
path /varlog/monit.log
pos_file /varlog/gcp-monit.log.pos
tag monit
</source>

<source>
type tail
format none
path /varlog/salt/minion
pos_file /varlog/gcp-salt.pos
tag salt
</source>

<source>
type tail
format none
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
containers:
- name: fluentd-elasticsearch
image: gcr.io/google_containers/fluentd-elasticsearch:1.7
image: gcr.io/google_containers/fluentd-elasticsearch:1.8
resources:
limits:
cpu: 100m
Expand Down
2 changes: 1 addition & 1 deletion cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
containers:
- name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.10
image: gcr.io/google_containers/fluentd-gcp:1.11
resources:
limits:
cpu: 100m
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/logging.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ metadata:
spec:
containers:
- name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.10
image: gcr.io/google_containers/fluentd-gcp:1.11
resources:
limits:
cpu: 100m
Expand Down