Update elasticsearch logging to 5.6.4

I've picked the versions of everything used by the kubernetes
fluentd-elasticsearch plugin at https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml

addons/logging-elasticsearch/addon.yaml

@@ -13,3 +13,8 @@ spec:
       k8s-addon: logging-elasticsearch.addons.k8s.io
     manifest: v1.6.0.yaml
     kubernetesVersion: ">=1.6.0" # RBAC v1beta1 is introduced as of v1.6.0
+  - version: 1.7.0
+    selector:
+      k8s-addon: logging-elasticsearch.addons.k8s.io
+    manifest: v1.7.0.yaml
+    kubernetesVersion: ">=1.6.0"

addons/logging-elasticsearch/v1.7.0.yaml

@@ -101,14 +101,14 @@ metadata:
     k8s-addon: logging-elasticsearch.addons.k8s.io
     k8s-app: fluentd-es
     kubernetes.io/cluster-service: "true"
-    version: v1.22
+    version: v2.0.4
 spec:
   template:
     metadata:
       labels:
         k8s-app: fluentd-es
         kubernetes.io/cluster-service: "true"
-        version: v1.22
+        version: v2.0.4
     spec:
       serviceAccountName: fluentd-es
       containers:
@@ -185,7 +185,7 @@ spec:
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
-      - image: k8s.gcr.io/elasticsearch:v2.4.1-2
+      - image: k8s.gcr.io/elasticsearch:v5.6.4
         name: elasticsearch-logging
         resources:
           # need more cpu upon initialization, therefore burstable class
@@ -242,7 +242,7 @@ spec:
     spec:
       containers:
       - name: kibana-logging
-        image: k8s.gcr.io/kibana:v4.6.1-1
+        image: docker.elastic.co/kibana/kibana:5.6.4
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:
@@ -252,8 +252,12 @@ spec:
         env:
           - name: "ELASTICSEARCH_URL"
             value: "http://elasticsearch-logging:9200"
-          - name: "KIBANA_BASE_URL"
+          - name: "SERVER_BASEPATH"
             value: "/api/v1/proxy/namespaces/kube-system/services/kibana-logging"
+          - name: "XPACK_MONITORING_ENABLED"
+            value: "false"
+          - name: "XPACK_SECURITY_ENABLED"
+            value: "false"
         ports:
         - containerPort: 5601
           name: ui
@@ -277,4 +281,4 @@ spec:
     protocol: TCP
     targetPort: ui
   selector:
-    k8s-app: kibana-logging
+    k8s-app: kibana-logging