Merge branch 'master' into issue/6556

.gitignore

@@ -1,4 +1,5 @@
 .aws-config.json
+.ackrc
 .DS_Store
 .node_binaries
 node_modules

bin/kibana-plugin

@@ -0,0 +1,24 @@
+#!/bin/sh
+SCRIPT=$0
+
+# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
+while [ -h "$SCRIPT" ] ; do
+  ls=$(ls -ld "$SCRIPT")
+  # Drop everything prior to ->
+  link=$(expr "$ls" : '.*-> \(.*\)$')
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=$(dirname "$SCRIPT")/"$link"
+  fi
+done
+
+DIR="$(dirname "${SCRIPT}")/.."
+NODE="${DIR}/node/bin/node"
+test -x "$NODE" || NODE=$(which node)
+if [ ! -x "$NODE" ]; then
+  echo "unable to find usable node.js executable."
+  exit 1
+fi
+
+exec "${NODE}" $NODE_OPTIONS "${DIR}/src/cli_plugin" ${@}

bin/kibana-plugin.bat

@@ -0,0 +1,29 @@
+@echo off
+
+SETLOCAL
+
+set SCRIPT_DIR=%~dp0
+for %%I in ("%SCRIPT_DIR%..") do set DIR=%%~dpfI
+
+set NODE=%DIR%\node\node.exe
+
+WHERE /Q node
+IF %ERRORLEVEL% EQU 0 (
+  for /f "delims=" %%i in ('WHERE node') do set SYS_NODE=%%i
+)
+
+If Not Exist "%NODE%" (
+  IF Exist "%SYS_NODE%" (
+    set "NODE=%SYS_NODE%"
+  ) else (
+    Echo unable to find usable node.js executable.
+    Exit /B 1
+  )
+)
+
+TITLE Kibana Server
+"%NODE%" %NODE_OPTIONS% "%DIR%\src\cli_plugin" %*
+
+:finally
+
+ENDLOCAL

docs/index.asciidoc

@@ -5,6 +5,8 @@
 :shield: https://www.elastic.co/guide/en/shield/current
 :k4issue: https://github.com/elastic/kibana/issues/
 :k4pull: https://github.com/elastic/kibana/pull/
+:version: 5.0 alpha
+:esversion: 2.3
 
 include::introduction.asciidoc[]
 

docs/introduction.asciidoc

@@ -13,9 +13,10 @@ dashboards that display changes to Elasticsearch queries in real time.
 Setting up Kibana is a snap. You can install Kibana and start exploring your
 Elasticsearch indices in minutes -- no code, no additional infrastructure required. 
 
-NOTE: This guide describes how to use Kibana 4.3. For information about what's new
-in Kibana 4.3, see the <<releasenotes, release notes>>.
+NOTE: This guide describes how to use Kibana {version}. For information about what's new
+in Kibana {version}, see the <<releasenotes, release notes>>.
 
+////
 [float]
 [[data-discovery]]
 === Data Discovery and Visualization
@@ -50,6 +51,7 @@ to correlate related information. For example, we could create a dashboard
 that displays several visualizations of the TFL data:
 
 image:images/TFL-Dashboard.jpg[Dashboard]
+////
 
 For more information about creating and sharing visualizations and dashboards, see the <<visualize, Visualize>> 
 and <<dashboard, Dashboard>> topics. A complete <<getting-started,tutorial>> covering several aspects of Kibana's 

docs/plugins.asciidoc

@@ -5,6 +5,8 @@ Add-on functionality for Kibana is implemented with plug-in modules. You can use
 command to manage these modules. You can also install a plugin manually by moving the plugin file to the 
 `installedPlugins` directory and unpacking the plugin files into a new directory.
 
+A list of existing Kibana plugins is available on https://github.com/elastic/kibana/wiki/Known-Plugins[GitHub].
+
 [float]
 === Installing Plugins
 

docs/releasenotes.asciidoc

@@ -1,11 +1,7 @@
 [[releasenotes]]
-== Kibana 4.4 Release Notes
+== Kibana {version} Release Notes
 
-The 4.4 release of Kibana requires Elasticsearch 2.2 or later.
-
-Using event times to create index names is no longer supported as of this release. Current versions of Elasticsearch  
-include sophisticated date parsing APIs that Kibana uses to determine date information, removing the need to specify dates 
-in the index pattern name.
+The {version} release of Kibana requires Elasticsearch {esversion} or later.
 
 [float]
 [[enhancements]]

package.json

@@ -81,10 +81,10 @@
     "ansicolors": "0.3.2",
     "autoprefixer": "5.1.1",
     "autoprefixer-loader": "2.0.0",
-    "babel": "5.8.23",
-    "babel-core": "5.8.23",
+    "babel": "5.8.38",
+    "babel-core": "5.8.38",
     "babel-loader": "5.3.2",
-    "babel-runtime": "5.8.20",
+    "babel-runtime": "5.8.38",
     "bluebird": "2.9.34",
     "boom": "2.8.0",
     "bootstrap": "3.3.6",
@@ -135,6 +135,7 @@
     "style-loader": "0.12.3",
     "tar": "2.2.0",
     "url-loader": "0.5.6",
+    "validate-npm-package-name": "2.2.2",
     "webpack": "1.12.1",
     "webpack-directory-name-as-main": "1.0.0",
     "whatwg-fetch": "0.9.0",
@@ -170,7 +171,6 @@
     "karma-chrome-launcher": "0.2.0",
     "karma-coverage": "0.5.1",
     "karma-firefox-launcher": "0.1.6",
-    "karma-growl-reporter": "0.1.1",
     "karma-ie-launcher": "0.2.0",
     "karma-mocha": "0.2.0",
     "karma-safari-launcher": "0.1.1",

src/cli/cli.js

@@ -1,10 +1,10 @@
 import _ from 'lodash';
-
 import pkg from '../utils/package_json';
 import Command from './command';
+import serveCommand from './serve/serve';
 
-let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
-let program = new Command('bin/kibana');
+const argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
+const program = new Command('bin/kibana');
 
 program
 .version(pkg.version)
@@ -14,15 +14,14 @@ program
 );
 
 // attach commands
-require('./serve/serve')(program);
-require('./plugin/plugin')(program);
+serveCommand(program);
 
 program
 .command('help <command>')
 .description('Get the help for a specific command')
 .action(function (cmdName) {
-  var cmd = _.find(program.commands, { _name: cmdName });
-  if (!cmd) return this.error(`unknown command ${cmdName}`);
+  const cmd = _.find(program.commands, { _name: cmdName });
+  if (!cmd) return program.error(`unknown command ${cmdName}`);
   cmd.help();
 });
 
@@ -33,7 +32,7 @@ program
 });
 
 // check for no command name
-var subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
+const subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
 
 if (!subCommand) {
   if (_.intersection(argv.slice(2), ['-h', '--help']).length) {