Upgrading config version

kibana.yml

@@ -5,7 +5,15 @@ port: 5601
 host: "0.0.0.0"
 
 # The Elasticsearch instance to use for all your queries.
-elasticsearch: "http://localhost:9200"
+elasticsearch_url: "http://localhost:10200"
+
+# If your Elasticsearch is protected with basic auth:
+# elasticsearch_username: user
+# elasticsearch_password: pass
+
+# preserve_elasticsearch_host true will send the hostname specified in `elasticsearch`. If you set it to false,
+# then the host you use to connect to *this* Kibana instance will be sent.
+elasticsearch_preserve_host: true
 
 # Kibana uses an index in Elasticsearch to store saved searches, visualizations
 # and dashboards. It will create a new index if it doesn't already exist.
@@ -14,26 +22,26 @@ kibana_index: ".kibana"
 # The default application to load.
 default_app_id: "discover"
 
-# Time in seconds to wait for responses from the back end or elasticsearch.
-# Note this should always be higher than "shard_timeout".
+# Time in milliseconds to wait for responses from the back end or elasticsearch.
 # This must be > 0
-request_timeout: 60
+request_timeout: 500000
 
 # Time in milliseconds for Elasticsearch to wait for responses from shards.
-# Note this should always be lower than "request_timeout".
-# Set to 0 to disable (not recommended).
-shard_timeout: 30000
+# Set to 0 to disable.
+shard_timeout: 0
 
 # Set to false to have a complete disregard for the validity of the SSL
 # certificate.
 verify_ssl: true
 
+
 # Plugins that are included in the build, and no longer found in the plugins/ folder
 bundled_plugin_ids:
  - plugins/dashboard/index
  - plugins/discover/index
  - plugins/doc/index
  - plugins/kibana/index
+ - plugins/markdown_vis/index
  - plugins/metric_vis/index
  - plugins/settings/index
  - plugins/table_vis/index

run.sh

@@ -15,7 +15,7 @@ if [[ -z $ELASTICSEARCH_PORT ]]; then
   exit 1
 fi
 
-sed -i "/elasticsearch:/c\elasticsearch: \"http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT\"" /opt/kibana4/config/kibana.yml
+sed -i "/elasticsearch_url:/c\elasticsearch_url: \"http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT\"" /opt/kibana4/config/kibana.yml
 sed -i "/port:/c\port: $KIBANA_PORT" /opt/kibana4/config/kibana.yml
 
 /opt/kibana4/bin/kibana