diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
index 42cd434d952..72cb3686ac0 100644
--- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
@@ -22,6 +22,13 @@ spec:
       containers:
       - image: gcr.io/google_containers/elasticsearch:1.4
         name: elasticsearch-logging
+        livenessProbe:
+          name: es-liveness
+          httpGet:
+            path: /
+            port: 9200
+          initialDelaySeconds: 30
+          timeoutSeconds: 5          
         ports:
         - containerPort: 9200
           name: es-port
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
index 8d8ec059c6c..84ade5a27ea 100644
--- a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
+++ b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -22,6 +22,13 @@ spec:
       containers:
       - name: kibana-logging
         image: gcr.io/google_containers/kibana:1.3
+        livenessProbe:
+          name: kibana-liveness
+          httpGet:
+            path: /
+            port: 5601
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
         env:
           - name: "ELASTICSEARCH_URL"
             value: "http://elasticsearch-logging:9200"