Kubernetes Submit Queue fd1fd2a14c Merge pull request #34562 from Crassirostris/es-kibana-update ...

Automatic merge from submit-queue

Elasticsearch and Kibana update

```release-note
Updated Elasticsearch image from version 1.5.1 to version 2.4.1. Updated Kibana image from version 4.0.2 to version 4.6.1.
```

Updated es and kibana images. Made image versions match es/kibana versions they contain.

ref #19149

2016-10-17 03:04:33 -07:00

..

config

Update elasticsearch and kibana images

2016-10-16 16:01:38 +02:00

Dockerfile

Update elasticsearch and kibana images

2016-10-16 16:01:38 +02:00

elasticsearch_logging_discovery.go

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

Makefile

Merge pull request #34562 from Crassirostris/es-kibana-update

2016-10-17 03:04:33 -07:00

run.sh

Update elasticsearch and kibana images

2016-10-16 16:01:38 +02:00

template-k8s-logstash.json

Fixed #25127

2016-05-16 09:03:00 +08:00