diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index a6c745a452e..57f7c563a9c 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -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) .
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
index 1c744faf0da..950c717851a 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/td-agent.conf
@@ -78,6 +78,22 @@
tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
+
+ type tail
+ format none
+ path /varlog/monit.log
+ pos_file /varlog/gcp-monit.log.pos
+ tag monit
+
+
+
+ type tail
+ format none
+ path /varlog/salt/minion
+ pos_file /varlog/gcp-salt.pos
+ tag salt
+
+
type tail
format none
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
index 344ddda2123..d257881212b 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -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.
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
index 07b0f84d9d3..a65f84666ad 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf
@@ -63,6 +63,22 @@
tag kubernetes.${tag_suffix[3].split('-')[0..-2].join('-')}
+
+ type tail
+ format none
+ path /varlog/monit.log
+ pos_file /varlog/gcp-monit.log.pos
+ tag monit
+
+
+
+ type tail
+ format none
+ path /varlog/salt/minion
+ pos_file /varlog/gcp-salt.pos
+ tag salt
+
+
type tail
format none
diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
index c758f431c86..a2075fd9278 100644
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -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
diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
index 3073e62d320..c6b1547af3a 100644
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -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
diff --git a/docs/getting-started-guides/logging.md b/docs/getting-started-guides/logging.md
index 646b741bdca..7062a0a09e1 100644
--- a/docs/getting-started-guides/logging.md
+++ b/docs/getting-started-guides/logging.md
@@ -169,7 +169,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