Skip to content

Commit

Permalink
[es] upgrade to master
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger authored and spalger committed Jan 5, 2016
1 parent 797c709 commit be358d8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Kibana is an open source ([Apache Licensed](https://github.com/elastic/kibana/bl

## Requirements

- Elasticsearch version 2.2.0 or later
- Elasticsearch master
- Kibana binary package

## Installation
Expand Down
6 changes: 3 additions & 3 deletions docs/setup.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can set up Kibana and start exploring your Elasticsearch indices in minutes.
All you need is:

* Elasticsearch 2.1 or later
* Elasticsearch master
* A modern web browser - http://www.elastic.co/subscriptions/matrix#matrix_browsers[Supported Browsers].
* Information about your Elasticsearch installation:
** URL of the Elasticsearch instance you want to connect to.
Expand Down Expand Up @@ -82,8 +82,8 @@ simply be the name of a single index.
reads the index mapping to list all of the fields that contain a timestamp. If your index doesn't have time-based data,
disable the *Index contains time-based events* option.
+
WARNING: Using event times to create index names is *deprecated* in this release of Kibana. Support for this functionality
will be removed entirely in the next major Kibana release. Elasticsearch 2.1 includes sophisticated date parsing APIs that
WARNING: Using event times to create index names is *deprecated* in this release of Kibana. Support for this functionality
will be removed entirely in the next major Kibana release. Elasticsearch 2.1 includes sophisticated date parsing APIs that
Kibana uses to determine date information, removing the need to specify dates in the index pattern name.
+
. Click *Create* to add the index pattern. This first pattern is automatically configured as the default.
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/elasticsearch/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = function (kibana) {
key: Joi.string()
}).default(),
apiVersion: Joi.string().default('2.0'),
engineVersion: Joi.string().valid('^2.1.0').default('^2.1.0')
engineVersion: Joi.string().valid('^3.0.0').default('^3.0.0')
}).default();
},

Expand Down
2 changes: 1 addition & 1 deletion tasks/config/esvm.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = function (grunt) {

return {
options: {
branch: '2.1',
branch: 'master',
fresh: !grunt.option('esvm-no-fresh'),
config: {
network: {
Expand Down

0 comments on commit be358d8

Please sign in to comment.