From b6b0e6134c18c2f7d7d508d68dad61ac9ba65d0a Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Thu, 9 Nov 2017 09:22:48 -0800
Subject: [PATCH 01/18] [UI Framework] Add isReadOnly prop to KuiCodeEditor.
 (#14804)

* Add isReadOnly prop to KuiCodeEditor.
* Place cursor at beginning of code editor if it's read-only.
* Surface prompt for isReadOnly mode. Only show cursor when the editor is focused.
---
 ui_framework/dist/ui_framework.css            |   4 +
 .../views/code_editor/code_editor_example.js  |  15 ++
 .../src/views/code_editor/read_only.js        |  27 +++
 .../__snapshots__/code_editor.test.js.snap    | 170 +++++++++++++++++-
 .../components/code_editor/_code_editor.scss  |  10 ++
 .../src/components/code_editor/code_editor.js | 106 ++++++++---
 .../code_editor/code_editor.test.js           |  81 +++++----
 7 files changed, 346 insertions(+), 67 deletions(-)
 create mode 100644 ui_framework/doc_site/src/views/code_editor/read_only.js

diff --git a/ui_framework/dist/ui_framework.css b/ui_framework/dist/ui_framework.css
index bd4e82c6b101d..a926f5382fb9b 100644
--- a/ui_framework/dist/ui_framework.css
+++ b/ui_framework/dist/ui_framework.css
@@ -688,6 +688,10 @@ input[type="button"] {
 
 .kuiCodeEditorWrapper {
   position: relative; }
+  .kuiCodeEditorWrapper .ace_hidden-cursors {
+    opacity: 0; }
+  .kuiCodeEditorWrapper.kuiCodeEditorWrapper-isEditing .ace_hidden-cursors {
+    opacity: 1; }
 
 .kuiCodeEditorKeyboardHint {
   position: absolute;
diff --git a/ui_framework/doc_site/src/views/code_editor/code_editor_example.js b/ui_framework/doc_site/src/views/code_editor/code_editor_example.js
index 35afd30f04473..e8af21a45ceb4 100644
--- a/ui_framework/doc_site/src/views/code_editor/code_editor_example.js
+++ b/ui_framework/doc_site/src/views/code_editor/code_editor_example.js
@@ -11,6 +11,9 @@ import {
 import CodeEditor from './code_editor';
 const codeEditorSource = require('!!raw-loader!./code_editor');
 
+import ReadOnly from './read_only';
+const readOnlySource = require('!!raw-loader!./read_only');
+
 export default props => (
   <GuidePage title={props.route.name}>
     <GuideSection
@@ -36,5 +39,17 @@ export default props => (
         <CodeEditor />
       </GuideDemo>
     </GuideSection>
+
+    <GuideSection
+      title="Read-only"
+      source={[{
+        type: GuideSectionTypes.JS,
+        code: readOnlySource,
+      }]}
+    >
+      <GuideDemo>
+        <ReadOnly />
+      </GuideDemo>
+    </GuideSection>
   </GuidePage>
 );
diff --git a/ui_framework/doc_site/src/views/code_editor/read_only.js b/ui_framework/doc_site/src/views/code_editor/read_only.js
new file mode 100644
index 0000000000000..5c455e5e89a60
--- /dev/null
+++ b/ui_framework/doc_site/src/views/code_editor/read_only.js
@@ -0,0 +1,27 @@
+import React, { Component } from 'react';
+
+import 'brace/mode/less';
+import 'brace/theme/github';
+
+import {
+  KuiCodeEditor
+} from '../../../../components';
+
+export default class extends Component {
+  state = {
+    value: '<p>This code is read only</p>'
+  };
+
+  render() {
+    return (
+      <KuiCodeEditor
+        mode="less"
+        theme="github"
+        width="100%"
+        value={this.state.value}
+        setOptions={{ fontSize: '14px' }}
+        isReadOnly
+      />
+    );
+  }
+}
diff --git a/ui_framework/src/components/code_editor/__snapshots__/code_editor.test.js.snap b/ui_framework/src/components/code_editor/__snapshots__/code_editor.test.js.snap
index c4faf3450cac8..971c88b219d5f 100644
--- a/ui_framework/src/components/code_editor/__snapshots__/code_editor.test.js.snap
+++ b/ui_framework/src/components/code_editor/__snapshots__/code_editor.test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`KuiCodeEditor hint element should be disabled when the ui ace box gains focus 1`] = `
+exports[`KuiCodeEditor behavior hint element should be disabled when the ui ace box gains focus 1`] = `
 <div
   className="kuiCodeEditorKeyboardHint kuiCodeEditorKeyboardHint-isInactive"
   data-test-subj="codeEditorHint"
@@ -13,17 +13,21 @@ exports[`KuiCodeEditor hint element should be disabled when the ui ace box gains
   <p
     className="kuiText kuiVerticalRhythmSmall"
   >
-    Press Enter to start editing.
+    Press Enter to start 
+    editing
+    .
   </p>
   <p
     className="kuiText kuiVerticalRhythmSmall"
   >
-    When you’re done, press Escape to stop editing.
+    When you’re done, press Escape to stop 
+    editing
+    .
   </p>
 </div>
 `;
 
-exports[`KuiCodeEditor hint element should be enabled when the ui ace box loses focus 1`] = `
+exports[`KuiCodeEditor behavior hint element should be enabled when the ui ace box loses focus 1`] = `
 <div
   className="kuiCodeEditorKeyboardHint"
   data-test-subj="codeEditorHint"
@@ -36,12 +40,16 @@ exports[`KuiCodeEditor hint element should be enabled when the ui ace box loses
   <p
     className="kuiText kuiVerticalRhythmSmall"
   >
-    Press Enter to start editing.
+    Press Enter to start 
+    editing
+    .
   </p>
   <p
     className="kuiText kuiVerticalRhythmSmall"
   >
-    When you’re done, press Escape to stop editing.
+    When you’re done, press Escape to stop 
+    editing
+    .
   </p>
 </div>
 `;
@@ -60,12 +68,28 @@ exports[`KuiCodeEditor is rendered 1`] = `
     <p
       class="kuiText kuiVerticalRhythmSmall"
     >
-      Press Enter to start editing.
+      <!-- react-text: 4 -->
+      Press Enter to start 
+      <!-- /react-text -->
+      <!-- react-text: 5 -->
+      editing
+      <!-- /react-text -->
+      <!-- react-text: 6 -->
+      .
+      <!-- /react-text -->
     </p>
     <p
       class="kuiText kuiVerticalRhythmSmall"
     >
-      When you’re done, press Escape to stop editing.
+      <!-- react-text: 8 -->
+      When you’re done, press Escape to stop 
+      <!-- /react-text -->
+      <!-- react-text: 9 -->
+      editing
+      <!-- /react-text -->
+      <!-- react-text: 10 -->
+      .
+      <!-- /react-text -->
     </p>
   </div>
   <div
@@ -158,3 +182,133 @@ exports[`KuiCodeEditor is rendered 1`] = `
   </div>
 </div>
 `;
+
+exports[`KuiCodeEditor props isReadOnly renders alternate hint text 1`] = `
+<div
+  class="kuiCodeEditorWrapper"
+>
+  <div
+    class="kuiCodeEditorKeyboardHint"
+    data-test-subj="codeEditorHint"
+    id="42"
+    role="button"
+    tabindex="0"
+  >
+    <p
+      class="kuiText kuiVerticalRhythmSmall"
+    >
+      <!-- react-text: 4 -->
+      Press Enter to start 
+      <!-- /react-text -->
+      <!-- react-text: 5 -->
+      interacting with the code
+      <!-- /react-text -->
+      <!-- react-text: 6 -->
+      .
+      <!-- /react-text -->
+    </p>
+    <p
+      class="kuiText kuiVerticalRhythmSmall"
+    >
+      <!-- react-text: 8 -->
+      When you’re done, press Escape to stop 
+      <!-- /react-text -->
+      <!-- react-text: 9 -->
+      interacting with the code
+      <!-- /react-text -->
+      <!-- react-text: 10 -->
+      .
+      <!-- /react-text -->
+    </p>
+  </div>
+  <div
+    class=" ace_editor ace-tm"
+    id="brace-editor"
+    style="width: 500px; height: 500px;"
+  >
+    <textarea
+      autocapitalize="off"
+      autocorrect="off"
+      class="ace_text-input"
+      spellcheck="false"
+      style="opacity: 0;"
+      tabindex="-1"
+      wrap="off"
+    />
+    <div
+      class="ace_gutter"
+    >
+      <div
+        class="ace_layer ace_gutter-layer ace_folding-enabled"
+      />
+      <div
+        class="ace_gutter-active-line"
+        style="display: none;"
+      />
+    </div>
+    <div
+      class="ace_scroller"
+    >
+      <div
+        class="ace_content"
+      >
+        <div
+          class="ace_layer ace_print-margin-layer"
+        >
+          <div
+            class="ace_print-margin"
+            style="left: 4px; visibility: visible;"
+          />
+        </div>
+        <div
+          class="ace_layer ace_marker-layer"
+        />
+        <div
+          class="ace_layer ace_text-layer"
+          style="padding: 0px 4px;"
+        />
+        <div
+          class="ace_layer ace_marker-layer"
+        />
+        <div
+          class="ace_layer ace_cursor-layer ace_hidden-cursors"
+        >
+          <div
+            class="ace_cursor"
+          />
+        </div>
+      </div>
+    </div>
+    <div
+      class="ace_scrollbar ace_scrollbar-v"
+      style="display: none; width: 20px;"
+    >
+      <div
+        class="ace_scrollbar-inner"
+        style="width: 20px;"
+      />
+    </div>
+    <div
+      class="ace_scrollbar ace_scrollbar-h"
+      style="display: none; height: 20px;"
+    >
+      <div
+        class="ace_scrollbar-inner"
+        style="height: 20px;"
+      />
+    </div>
+    <div
+      style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
+    >
+      <div
+        style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
+      />
+      <div
+        style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
+      >
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui_framework/src/components/code_editor/_code_editor.scss b/ui_framework/src/components/code_editor/_code_editor.scss
index bd246acc42223..880453440015a 100644
--- a/ui_framework/src/components/code_editor/_code_editor.scss
+++ b/ui_framework/src/components/code_editor/_code_editor.scss
@@ -1,5 +1,15 @@
 .kuiCodeEditorWrapper {
   position: relative;
+
+  .ace_hidden-cursors {
+    opacity: 0;
+  }
+
+  &.kuiCodeEditorWrapper-isEditing {
+    .ace_hidden-cursors {
+      opacity: 1;
+    }
+  }
 }
 
 .kuiCodeEditorKeyboardHint {
diff --git a/ui_framework/src/components/code_editor/code_editor.js b/ui_framework/src/components/code_editor/code_editor.js
index 5b8604693f0dd..b0ec265234c12 100644
--- a/ui_framework/src/components/code_editor/code_editor.js
+++ b/ui_framework/src/components/code_editor/code_editor.js
@@ -6,9 +6,9 @@ import AceEditor from 'react-ace';
 import { htmlIdGenerator, keyCodes } from '../../../services';
 
 export class KuiCodeEditor extends Component {
-
   state = {
-    isHintActive: true
+    isHintActive: true,
+    isEditing: false,
   };
 
   idGenerator = htmlIdGenerator();
@@ -30,6 +30,15 @@ export class KuiCodeEditor extends Component {
     }
   }
 
+  onFocusAce = (...args) => {
+    this.setState({
+      isEditing: true,
+    });
+    if (this.props.onFocus) {
+      this.props.onFocus(...args);
+    }
+  }
+
   onBlurAce = (...args) => {
     this.stopEditing();
     if (this.props.onBlur) {
@@ -45,12 +54,17 @@ export class KuiCodeEditor extends Component {
   };
 
   startEditing = () => {
-    this.setState({ isHintActive: false });
+    this.setState({
+      isHintActive: false,
+    });
     this.aceEditor.editor.textInput.focus();
   }
 
   stopEditing() {
-    this.setState({ isHintActive: true });
+    this.setState({
+      isHintActive: true,
+      isEditing: false,
+    });
   }
 
   render() {
@@ -58,42 +72,79 @@ export class KuiCodeEditor extends Component {
       width,
       height,
       onBlur, // eslint-disable-line no-unused-vars
+      isReadOnly,
+      setOptions,
+      cursorStart,
       ...rest,
     } = this.props;
 
-    const classes = classNames('kuiCodeEditorKeyboardHint', {
+    const classes = classNames('kuiCodeEditorWrapper', {
+      'kuiCodeEditorWrapper-isEditing': this.state.isEditing,
+    });
+
+    const promptClasses = classNames('kuiCodeEditorKeyboardHint', {
       'kuiCodeEditorKeyboardHint-isInactive': !this.state.isHintActive
     });
 
+    let filteredCursorStart;
+
+    const options = { ...setOptions };
+
+    if (isReadOnly) {
+      // Put the cursor at the beginning of the editor, so that it doesn't look like
+      // a prompt to begin typing.
+      filteredCursorStart = -1;
+
+      Object.assign(options, {
+        readOnly: true,
+        highlightActiveLine: false,
+        highlightGutterLine: false,
+      });
+    } else {
+      filteredCursorStart = cursorStart;
+    }
+
+    const activity =
+      isReadOnly
+      ? 'interacting with the code'
+      : 'editing';
+
+    const prompt = (
+      <div
+        className={promptClasses}
+        id={this.idGenerator('codeEditor')}
+        ref={(hint) => { this.editorHint = hint; }}
+        tabIndex="0"
+        role="button"
+        onClick={this.startEditing}
+        onKeyDown={this.onKeyDownHint}
+        data-test-subj="codeEditorHint"
+      >
+        <p className="kuiText kuiVerticalRhythmSmall">
+          Press Enter to start {activity}.
+        </p>
+
+        <p className="kuiText kuiVerticalRhythmSmall">
+          When you&rsquo;re done, press Escape to stop {activity}.
+        </p>
+      </div>
+    );
+
     return (
       <div
-        className="kuiCodeEditorWrapper"
+        className={classes}
         style={{ width, height }}
       >
-        <div
-          className={classes}
-          id={this.idGenerator('codeEditor')}
-          ref={(hint) => { this.editorHint = hint; }}
-          tabIndex="0"
-          role="button"
-          onClick={this.startEditing}
-          onKeyDown={this.onKeyDownHint}
-          data-test-subj="codeEditorHint"
-        >
-          <p className="kuiText kuiVerticalRhythmSmall">
-            Press Enter to start editing.
-          </p>
-
-          <p className="kuiText kuiVerticalRhythmSmall">
-            When you&rsquo;re done, press Escape to stop editing.
-          </p>
-        </div>
+        {prompt}
 
         <AceEditor
           ref={this.aceEditorRef}
           width={width}
           height={height}
+          onFocus={this.onFocusAce}
           onBlur={this.onBlurAce}
+          setOptions={options}
+          cursorStart={filteredCursorStart}
           {...rest}
         />
       </div>
@@ -105,4 +156,11 @@ KuiCodeEditor.propTypes = {
   width: PropTypes.string,
   height: PropTypes.string,
   onBlur: PropTypes.func,
+  isReadOnly: PropTypes.bool,
+  setOptions: PropTypes.object,
+  cursorStart: PropTypes.number,
+};
+
+KuiCodeEditor.defaultProps = {
+  setOptions: {},
 };
diff --git a/ui_framework/src/components/code_editor/code_editor.test.js b/ui_framework/src/components/code_editor/code_editor.test.js
index de9bd430d4b39..e204f4bf02edb 100644
--- a/ui_framework/src/components/code_editor/code_editor.test.js
+++ b/ui_framework/src/components/code_editor/code_editor.test.js
@@ -14,53 +14,64 @@ jest.mock('../../services/accessibility/html_id_generator', () => ({
 }));
 
 describe('KuiCodeEditor', () => {
-  let element;
-
-  beforeEach(() => {
-    element = mount(<KuiCodeEditor/>);
-  });
-
   test('is rendered', () => {
-    const component = mount(<KuiCodeEditor {...requiredProps}/>);
+    const component = mount(<KuiCodeEditor {...requiredProps} />);
     expect(takeMountedSnapshot(component)).toMatchSnapshot();
   });
 
-  describe('hint element', () => {
-    test('should be tabable', () => {
-      expect(element.find('[data-test-subj="codeEditorHint"]').prop('tabIndex')).toBe('0');
+  describe('props', () => {
+    describe('isReadOnly', () => {
+      test(`renders alternate hint text`, () => {
+        const component = mount(<KuiCodeEditor isReadOnly />);
+        expect(takeMountedSnapshot(component)).toMatchSnapshot();
+      });
     });
+  });
 
-    test('should be disabled when the ui ace box gains focus', () => {
-      const hint = element.find('[data-test-subj="codeEditorHint"]');
-      hint.simulate('keydown', { keyCode: keyCodes.ENTER });
-      expect(hint).toMatchSnapshot();
-    });
+  describe('behavior', () => {
+    let component;
 
-    test('should be enabled when the ui ace box loses focus', () => {
-      const hint = element.find('[data-test-subj="codeEditorHint"]');
-      hint.simulate('keydown', { keyCode: keyCodes.ENTER });
-      element.instance().onBlurAce();
-      expect(hint).toMatchSnapshot();
+    beforeEach(() => {
+      component = mount(<KuiCodeEditor/>);
     });
-  });
 
-  describe('interaction', () => {
-    test('bluring the ace textbox should call a passed onBlur prop', () => {
-      const blurSpy = sinon.spy();
-      const el = mount(<KuiCodeEditor onBlur={blurSpy}/>);
-      el.instance().onBlurAce();
-      expect(blurSpy.called).toBe(true);
+    describe('hint element', () => {
+      test('should be tabable', () => {
+        expect(component.find('[data-test-subj="codeEditorHint"]').prop('tabIndex')).toBe('0');
+      });
+
+      test('should be disabled when the ui ace box gains focus', () => {
+        const hint = component.find('[data-test-subj="codeEditorHint"]');
+        hint.simulate('keydown', { keyCode: keyCodes.ENTER });
+        expect(hint).toMatchSnapshot();
+      });
+
+      test('should be enabled when the ui ace box loses focus', () => {
+        const hint = component.find('[data-test-subj="codeEditorHint"]');
+        hint.simulate('keydown', { keyCode: keyCodes.ENTER });
+        component.instance().onBlurAce();
+        expect(hint).toMatchSnapshot();
+      });
     });
 
-    test('pressing escape in ace textbox will enable overlay', () => {
-      element.instance().onKeydownAce({
-        preventDefault: () => {},
-        stopPropagation: () => {},
-        keyCode: keyCodes.ESCAPE
+    describe('interaction', () => {
+      test('bluring the ace textbox should call a passed onBlur prop', () => {
+        const blurSpy = sinon.spy();
+        const el = mount(<KuiCodeEditor onBlur={blurSpy}/>);
+        el.instance().onBlurAce();
+        expect(blurSpy.called).toBe(true);
+      });
+
+      test('pressing escape in ace textbox will enable overlay', () => {
+        component.instance().onKeydownAce({
+          preventDefault: () => {},
+          stopPropagation: () => {},
+          keyCode: keyCodes.ESCAPE
+        });
+        expect(
+          component.find('[data-test-subj="codeEditorHint"]').matchesElement(document.activeElement)
+        ).toBe(true);
       });
-      expect(
-        element.find('[data-test-subj="codeEditorHint"]').matchesElement(document.activeElement)
-      ).toBe(true);
     });
   });
 });

From 6d4972869b73e1a6b8caa26ea1e0b00e13b5781d Mon Sep 17 00:00:00 2001
From: Stacey Gammon <gammon@elastic.co>
Date: Thu, 9 Nov 2017 14:23:14 -0500
Subject: [PATCH 02/18] Add new title query param to dashboard listing page
 (#14760)

* introduce a mechanism to load a dashboard by title is a single one is found, if not, to refill the search box on the listing page

* Make case insensitive and prevent listing page from "blipping" up on the screen before the redirect

* Add tests
---
 .../kibana/public/dashboard/index.js          | 28 ++++++-
 .../dashboard/listing/dashboard_listing.js    |  5 +-
 .../apps/dashboard/_dashboard_listing.js      | 82 ++++++++++++++++++-
 .../functional/page_objects/dashboard_page.js | 11 ++-
 4 files changed, 121 insertions(+), 5 deletions(-)

diff --git a/src/core_plugins/kibana/public/dashboard/index.js b/src/core_plugins/kibana/public/dashboard/index.js
index cc8036c96046e..c0ee5424b2552 100644
--- a/src/core_plugins/kibana/public/dashboard/index.js
+++ b/src/core_plugins/kibana/public/dashboard/index.js
@@ -12,6 +12,7 @@ import { DashboardListingController } from './listing/dashboard_listing';
 import { DashboardConstants, createDashboardEditUrl } from './dashboard_constants';
 import { SavedObjectNotFound } from 'ui/errors';
 import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
+import { SavedObjectsClientProvider } from 'ui/saved_objects';
 
 uiRoutes
   .defaults(/dashboard/, {
@@ -20,7 +21,32 @@ uiRoutes
   .when(DashboardConstants.LANDING_PAGE_PATH, {
     template: dashboardListingTemplate,
     controller: DashboardListingController,
-    controllerAs: 'listingController'
+    controllerAs: 'listingController',
+    resolve: {
+      dash: function ($route, Private, courier, kbnUrl) {
+        const savedObjectsClient = Private(SavedObjectsClientProvider);
+        const title = $route.current.params.title;
+        if (title) {
+          return savedObjectsClient.find({
+            search: `"${title}"`,
+            search_fields: 'title',
+            type: 'dashboard',
+          }).then(results => {
+            // The search isn't an exact match, lets see if we can find a single exact match to use
+            const matchingDashboards = results.savedObjects.filter(
+              dashboard => dashboard.attributes.title.toLowerCase() === title.toLowerCase());
+            if (matchingDashboards.length === 1) {
+              kbnUrl.redirect(createDashboardEditUrl(matchingDashboards[0].id));
+            } else {
+              kbnUrl.redirect(`${DashboardConstants.LANDING_PAGE_PATH}?filter="${title}"`);
+            }
+            throw uiRoutes.WAIT_FOR_URL_CHANGE_TOKEN;
+          }).catch(courier.redirectWhenMissing({
+            'dashboard': DashboardConstants.LANDING_PAGE_PATH
+          }));
+        }
+      }
+    }
   })
   .when(DashboardConstants.CREATE_NEW_DASHBOARD_URL, {
     template: dashboardTemplate,
diff --git a/src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js b/src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
index 876a55c46bfcb..0981f5d4aa3b6 100644
--- a/src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
+++ b/src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
@@ -5,7 +5,7 @@ import { DashboardConstants, createDashboardEditUrl } from '../dashboard_constan
 import { SortableProperties } from 'ui_framework/services';
 import { ConfirmationButtonTypes } from 'ui/modals';
 
-export function DashboardListingController($injector, $scope) {
+export function DashboardListingController($injector, $scope, $location) {
   const $filter = $injector.get('$filter');
   const confirmModal = $injector.get('confirmModal');
   const Notifier = $injector.get('Notifier');
@@ -69,7 +69,7 @@ export function DashboardListingController($injector, $scope) {
   this.isFetchingItems = false;
   this.items = [];
   this.pageOfItems = [];
-  this.filter = '';
+  this.filter = ($location.search()).filter || '';
 
   this.pager = pagerFactory.create(this.items.length, 20, 1);
 
@@ -78,6 +78,7 @@ export function DashboardListingController($injector, $scope) {
   $scope.$watch(() => this.filter, () => {
     deselectAll();
     fetchItems();
+    $location.search('filter', this.filter);
   });
   this.isAscending = (name) => sortableProperties.isAscendingByName(name);
   this.getSortedProperty = () => sortableProperties.getSortedProperty();
diff --git a/test/functional/apps/dashboard/_dashboard_listing.js b/test/functional/apps/dashboard/_dashboard_listing.js
index 6c45081496363..1e5ced4733fdf 100644
--- a/test/functional/apps/dashboard/_dashboard_listing.js
+++ b/test/functional/apps/dashboard/_dashboard_listing.js
@@ -1,7 +1,8 @@
 import expect from 'expect.js';
 
-export default function ({ getPageObjects }) {
+export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['dashboard', 'header', 'common']);
+  const remote = getService('remote');
 
   describe('dashboard listing page', function describeIndexTests() {
     const dashboardName = 'Dashboard Listing Test';
@@ -104,5 +105,84 @@ export default function ({ getPageObjects }) {
         expect(countOfDashboards).to.equal(1);
       });
     });
+
+    describe('search by title', function () {
+      it('loads a dashboard if title matches', async function () {
+        const currentUrl = await remote.getCurrentUrl();
+        const newUrl = currentUrl + '&title=Two%20Words';
+        // Only works on a hard refresh.
+        const useTimeStamp = true;
+        await remote.get(newUrl.toString(), useTimeStamp);
+
+        const onDashboardLandingPage = await PageObjects.dashboard.onDashboardLandingPage();
+        expect(onDashboardLandingPage).to.equal(false);
+      });
+
+      it('title match is case insensitive', async function () {
+        await PageObjects.dashboard.gotoDashboardLandingPage();
+        const currentUrl = await remote.getCurrentUrl();
+        const newUrl = currentUrl + '&title=two%20words';
+        // Only works on a hard refresh.
+        const useTimeStamp = true;
+        await remote.get(newUrl.toString(), useTimeStamp);
+
+        const onDashboardLandingPage = await PageObjects.dashboard.onDashboardLandingPage();
+        expect(onDashboardLandingPage).to.equal(false);
+      });
+
+      it('stays on listing page if title matches no dashboards', async function () {
+        await PageObjects.dashboard.gotoDashboardLandingPage();
+        const currentUrl = await remote.getCurrentUrl();
+        const newUrl = currentUrl + '&title=nodashboardsnamedme';
+        // Only works on a hard refresh.
+        const useTimeStamp = true;
+        await remote.get(newUrl.toString(), useTimeStamp);
+
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        const onDashboardLandingPage = await PageObjects.dashboard.onDashboardLandingPage();
+        expect(onDashboardLandingPage).to.equal(true);
+      });
+
+      it('preloads search filter bar when there is no match', async function () {
+        const searchFilter = await PageObjects.dashboard.getSearchFilterValue();
+        expect(searchFilter).to.equal('"nodashboardsnamedme"');
+      });
+
+      it('stays on listing page if title matches two dashboards', async function () {
+        await PageObjects.dashboard.clickNewDashboard();
+        await PageObjects.dashboard.saveDashboard('two words', { needsConfirm: true });
+        await PageObjects.dashboard.gotoDashboardLandingPage();
+        const currentUrl = await remote.getCurrentUrl();
+        const newUrl = currentUrl + '&title=two%20words';
+        // Only works on a hard refresh.
+        const useTimeStamp = true;
+        await remote.get(newUrl.toString(), useTimeStamp);
+
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        const onDashboardLandingPage = await PageObjects.dashboard.onDashboardLandingPage();
+        expect(onDashboardLandingPage).to.equal(true);
+      });
+
+      it('preloads search filter bar when there is more than one match', async function () {
+        const searchFilter = await PageObjects.dashboard.getSearchFilterValue();
+        expect(searchFilter).to.equal('"two words"');
+      });
+
+      it('matches a title with many special characters', async function () {
+        await PageObjects.dashboard.clickNewDashboard();
+        await PageObjects.dashboard.saveDashboard('i am !@#$%^&*()_+~`,.<>{}[]; so special');
+        await PageObjects.dashboard.gotoDashboardLandingPage();
+        const currentUrl = await remote.getCurrentUrl();
+        // Need to encode that one.
+        const newUrl = currentUrl + '&title=i%20am%20%21%40%23%24%25%5E%26%2A%28%29_%2B~%60%2C.%3C%3E%7B%7D%5B%5D%3B%20so%20special';
+        // Only works on a hard refresh.
+        const useTimeStamp = true;
+        await remote.get(newUrl.toString(), useTimeStamp);
+
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        const onDashboardLandingPage = await PageObjects.dashboard.onDashboardLandingPage();
+        expect(onDashboardLandingPage).to.equal(false);
+      });
+    });
   });
 }
diff --git a/test/functional/page_objects/dashboard_page.js b/test/functional/page_objects/dashboard_page.js
index ea36c05efe1e2..de1be75b174cf 100644
--- a/test/functional/page_objects/dashboard_page.js
+++ b/test/functional/page_objects/dashboard_page.js
@@ -292,11 +292,15 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
     /**
      *
      * @param dashName {String}
-     * @param saveOptions {{storeTimeWithDashboard: boolean, saveAsNew: boolean}}
+     * @param saveOptions {{storeTimeWithDashboard: boolean, saveAsNew: boolean, needsConfirm: false}}
      */
     async saveDashboard(dashName, saveOptions = {}) {
       await this.enterDashboardTitleAndClickSave(dashName, saveOptions);
 
+      if (saveOptions.needsConfirm) {
+        await PageObjects.common.clickConfirmOnModal();
+      }
+
       await PageObjects.header.waitUntilLoadingHasFinished();
 
       // verify that green message at the top of the page.
@@ -346,6 +350,11 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
       });
     }
 
+    async getSearchFilterValue() {
+      const searchFilter = await testSubjects.find('searchFilter');
+      return await searchFilter.getProperty('value');
+    }
+
     async searchForDashboardWithName(dashName) {
       log.debug(`searchForDashboardWithName: ${dashName}`);
 

From 9bf1c7843564729bf426a5f9295295c756f54b1f Mon Sep 17 00:00:00 2001
From: Stacey Gammon <gammon@elastic.co>
Date: Thu, 9 Nov 2017 14:42:26 -0500
Subject: [PATCH 03/18] rename EmbeddableHandler/s => EmbeddableFactory/ies
 (#14863)

---
 src/core_plugins/kibana/index.js               |  2 +-
 .../__tests__/get_embeddable_factories_mock.js | 10 ++++++++++
 .../__tests__/get_embeddable_handlers_mock.js  | 10 ----------
 .../public/dashboard/actions/embeddables.js    | 16 ++++++++--------
 .../kibana/public/dashboard/dashboard_app.html |  2 +-
 .../kibana/public/dashboard/dashboard_app.js   |  6 +++---
 .../__snapshots__/dashboard_grid.test.js.snap  |  4 ++--
 .../public/dashboard/grid/dashboard_grid.js    | 18 +++++++++---------
 .../dashboard/grid/dashboard_grid.test.js      |  4 ++--
 .../grid/dashboard_grid_container.test.js      |  4 ++--
 .../public/dashboard/panel/dashboard_panel.js  |  6 +++---
 .../dashboard/panel/dashboard_panel.test.js    |  4 ++--
 .../panel/dashboard_panel_container.js         | 10 +++++-----
 .../panel_header/panel_header_container.js     |  8 ++++----
 .../panel_options_menu_container.js            | 10 +++++-----
 .../dashboard/viewport/dashboard_viewport.js   |  6 +++---
 .../viewport/dashboard_viewport_provider.js    |  2 +-
 ...handler.js => search_embeddable_factory.js} |  4 ++--
 .../search_embeddable_factory_provider.js      | 12 ++++++++++++
 .../search_embeddable_handler_provider.js      | 12 ------------
 ...dler.js => visualize_embeddable_factory.js} |  4 ++--
 .../visualize_embeddable_factory_provider.js   | 18 ++++++++++++++++++
 .../visualize_embeddable_handler_provider.js   | 18 ------------------
 .../embeddable_factories_registry.js           | 10 ++++++++++
 ...ddable_handler.js => embeddable_factory.js} |  5 ++---
 .../embeddable/embeddable_handlers_registry.js | 10 ----------
 src/ui/public/embeddable/index.js              |  4 ++--
 src/ui/ui_exports.js                           |  8 ++++----
 28 files changed, 113 insertions(+), 114 deletions(-)
 create mode 100644 src/core_plugins/kibana/public/dashboard/__tests__/get_embeddable_factories_mock.js
 delete mode 100644 src/core_plugins/kibana/public/dashboard/__tests__/get_embeddable_handlers_mock.js
 rename src/core_plugins/kibana/public/discover/embeddable/{search_embeddable_handler.js => search_embeddable_factory.js} (96%)
 create mode 100644 src/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory_provider.js
 delete mode 100644 src/core_plugins/kibana/public/discover/embeddable/search_embeddable_handler_provider.js
 rename src/core_plugins/kibana/public/visualize/embeddable/{visualize_embeddable_handler.js => visualize_embeddable_factory.js} (95%)
 create mode 100644 src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory_provider.js
 delete mode 100644 src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_handler_provider.js
 create mode 100644 src/ui/public/embeddable/embeddable_factories_registry.js
 rename src/ui/public/embeddable/{embeddable_handler.js => embeddable_factory.js} (86%)
 delete mode 100644 src/ui/public/embeddable/embeddable_handlers_registry.js

diff --git a/src/core_plugins/kibana/index.js b/src/core_plugins/kibana/index.js
index 2ce1b2624b0cc..7b24b12dc048d 100644
--- a/src/core_plugins/kibana/index.js
+++ b/src/core_plugins/kibana/index.js
@@ -60,7 +60,7 @@ export default function (kibana) {
           'managementSections',
           'devTools',
           'docViews',
-          'embeddableHandlers',
+          'embeddableFactories',
         ],
         injectVars,
       },
diff --git a/src/core_plugins/kibana/public/dashboard/__tests__/get_embeddable_factories_mock.js b/src/core_plugins/kibana/public/dashboard/__tests__/get_embeddable_factories_mock.js
new file mode 100644
index 0000000000000..6175296b33dd9
--- /dev/null
+++ b/src/core_plugins/kibana/public/dashboard/__tests__/get_embeddable_factories_mock.js
@@ -0,0 +1,10 @@
+export function getEmbeddableFactoryMock(config) {
+  const embeddableFactoryMockDefaults = {
+    getEditPath: () => {},
+    getTitleFor: () => {},
+    render: jest.fn(),
+    destroy: () => {},
+    addDestroyEmeddable: () => {},
+  };
+  return Object.assign(embeddableFactoryMockDefaults, config);
+}
diff --git a/src/core_plugins/kibana/public/dashboard/__tests__/get_embeddable_handlers_mock.js b/src/core_plugins/kibana/public/dashboard/__tests__/get_embeddable_handlers_mock.js
deleted file mode 100644
index 2ced19ce0845a..0000000000000
--- a/src/core_plugins/kibana/public/dashboard/__tests__/get_embeddable_handlers_mock.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export function getEmbeddableHandlerMock(config) {
-  const embeddableHandlerMockDefaults = {
-    getEditPath: () => {},
-    getTitleFor: () => {},
-    render: jest.fn(),
-    destroy: () => {},
-    addDestroyEmeddable: () => {},
-  };
-  return Object.assign(embeddableHandlerMockDefaults, config);
-}
diff --git a/src/core_plugins/kibana/public/dashboard/actions/embeddables.js b/src/core_plugins/kibana/public/dashboard/actions/embeddables.js
index 26b54480663e0..8287fb96551fa 100644
--- a/src/core_plugins/kibana/public/dashboard/actions/embeddables.js
+++ b/src/core_plugins/kibana/public/dashboard/actions/embeddables.js
@@ -4,12 +4,12 @@ export const destroyEmbeddable = createAction('DESTROY_EMBEDDABLE',
   /**
    *
    * @param panelId {string}
-   * @param embeddableHandler {EmbeddableHandler}
+   * @param embeddableFactory {EmbeddableFactory}
    * @return {string} - the panel id
    */
-  (panelId, embeddableHandler) => {
-    if (embeddableHandler) {
-      embeddableHandler.destroy(panelId);
+  (panelId, embeddableFactory) => {
+    if (embeddableFactory) {
+      embeddableFactory.destroy(panelId);
     }
     return panelId;
   }
@@ -34,20 +34,20 @@ export const embeddableRenderError = createAction('EMBEDDABLE_RENDER_ERROR',
 
 /**
  *
- * @param embeddableHandler {EmbeddableHandler}
+ * @param embeddableFactory {EmbeddableFactory}
  * @param panelElement {Node}
  * @param panel {PanelState}
  * @param containerApi {ContainerAPI}
  * @return {function(*, *)}
  */
-export function renderEmbeddable(embeddableHandler, panelElement, panel, containerApi) {
+export function renderEmbeddable(embeddableFactory, panelElement, panel, containerApi) {
   return (dispatch) => {
-    if (!embeddableHandler) {
+    if (!embeddableFactory) {
       dispatch(embeddableRenderError(panel.panelIndex, new Error(`Invalid embeddable type "${panel.type}"`)));
       return;
     }
 
-    return embeddableHandler.render(panelElement, panel, containerApi)
+    return embeddableFactory.render(panelElement, panel, containerApi)
       .then(embeddable => {
         return dispatch(embeddableRenderFinished(panel.panelIndex, embeddable));
       })
diff --git a/src/core_plugins/kibana/public/dashboard/dashboard_app.html b/src/core_plugins/kibana/public/dashboard/dashboard_app.html
index 8d723ed2e63bd..02f0c9cbf9aa6 100644
--- a/src/core_plugins/kibana/public/dashboard/dashboard_app.html
+++ b/src/core_plugins/kibana/public/dashboard/dashboard_app.html
@@ -82,7 +82,7 @@ <h2 class="kuiTitle kuiVerticalRhythm">
 
   <dashboard-viewport-provider
     get-container-api="getContainerApi"
-    get-embeddable-handler="getEmbeddableHandler"
+    get-embeddable-factory="getEmbeddableFactory"
   >
   </dashboard-viewport-provider>
 
diff --git a/src/core_plugins/kibana/public/dashboard/dashboard_app.js b/src/core_plugins/kibana/public/dashboard/dashboard_app.js
index 2525ea6e68592..f6a6e75a444d8 100644
--- a/src/core_plugins/kibana/public/dashboard/dashboard_app.js
+++ b/src/core_plugins/kibana/public/dashboard/dashboard_app.js
@@ -22,7 +22,7 @@ import { keyCodes } from 'ui_framework/services';
 import { DashboardContainerAPI } from './dashboard_container_api';
 import * as filterActions from 'ui/doc_table/actions/filter';
 import { FilterManagerProvider } from 'ui/filter_manager';
-import { EmbeddableHandlersRegistryProvider } from 'ui/embeddable/embeddable_handlers_registry';
+import { EmbeddableFactoriesRegistryProvider } from 'ui/embeddable/embeddable_factories_registry';
 
 import { DashboardViewportProvider } from './viewport/dashboard_viewport_provider';
 
@@ -59,8 +59,8 @@ app.directive('dashboardApp', function ($injector) {
       const filterBar = Private(FilterBarQueryFilterProvider);
       const docTitle = Private(DocTitleProvider);
       const notify = new Notifier({ location: 'Dashboard' });
-      const embeddableHandlers = Private(EmbeddableHandlersRegistryProvider);
-      $scope.getEmbeddableHandler = panelType => embeddableHandlers.byName[panelType];
+      const embeddableFactories = Private(EmbeddableFactoriesRegistryProvider);
+      $scope.getEmbeddableFactory = panelType => embeddableFactories.byName[panelType];
 
       const dash = $scope.dash = $route.current.locals.dash;
       if (dash.id) {
diff --git a/src/core_plugins/kibana/public/dashboard/grid/__snapshots__/dashboard_grid.test.js.snap b/src/core_plugins/kibana/public/dashboard/grid/__snapshots__/dashboard_grid.test.js.snap
index 415ae1660789c..766b9e8f2dfee 100644
--- a/src/core_plugins/kibana/public/dashboard/grid/__snapshots__/dashboard_grid.test.js.snap
+++ b/src/core_plugins/kibana/public/dashboard/grid/__snapshots__/dashboard_grid.test.js.snap
@@ -28,7 +28,7 @@ exports[`renders DashboardGrid 1`] = `
     className=""
   >
     <Connect(DashboardPanel)
-      embeddableHandler={
+      embeddableFactory={
         Object {
           "addDestroyEmeddable": [Function],
           "destroy": [Function],
@@ -47,7 +47,7 @@ exports[`renders DashboardGrid 1`] = `
     className=""
   >
     <Connect(DashboardPanel)
-      embeddableHandler={
+      embeddableFactory={
         Object {
           "addDestroyEmeddable": [Function],
           "destroy": [Function],
diff --git a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js
index 6454d4dbcec2f..98196d5268cc6 100644
--- a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js
+++ b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js
@@ -89,8 +89,8 @@ export class DashboardGrid extends React.Component {
     // call inside TSVB visualizations.  Moving the function out of render appears to fix the issue.  See
     // https://github.com/elastic/kibana/issues/14802 for more info.
     // This is probably a better implementation anyway so the handlers are cached.
-    // @type {Object.<string, EmbeddableHandler>}
-    this.embeddableHandlerMap = {};
+    // @type {Object.<string, EmbeddableFactory>}
+    this.embeddableFactoryMap = {};
   }
 
   buildLayoutFromPanels() {
@@ -102,20 +102,20 @@ export class DashboardGrid extends React.Component {
     });
   }
 
-  createEmbeddableHandlersMap(panels) {
+  createEmbeddableFactoriesMap(panels) {
     Object.values(panels).map(panel => {
-      if (!this.embeddableHandlerMap[panel.type]) {
-        this.embeddableHandlerMap[panel.type] = this.props.getEmbeddableHandler(panel.type);
+      if (!this.embeddableFactoryMap[panel.type]) {
+        this.embeddableFactoryMap[panel.type] = this.props.getEmbeddableFactory(panel.type);
       }
     });
   }
 
   componentWillMount() {
-    this.createEmbeddableHandlersMap(this.props.panels);
+    this.createEmbeddableFactoriesMap(this.props.panels);
   }
 
   componentWillReceiveProps(nextProps) {
-    this.createEmbeddableHandlersMap(nextProps.panels);
+    this.createEmbeddableFactoriesMap(nextProps.panels);
   }
 
   onLayoutChange = (layout) => {
@@ -184,7 +184,7 @@ export class DashboardGrid extends React.Component {
           <DashboardPanel
             panelId={panel.panelIndex}
             getContainerApi={getContainerApi}
-            embeddableHandler={this.embeddableHandlerMap[panel.type]}
+            embeddableFactory={this.embeddableFactoryMap[panel.type]}
             onPanelFocused={this.onPanelFocused}
             onPanelBlurred={this.onPanelBlurred}
           />
@@ -213,7 +213,7 @@ export class DashboardGrid extends React.Component {
 DashboardGrid.propTypes = {
   panels: PropTypes.object.isRequired,
   getContainerApi: PropTypes.func.isRequired,
-  getEmbeddableHandler: PropTypes.func.isRequired,
+  getEmbeddableFactory: PropTypes.func.isRequired,
   dashboardViewMode: PropTypes.oneOf([DashboardViewMode.EDIT, DashboardViewMode.VIEW]).isRequired,
   onPanelsUpdated: PropTypes.func.isRequired,
   maximizedPanelId: PropTypes.string,
diff --git a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.test.js b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.test.js
index 2f6e268d145a4..16dd246b7594a 100644
--- a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.test.js
+++ b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.test.js
@@ -4,7 +4,7 @@ import sizeMe from 'react-sizeme';
 
 import { DashboardViewMode } from '../dashboard_view_mode';
 import { getContainerApiMock } from '../__tests__/get_container_api_mock';
-import { getEmbeddableHandlerMock } from '../__tests__/get_embeddable_handlers_mock';
+import { getEmbeddableFactoryMock } from '../__tests__/get_embeddable_factories_mock';
 
 import { DashboardGrid } from './dashboard_grid';
 
@@ -30,7 +30,7 @@ function getProps(props = {}) {
         version: '7.0.0',
       }
     },
-    getEmbeddableHandler: () => getEmbeddableHandlerMock(),
+    getEmbeddableFactory: () => getEmbeddableFactoryMock(),
     getContainerApi: () => getContainerApiMock(),
     onPanelUpdated: () => {},
     useMargins: true,
diff --git a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid_container.test.js b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid_container.test.js
index 29e6b5af38b98..54bfaaf740fc5 100644
--- a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid_container.test.js
+++ b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid_container.test.js
@@ -5,7 +5,7 @@ import _ from 'lodash';
 import sizeMe from 'react-sizeme';
 
 import { getContainerApiMock } from '../__tests__/get_container_api_mock';
-import { getEmbeddableHandlerMock } from '../__tests__/get_embeddable_handlers_mock';
+import { getEmbeddableFactoryMock } from '../__tests__/get_embeddable_factories_mock';
 import { store } from '../../store';
 import { DashboardGridContainer } from './dashboard_grid_container';
 import { updatePanels } from '../actions';
@@ -15,7 +15,7 @@ jest.mock('ui/chrome', () => ({ getKibanaVersion: () => '6.0.0' }), { virtual: t
 function getProps(props = {}) {
   const defaultTestProps = {
     hidden: false,
-    getEmbeddableHandler: () => getEmbeddableHandlerMock(),
+    getEmbeddableFactory: () => getEmbeddableFactoryMock(),
     getContainerApi: () => getContainerApiMock(),
   };
   return Object.assign(defaultTestProps, props);
diff --git a/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.js b/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.js
index 6ecdb12f362e3..8f69867f09512 100644
--- a/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.js
+++ b/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.js
@@ -59,7 +59,7 @@ export class DashboardPanel extends React.Component {
   }
 
   render() {
-    const { viewOnlyMode, error, panel, embeddableHandler } = this.props;
+    const { viewOnlyMode, error, panel, embeddableFactory } = this.props;
     const classes = classNames('panel panel-default', this.props.className, {
       'panel--edit-mode': !viewOnlyMode
     });
@@ -74,7 +74,7 @@ export class DashboardPanel extends React.Component {
           data-test-subj="dashboardPanel"
         >
           <PanelHeader
-            embeddableHandler={embeddableHandler}
+            embeddableFactory={embeddableFactory}
             panelId={panel.panelIndex}
           />
 
@@ -99,5 +99,5 @@ DashboardPanel.propTypes = {
     PropTypes.string,
     PropTypes.object
   ]),
-  embeddableHandler: PropTypes.object.isRequired,
+  embeddableFactory: PropTypes.object.isRequired,
 };
diff --git a/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.test.js b/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.test.js
index 7e8ee5aa27234..171b407930d6e 100644
--- a/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.test.js
+++ b/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.test.js
@@ -7,7 +7,7 @@ import { PanelError } from '../panel/panel_error';
 import { store } from '../../store';
 import { updateViewMode } from '../actions';
 import { Provider } from 'react-redux';
-import { getEmbeddableHandlerMock } from '../__tests__/get_embeddable_handlers_mock';
+import { getEmbeddableFactoryMock } from '../__tests__/get_embeddable_factories_mock';
 
 import {
   takeMountedSnapshot,
@@ -19,7 +19,7 @@ function getProps(props = {}) {
     renderEmbeddable: jest.fn(),
     viewOnlyMode: false,
     onDestroy: () => {},
-    embeddableHandler: getEmbeddableHandlerMock(),
+    embeddableFactory: getEmbeddableFactoryMock(),
   };
   return _.defaultsDeep(props, defaultTestProps);
 }
diff --git a/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel_container.js b/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel_container.js
index 0d6df48443f9e..b1ddeaad733d6 100644
--- a/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel_container.js
+++ b/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel_container.js
@@ -33,11 +33,11 @@ const mapStateToProps = ({ dashboard }, { panelId }) => {
   };
 };
 
-const mapDispatchToProps = (dispatch, { embeddableHandler, panelId, getContainerApi }) => ({
+const mapDispatchToProps = (dispatch, { embeddableFactory, panelId, getContainerApi }) => ({
   renderEmbeddable: (panelElement, panel) => (
-    dispatch(renderEmbeddable(embeddableHandler, panelElement, panel, getContainerApi()))
+    dispatch(renderEmbeddable(embeddableFactory, panelElement, panel, getContainerApi()))
   ),
-  onDestroy: () => dispatch(destroyEmbeddable(panelId, embeddableHandler)),
+  onDestroy: () => dispatch(destroyEmbeddable(panelId, embeddableFactory)),
 });
 
 export const DashboardPanelContainer = connect(
@@ -48,9 +48,9 @@ export const DashboardPanelContainer = connect(
 DashboardPanelContainer.propTypes = {
   panelId: PropTypes.string.isRequired,
   /**
-   * @type {EmbeddableHandler}
+   * @type {EmbeddableFactory}
    */
-  embeddableHandler: PropTypes.shape({
+  embeddableFactory: PropTypes.shape({
     destroy: PropTypes.func.isRequired,
     render: PropTypes.func.isRequired,
     addDestroyEmeddable: PropTypes.func.isRequired,
diff --git a/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_header_container.js b/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_header_container.js
index e79184cbc1e49..5673ad269b914 100644
--- a/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_header_container.js
+++ b/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_header_container.js
@@ -38,7 +38,7 @@ const mapDispatchToProps = (dispatch, { panelId }) => ({
 const mergeProps = (stateProps, dispatchProps, ownProps) => {
   const { isExpanded, isViewOnlyMode, title } = stateProps;
   const { onMaximizePanel, onMinimizePanel } = dispatchProps;
-  const { panelId, embeddableHandler } = ownProps;
+  const { panelId, embeddableFactory } = ownProps;
   let actions;
 
   if (isViewOnlyMode) {
@@ -49,7 +49,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
     actions = (
       <PanelOptionsMenuContainer
         panelId={panelId}
-        embeddableHandler={embeddableHandler}
+        embeddableFactory={embeddableFactory}
       />
     );
   }
@@ -69,9 +69,9 @@ export const PanelHeaderContainer = connect(
 PanelHeaderContainer.propTypes = {
   panelId: PropTypes.string.isRequired,
   /**
-   * @type {EmbeddableHandler}
+   * @type {EmbeddableFactory}
    */
-  embeddableHandler: PropTypes.shape({
+  embeddableFactory: PropTypes.shape({
     destroy: PropTypes.func.isRequired,
     render: PropTypes.func.isRequired,
     addDestroyEmeddable: PropTypes.func.isRequired,
diff --git a/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu_container.js b/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu_container.js
index 69d6619419f79..4ee39d755d4b4 100644
--- a/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu_container.js
+++ b/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu_container.js
@@ -26,13 +26,13 @@ const mapStateToProps = ({ dashboard }, { panelId }) => {
 
 /**
  * @param dispatch {Function}
- * @param embeddableHandler {EmbeddableHandler}
+ * @param embeddableFactory {EmbeddableFactory}
  * @param panelId {string}
  */
-const mapDispatchToProps = (dispatch, { embeddableHandler, panelId }) => ({
+const mapDispatchToProps = (dispatch, { embeddableFactory, panelId }) => ({
   onDeletePanel: () => {
     dispatch(deletePanel(panelId));
-    dispatch(destroyEmbeddable(panelId, embeddableHandler));
+    dispatch(destroyEmbeddable(panelId, embeddableFactory));
   },
   onMaximizePanel: () => dispatch(maximizePanel(panelId)),
   onMinimizePanel: () => dispatch(minimizePanel()),
@@ -60,9 +60,9 @@ export const PanelOptionsMenuContainer = connect(
 PanelOptionsMenuContainer.propTypes = {
   panelId: PropTypes.string.isRequired,
   /**
-   * @type {EmbeddableHandler}
+   * @type {EmbeddableFactory}
    */
-  embeddableHandler: PropTypes.shape({
+  embeddableFactory: PropTypes.shape({
     destroy: PropTypes.func.isRequired,
     render: PropTypes.func.isRequired,
     addDestroyEmeddable: PropTypes.func.isRequired,
diff --git a/src/core_plugins/kibana/public/dashboard/viewport/dashboard_viewport.js b/src/core_plugins/kibana/public/dashboard/viewport/dashboard_viewport.js
index 5544625ccb88f..d5abaa94b4a07 100644
--- a/src/core_plugins/kibana/public/dashboard/viewport/dashboard_viewport.js
+++ b/src/core_plugins/kibana/public/dashboard/viewport/dashboard_viewport.js
@@ -5,7 +5,7 @@ import { DashboardGrid } from '../grid';
 export function DashboardViewport({
   getContainerApi,
   maximizedPanelId,
-  getEmbeddableHandler,
+  getEmbeddableFactory,
   panelCount,
   useMargins,
 }) {
@@ -15,7 +15,7 @@ export function DashboardViewport({
       className={useMargins ? 'dashboard-viewport-with-margins' : 'dashboard-viewport'}
     >
       <DashboardGrid
-        getEmbeddableHandler={getEmbeddableHandler}
+        getEmbeddableFactory={getEmbeddableFactory}
         getContainerApi={getContainerApi}
         maximizedPanelId={maximizedPanelId}
       />
@@ -25,7 +25,7 @@ export function DashboardViewport({
 
 DashboardViewport.propTypes = {
   getContainerApi: PropTypes.func,
-  getEmbeddableHandler: PropTypes.func,
+  getEmbeddableFactory: PropTypes.func,
   maximizedPanelId: PropTypes.string,
   panelCount: PropTypes.number,
   useMargins: PropTypes.bool.isRequired,
diff --git a/src/core_plugins/kibana/public/dashboard/viewport/dashboard_viewport_provider.js b/src/core_plugins/kibana/public/dashboard/viewport/dashboard_viewport_provider.js
index 4de51370b7f83..b3496f657151d 100644
--- a/src/core_plugins/kibana/public/dashboard/viewport/dashboard_viewport_provider.js
+++ b/src/core_plugins/kibana/public/dashboard/viewport/dashboard_viewport_provider.js
@@ -14,5 +14,5 @@ export function DashboardViewportProvider(props) {
 
 DashboardViewportProvider.propTypes = {
   getContainerApi: PropTypes.func.isRequired,
-  getEmbeddableHandler: PropTypes.func.isRequired,
+  getEmbeddableFactory: PropTypes.func.isRequired,
 };
diff --git a/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_handler.js b/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.js
similarity index 96%
rename from src/core_plugins/kibana/public/discover/embeddable/search_embeddable_handler.js
rename to src/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.js
index 91039f22c6344..8d13d83f769b1 100644
--- a/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_handler.js
+++ b/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.js
@@ -4,9 +4,9 @@ import 'ui/doc_table';
 
 import * as columnActions from 'ui/doc_table/actions/columns';
 import { getPersistedStateId } from 'plugins/kibana/dashboard/panel/panel_state';
-import { EmbeddableHandler, Embeddable } from 'ui/embeddable';
+import { EmbeddableFactory, Embeddable } from 'ui/embeddable';
 
-export class SearchEmbeddableHandler extends EmbeddableHandler {
+export class SearchEmbeddableFactory extends EmbeddableFactory {
 
   constructor($compile, $rootScope, searchLoader, Promise) {
     super();
diff --git a/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory_provider.js b/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory_provider.js
new file mode 100644
index 0000000000000..d8437d67b9301
--- /dev/null
+++ b/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory_provider.js
@@ -0,0 +1,12 @@
+import { SearchEmbeddableFactory } from './search_embeddable_factory';
+import { EmbeddableFactoriesRegistryProvider } from 'ui/embeddable/embeddable_factories_registry';
+
+export function searchEmbeddableFactoryProvider(Private) {
+  const SearchEmbeddableFactoryProvider = ($compile, $rootScope, savedSearches, Promise) => {
+    return new SearchEmbeddableFactory($compile, $rootScope, savedSearches, Promise);
+  };
+  return Private(SearchEmbeddableFactoryProvider);
+}
+
+
+EmbeddableFactoriesRegistryProvider.register(searchEmbeddableFactoryProvider);
diff --git a/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_handler_provider.js b/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_handler_provider.js
deleted file mode 100644
index d7fa5dc8b1f00..0000000000000
--- a/src/core_plugins/kibana/public/discover/embeddable/search_embeddable_handler_provider.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { SearchEmbeddableHandler } from './search_embeddable_handler';
-import { EmbeddableHandlersRegistryProvider } from 'ui/embeddable/embeddable_handlers_registry';
-
-export function searchEmbeddableHandlerProvider(Private) {
-  const SearchEmbeddableHandlerProvider = ($compile, $rootScope, savedSearches, Promise) => {
-    return new SearchEmbeddableHandler($compile, $rootScope, savedSearches, Promise);
-  };
-  return Private(SearchEmbeddableHandlerProvider);
-}
-
-
-EmbeddableHandlersRegistryProvider.register(searchEmbeddableHandlerProvider);
diff --git a/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_handler.js b/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.js
similarity index 95%
rename from src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_handler.js
rename to src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.js
index d2406f312c2d9..c01cf6dfc34c7 100644
--- a/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_handler.js
+++ b/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.js
@@ -5,11 +5,11 @@ import visualizationTemplate from './visualize_template.html';
 import { getPersistedStateId } from 'plugins/kibana/dashboard/panel/panel_state';
 import { UtilsBrushEventProvider as utilsBrushEventProvider } from 'ui/utils/brush_event';
 import { FilterBarClickHandlerProvider as filterBarClickHandlerProvider } from 'ui/filter_bar/filter_bar_click_handler';
-import { EmbeddableHandler, Embeddable } from 'ui/embeddable';
+import { EmbeddableFactory, Embeddable } from 'ui/embeddable';
 
 import chrome from 'ui/chrome';
 
-export class VisualizeEmbeddableHandler extends EmbeddableHandler {
+export class VisualizeEmbeddableFactory extends EmbeddableFactory {
   constructor($compile, $rootScope, visualizeLoader, timefilter, Notifier, Promise, Private) {
     super();
     this.$compile = $compile;
diff --git a/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory_provider.js b/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory_provider.js
new file mode 100644
index 0000000000000..6e0a7b2602a80
--- /dev/null
+++ b/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory_provider.js
@@ -0,0 +1,18 @@
+import { VisualizeEmbeddableFactory } from './visualize_embeddable_factory';
+import { EmbeddableFactoriesRegistryProvider } from 'ui/embeddable/embeddable_factories_registry';
+
+export function visualizeEmbeddableFactoryProvider(Private) {
+  const VisualizeEmbeddableFactoryProvider = (
+    $compile,
+    $rootScope,
+    savedVisualizations,
+    timefilter,
+    Notifier,
+    Promise,
+    Private) => {
+    return new VisualizeEmbeddableFactory($compile, $rootScope, savedVisualizations, timefilter, Notifier, Promise, Private);
+  };
+  return Private(VisualizeEmbeddableFactoryProvider);
+}
+
+EmbeddableFactoriesRegistryProvider.register(visualizeEmbeddableFactoryProvider);
diff --git a/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_handler_provider.js b/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_handler_provider.js
deleted file mode 100644
index 97be9c4f67d42..0000000000000
--- a/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_handler_provider.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { VisualizeEmbeddableHandler } from './visualize_embeddable_handler';
-import { EmbeddableHandlersRegistryProvider } from 'ui/embeddable/embeddable_handlers_registry';
-
-export function visualizeEmbeddableHandlerProvider(Private) {
-  const VisualizeEmbeddableHandlerProvider = (
-    $compile,
-    $rootScope,
-    savedVisualizations,
-    timefilter,
-    Notifier,
-    Promise,
-    Private) => {
-    return new VisualizeEmbeddableHandler($compile, $rootScope, savedVisualizations, timefilter, Notifier, Promise, Private);
-  };
-  return Private(VisualizeEmbeddableHandlerProvider);
-}
-
-EmbeddableHandlersRegistryProvider.register(visualizeEmbeddableHandlerProvider);
diff --git a/src/ui/public/embeddable/embeddable_factories_registry.js b/src/ui/public/embeddable/embeddable_factories_registry.js
new file mode 100644
index 0000000000000..b65521b43b308
--- /dev/null
+++ b/src/ui/public/embeddable/embeddable_factories_registry.js
@@ -0,0 +1,10 @@
+import { uiRegistry } from 'ui/registry/_registry';
+
+/**
+ * Registry of functions (EmbeddableFactoryProviders) which return an EmbeddableFactory.
+ */
+export const EmbeddableFactoriesRegistryProvider = uiRegistry({
+  name: 'embeddableFactories',
+  index: ['name']
+});
+
diff --git a/src/ui/public/embeddable/embeddable_handler.js b/src/ui/public/embeddable/embeddable_factory.js
similarity index 86%
rename from src/ui/public/embeddable/embeddable_handler.js
rename to src/ui/public/embeddable/embeddable_factory.js
index a14af24744521..df28dadbd75bb 100644
--- a/src/ui/public/embeddable/embeddable_handler.js
+++ b/src/ui/public/embeddable/embeddable_factory.js
@@ -1,8 +1,7 @@
 /**
- * The EmbeddableHandler defines how to render and embed any object into the Dashboard, or some other
- * container that supports EmbeddableHandlers.
+ * The EmbeddableFactory renders an embeddable of a certain type at a given dom node.
  */
-export class EmbeddableHandler {
+export class EmbeddableFactory {
   constructor() {
     this.destroyEmbeddableMap = {};
   }
diff --git a/src/ui/public/embeddable/embeddable_handlers_registry.js b/src/ui/public/embeddable/embeddable_handlers_registry.js
deleted file mode 100644
index 592df6c513f61..0000000000000
--- a/src/ui/public/embeddable/embeddable_handlers_registry.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { uiRegistry } from 'ui/registry/_registry';
-
-/**
- * Registry of functions (EmbeddableHandlerProviders) which return an EmbeddableHandler.
- */
-export const EmbeddableHandlersRegistryProvider = uiRegistry({
-  name: 'embeddableHandlers',
-  index: ['name']
-});
-
diff --git a/src/ui/public/embeddable/index.js b/src/ui/public/embeddable/index.js
index 654d75a75b8b3..094806341f6ca 100644
--- a/src/ui/public/embeddable/index.js
+++ b/src/ui/public/embeddable/index.js
@@ -1,4 +1,4 @@
-export { EmbeddableHandler } from './embeddable_handler';
+export { EmbeddableFactory } from './embeddable_factory';
 export { Embeddable } from './embeddable';
-export { EmbeddableHandlersRegistryProvider } from './embeddable_handlers_registry';
+export { EmbeddableFactoriesRegistryProvider } from './embeddable_factories_registry';
 export { ContainerAPI } from './container_api';
diff --git a/src/ui/ui_exports.js b/src/ui/ui_exports.js
index fefca9397db5c..9ddd4f276245d 100644
--- a/src/ui/ui_exports.js
+++ b/src/ui/ui_exports.js
@@ -22,9 +22,9 @@ export default class UiExports {
       visEditorTypes: [
         'ui/vis/editors/default/default',
       ],
-      embeddableHandlers: [
-        'plugins/kibana/visualize/embeddable/visualize_embeddable_handler_provider',
-        'plugins/kibana/discover/embeddable/search_embeddable_handler_provider',
+      embeddableFactories: [
+        'plugins/kibana/visualize/embeddable/visualize_embeddable_factory_provider',
+        'plugins/kibana/discover/embeddable/search_embeddable_factory_provider',
       ],
     };
     this.urlBasePath = urlBasePath;
@@ -110,7 +110,7 @@ export default class UiExports {
       case 'visRequestHandlers':
       case 'visEditorTypes':
       case 'savedObjectTypes':
-      case 'embeddableHandlers':
+      case 'embeddableFactories':
       case 'fieldFormats':
       case 'fieldFormatEditors':
       case 'spyModes':

From 5f1f28ba413eaa915bc961b48fa616199a4dd2fb Mon Sep 17 00:00:00 2001
From: Peter Pisljar <peter.pisljar@gmail.com>
Date: Thu, 9 Nov 2017 20:49:58 +0100
Subject: [PATCH 04/18] reverts metric visualization (#14052)

Uses the previous html/css rendering code instead of the svg-based rendering for simple metrics.
---
 .../public/kbn_vislib_vis_types.js            |   2 -
 .../kbn_vislib_vis_types/public/metric.js     |  88 ------
 src/core_plugins/metric_vis/index.js          |  13 +
 src/core_plugins/metric_vis/package.json      |   4 +
 .../metric_vis/public/__tests__/metric_vis.js |  60 ++++
 .../public/__tests__/metric_vis_controller.js |  70 +++++
 .../metric_vis/public/images/icon-number.svg  |  16 ++
 .../metric_vis/public/metric_vis.html         |   9 +
 .../metric_vis/public/metric_vis.js           |  91 ++++++
 .../metric_vis/public/metric_vis.less         |  19 ++
 .../public/metric_vis_controller.js           | 126 +++++++++
 .../metric_vis/public/metric_vis_params.html  | 206 ++++++++++++++
 .../metric_vis/public/metric_vis_params.js    |  66 +++++
 src/ui/public/vis/vis_update.js               |  17 ++
 .../apps/visualize/_metric_chart.js           | 263 ++++++++++++++++++
 15 files changed, 960 insertions(+), 90 deletions(-)
 delete mode 100644 src/core_plugins/kbn_vislib_vis_types/public/metric.js
 create mode 100644 src/core_plugins/metric_vis/index.js
 create mode 100644 src/core_plugins/metric_vis/package.json
 create mode 100644 src/core_plugins/metric_vis/public/__tests__/metric_vis.js
 create mode 100644 src/core_plugins/metric_vis/public/__tests__/metric_vis_controller.js
 create mode 100644 src/core_plugins/metric_vis/public/images/icon-number.svg
 create mode 100644 src/core_plugins/metric_vis/public/metric_vis.html
 create mode 100644 src/core_plugins/metric_vis/public/metric_vis.js
 create mode 100644 src/core_plugins/metric_vis/public/metric_vis.less
 create mode 100644 src/core_plugins/metric_vis/public/metric_vis_controller.js
 create mode 100644 src/core_plugins/metric_vis/public/metric_vis_params.html
 create mode 100644 src/core_plugins/metric_vis/public/metric_vis_params.js
 create mode 100644 test/functional/apps/visualize/_metric_chart.js

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js b/src/core_plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
index a47adf7eb8c7f..c7f06de0857b1 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
@@ -8,7 +8,6 @@ import heatmapVisTypeProvider from 'plugins/kbn_vislib_vis_types/heatmap';
 import horizontalBarVisTypeProvider from 'plugins/kbn_vislib_vis_types/horizontal_bar';
 import gaugeVisTypeProvider from 'plugins/kbn_vislib_vis_types/gauge';
 import goalVisTypeProvider from 'plugins/kbn_vislib_vis_types/goal';
-import metricVisTypeProvider from 'plugins/kbn_vislib_vis_types/metric';
 
 VisTypesRegistryProvider.register(histogramVisTypeProvider);
 VisTypesRegistryProvider.register(lineVisTypeProvider);
@@ -18,4 +17,3 @@ VisTypesRegistryProvider.register(heatmapVisTypeProvider);
 VisTypesRegistryProvider.register(horizontalBarVisTypeProvider);
 VisTypesRegistryProvider.register(gaugeVisTypeProvider);
 VisTypesRegistryProvider.register(goalVisTypeProvider);
-VisTypesRegistryProvider.register(metricVisTypeProvider);
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/metric.js b/src/core_plugins/kbn_vislib_vis_types/public/metric.js
deleted file mode 100644
index 63229abee0b14..0000000000000
--- a/src/core_plugins/kbn_vislib_vis_types/public/metric.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import { VisFactoryProvider } from 'ui/vis/vis_factory';
-import { VisSchemasProvider } from 'ui/vis/editors/default/schemas';
-import { CATEGORY } from 'ui/vis/vis_category';
-import gaugeTemplate from 'plugins/kbn_vislib_vis_types/editors/gauge.html';
-import { vislibColorMaps } from 'ui/vislib/components/color/colormaps';
-import image from './images/icon-number.svg';
-
-export default function MetricVisType(Private) {
-  const VisFactory = Private(VisFactoryProvider);
-  const Schemas = Private(VisSchemasProvider);
-
-  return VisFactory.createVislibVisualization({
-    name: 'metric',
-    title: 'Metric',
-    image,
-    description: 'Display a calculation as a single number',
-    category: CATEGORY.DATA,
-    visConfig: {
-      defaults: {
-        addTooltip: true,
-        addLegend: false,
-        type: 'gauge',
-        gauge: {
-          verticalSplit: false,
-          autoExtend: false,
-          percentageMode: false,
-          gaugeType: 'Metric',
-          gaugeStyle: 'Full',
-          backStyle: 'Full',
-          orientation: 'vertical',
-          colorSchema: 'Green to Red',
-          gaugeColorMode: 'None',
-          useRange: false,
-          colorsRange: [
-            { from: 0, to: 100 },
-          ],
-          invertColors: false,
-          labels: {
-            show: true,
-            color: 'black'
-          },
-          scale: {
-            show: false,
-            labels: false,
-            color: '#333',
-            width: 2
-          },
-          type: 'simple',
-          style: {
-            fontSize: 60,
-            bgColor: false,
-            labelColor: false,
-            subText: ''
-          }
-        }
-      },
-    },
-    editorConfig: {
-      collections: {
-        gaugeTypes: ['Arc', 'Circle', 'Metric'],
-        gaugeColorMode: ['None', 'Labels', 'Background'],
-        scales: ['linear', 'log', 'square root'],
-        colorSchemas: Object.keys(vislibColorMaps),
-      },
-      optionsTemplate: gaugeTemplate,
-      schemas: new Schemas([
-        {
-          group: 'metrics',
-          name: 'metric',
-          title: 'Metric',
-          min: 1,
-          aggFilter: ['!derivative', '!geo_centroid', '!geo_bounds'],
-          defaults: [
-            { schema: 'metric', type: 'count' }
-          ]
-        },
-        {
-          group: 'buckets',
-          name: 'group',
-          title: 'Split Group',
-          min: 0,
-          max: 1,
-          aggFilter: ['!geohash_grid', '!filter']
-        }
-      ])
-    }
-  });
-}
diff --git a/src/core_plugins/metric_vis/index.js b/src/core_plugins/metric_vis/index.js
new file mode 100644
index 0000000000000..cba768a6aaf26
--- /dev/null
+++ b/src/core_plugins/metric_vis/index.js
@@ -0,0 +1,13 @@
+export default function (kibana) {
+
+  return new kibana.Plugin({
+
+    uiExports: {
+      visTypes: [
+        'plugins/metric_vis/metric_vis'
+      ]
+    }
+
+  });
+
+}
diff --git a/src/core_plugins/metric_vis/package.json b/src/core_plugins/metric_vis/package.json
new file mode 100644
index 0000000000000..e570261fc30dd
--- /dev/null
+++ b/src/core_plugins/metric_vis/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "metric_vis",
+  "version": "kibana"
+}
diff --git a/src/core_plugins/metric_vis/public/__tests__/metric_vis.js b/src/core_plugins/metric_vis/public/__tests__/metric_vis.js
new file mode 100644
index 0000000000000..c02b7ac6c74d5
--- /dev/null
+++ b/src/core_plugins/metric_vis/public/__tests__/metric_vis.js
@@ -0,0 +1,60 @@
+import $ from 'jquery';
+import ngMock from 'ng_mock';
+import expect from 'expect.js';
+
+import { VisProvider } from 'ui/vis';
+import LogstashIndexPatternStubProvider from 'fixtures/stubbed_logstash_index_pattern';
+import MetricVisProvider from '../metric_vis';
+
+describe('metric_vis', () => {
+  let setup = null;
+  let vis;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject((Private, $rootScope) => {
+    setup = () => {
+      const Vis = Private(VisProvider);
+      const metricVisType = Private(MetricVisProvider);
+      const indexPattern = Private(LogstashIndexPatternStubProvider);
+
+      indexPattern.stubSetFieldFormat('ip', 'url', {
+        urlTemplate: 'http://ip.info?address={{value}}',
+        labelTemplate: 'ip[{{value}}]'
+      });
+
+      vis = new Vis(indexPattern, {
+        type: 'metric',
+        aggs: [{ id: '1', type: 'top_hits', schema: 'metric', params: { field: 'ip' } }],
+      });
+
+      const $el = $('<div>');
+      const Controller = metricVisType.visualization;
+      const controller = new Controller($el, vis);
+      const render = (esResponse) => {
+        controller.render(esResponse);
+        $rootScope.$digest();
+      };
+
+      return { $el, render };
+    };
+  }));
+
+  it('renders html value from field formatter', () => {
+    const { $el, render } = setup();
+
+    const ip = '235.195.237.208';
+    render({
+      tables: [{
+        columns: [{ title: 'ip', aggConfig: vis.aggs[0] }],
+        rows: [[ ip ]]
+      }]
+    });
+
+    const $link = $el
+      .find('a[href]')
+      .filter(function () { return this.href.includes('ip.info'); });
+
+    expect($link).to.have.length(1);
+    expect($link.text()).to.be(`ip[${ip}]`);
+  });
+});
diff --git a/src/core_plugins/metric_vis/public/__tests__/metric_vis_controller.js b/src/core_plugins/metric_vis/public/__tests__/metric_vis_controller.js
new file mode 100644
index 0000000000000..1cd4ca8506e47
--- /dev/null
+++ b/src/core_plugins/metric_vis/public/__tests__/metric_vis_controller.js
@@ -0,0 +1,70 @@
+import ngMock from 'ng_mock';
+import expect from 'expect.js';
+import $ from 'jquery';
+
+describe('metric vis', function () {
+  let $scope;
+
+  const formatter = function (value) {
+    return value.toFixed(3);
+  };
+
+  const aggConfig = {
+    fieldFormatter: () => {
+      return formatter;
+    },
+    schema: {}
+  };
+
+  beforeEach(ngMock.module('kibana/metric_vis'));
+  beforeEach(ngMock.inject(function ($rootScope, $controller) {
+    $scope = $rootScope.$new();
+    $scope.vis = {
+      params: {
+        metric: {
+          colorsRange: [
+            { from: 0, to: 1000 }
+          ],
+          style: {
+
+          }
+        }
+      }
+    };
+
+    const $element = $('<div>');
+    $controller('KbnMetricVisController', { $scope, $element });
+    $scope.$digest();
+  }));
+
+  it('should set the metric label and value', function () {
+    $scope.processTableGroups({
+      tables: [{
+        columns: [{ title: 'Count', aggConfig: { ...aggConfig, makeLabel: () => 'Count' } }],
+        rows: [[ 4301021 ]]
+      }]
+    });
+
+    expect($scope.metrics.length).to.be(1);
+    expect($scope.metrics[0].label).to.be('Count');
+    expect($scope.metrics[0].value).to.be('4301021.000');
+  });
+
+  it('should support multi-value metrics', function () {
+    $scope.processTableGroups({
+      tables: [{
+        columns: [
+          { aggConfig: { ...aggConfig, makeLabel: () => '1st percentile of bytes' } },
+          { aggConfig: { ...aggConfig, makeLabel: () => '99th percentile of bytes' } }
+        ],
+        rows: [[ 182, 445842.4634666484 ]]
+      }]
+    });
+
+    expect($scope.metrics.length).to.be(2);
+    expect($scope.metrics[0].label).to.be('1st percentile of bytes');
+    expect($scope.metrics[0].value).to.be('182.000');
+    expect($scope.metrics[1].label).to.be('99th percentile of bytes');
+    expect($scope.metrics[1].value).to.be('445842.463');
+  });
+});
diff --git a/src/core_plugins/metric_vis/public/images/icon-number.svg b/src/core_plugins/metric_vis/public/images/icon-number.svg
new file mode 100644
index 0000000000000..3168ce0d90aad
--- /dev/null
+++ b/src/core_plugins/metric_vis/public/images/icon-number.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="63px" height="41px" viewBox="0 0 63 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.1 (39012) - http://www.bohemiancoding.com/sketch -->
+    <title>42</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Visualize" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Visualize-Create-New" transform="translate(-272.000000, -657.000000)" fill="#000000">
+            <g id="data" transform="translate(74.000000, 576.000000)">
+                <g id="number" transform="translate(162.000000, 44.000000)">
+                    <path d="M67.0898438,69.7148438 L62.2773438,69.7148438 L62.2773438,78 L54.0195312,78 L54.0195312,69.7148438 L36.9570312,69.7148438 L36.9570312,63.8359375 L54.484375,38.0234375 L62.2773438,38.0234375 L62.2773438,63.1523438 L67.0898438,63.1523438 L67.0898438,69.7148438 Z M54.0195312,63.1523438 L54.0195312,56.3710938 C54.0195312,55.2408798 54.0651037,53.6002712 54.15625,51.4492188 C54.2473963,49.2981663 54.3203122,48.0494809 54.375,47.703125 L54.15625,47.703125 C53.4817675,49.1979241 52.6705777,50.6562429 51.7226562,52.078125 L44.3945312,63.1523438 L54.0195312,63.1523438 Z M98.1523438,78 L70.2070312,78 L70.2070312,72.1210938 L80.2421875,61.9765625 C83.2135565,58.9322764 85.1549434,56.8222715 86.0664062,55.6464844 C86.9778691,54.4706972 87.6341126,53.3815154 88.0351562,52.3789062 C88.4361999,51.3762971 88.6367188,50.337245 88.6367188,49.2617188 C88.6367188,47.6575441 88.1946659,46.4635456 87.3105469,45.6796875 C86.4264279,44.8958294 85.2461011,44.5039062 83.7695312,44.5039062 C82.2200443,44.5039062 80.7161531,44.8593714 79.2578125,45.5703125 C77.7994719,46.2812536 76.2773517,47.2929622 74.6914062,48.6054688 L70.0976562,43.1640625 C72.0664161,41.4869708 73.6979102,40.3020868 74.9921875,39.609375 C76.2864648,38.9166632 77.6992111,38.3834654 79.2304688,38.0097656 C80.7617264,37.6360658 82.4752509,37.4492188 84.3710938,37.4492188 C86.8685021,37.4492188 89.0742092,37.9049434 90.9882812,38.8164062 C92.9023533,39.7278691 94.3880155,41.003898 95.4453125,42.6445312 C96.5026095,44.2851645 97.03125,46.1627498 97.03125,48.2773438 C97.03125,50.1184988 96.7076855,51.8456951 96.0605469,53.4589844 C95.4134082,55.0722737 94.4108141,56.726554 93.0527344,58.421875 C91.6946547,60.117196 89.3021005,62.5325364 85.875,65.6679688 L80.734375,70.5078125 L80.734375,70.890625 L98.1523438,70.890625 L98.1523438,78 Z" id="42"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/core_plugins/metric_vis/public/metric_vis.html b/src/core_plugins/metric_vis/public/metric_vis.html
new file mode 100644
index 0000000000000..cf3e54f06866c
--- /dev/null
+++ b/src/core_plugins/metric_vis/public/metric_vis.html
@@ -0,0 +1,9 @@
+<div ng-controller="KbnMetricVisController" class="metric-vis">
+  <div class="metric-container" ng-repeat="metric in metrics" ng-style="{'background-color': metric.bgColor}">
+      <div class="metric-value"
+           ng-bind-html="metric.value"
+           ng-style="{'font-size': vis.params.metric.style.fontSize+'pt', 'color': metric.color}"
+      ></div>
+      <div ng-if="vis.params.metric.labels.show">{{metric.label}}</div>
+  </div>
+</div>
diff --git a/src/core_plugins/metric_vis/public/metric_vis.js b/src/core_plugins/metric_vis/public/metric_vis.js
new file mode 100644
index 0000000000000..adcd47dc241b8
--- /dev/null
+++ b/src/core_plugins/metric_vis/public/metric_vis.js
@@ -0,0 +1,91 @@
+import 'plugins/metric_vis/metric_vis.less';
+import 'plugins/metric_vis/metric_vis_params';
+import 'plugins/metric_vis/metric_vis_controller';
+import { VisFactoryProvider } from 'ui/vis/vis_factory';
+import { CATEGORY } from 'ui/vis/vis_category';
+import { VisSchemasProvider } from 'ui/vis/editors/default/schemas';
+import metricVisTemplate from 'plugins/metric_vis/metric_vis.html';
+import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
+import { vislibColorMaps } from 'ui/vislib/components/color/colormaps';
+import image from './images/icon-number.svg';
+// we need to load the css ourselves
+
+// we also need to load the controller and used by the template
+
+// register the provider with the visTypes registry
+VisTypesRegistryProvider.register(MetricVisProvider);
+
+function MetricVisProvider(Private) {
+  const Schemas = Private(VisSchemasProvider);
+  const VisFactory = Private(VisFactoryProvider);
+
+  // return the visType object, which kibana will use to display and configure new
+  // Vis object of this type.
+  return VisFactory.createAngularVisualization({
+    name: 'metric',
+    title: 'Metric',
+    image,
+    description: 'Display a calculation as a single number',
+    category: CATEGORY.DATA,
+    visConfig: {
+      defaults: {
+        addTooltip: true,
+        addLegend: false,
+        type: 'metric',
+        metric: {
+          percentageMode: false,
+          useRanges: false,
+          colorSchema: 'Green to Red',
+          metricColorMode: 'None',
+          colorsRange: [
+            { from: 0, to: 10000 }
+          ],
+          labels: {
+            show: true
+          },
+          invertColors: false,
+          style: {
+            bgFill: '#000',
+            bgColor: false,
+            labelColor: false,
+            subText: '',
+            fontSize: 60,
+          }
+        }
+      },
+      template: metricVisTemplate,
+    },
+    editorConfig: {
+      collections: {
+        metricColorMode: ['None', 'Labels', 'Background'],
+        colorSchemas: Object.keys(vislibColorMaps),
+      },
+      optionsTemplate: '<metric-vis-params></metric-vis-params>',
+      schemas: new Schemas([
+        {
+          group: 'metrics',
+          name: 'metric',
+          title: 'Metric',
+          min: 1,
+          aggFilter: [
+            '!std_dev', '!geo_centroid', '!percentiles', '!percentile_ranks',
+            '!derivative', '!serial_diff', '!moving_avg', '!cumulative_sum', '!geo_bounds'],
+          defaults: [
+            { type: 'count', schema: 'metric' }
+          ]
+        }, {
+          group: 'buckets',
+          name: 'group',
+          title: 'Split Group',
+          min: 0,
+          max: 1,
+          aggFilter: ['!geohash_grid', '!filter']
+        }
+      ])
+    },
+    implementsRenderComplete: true,
+  });
+}
+
+// export the provider so that the visType can be required with Private()
+export default MetricVisProvider;
diff --git a/src/core_plugins/metric_vis/public/metric_vis.less b/src/core_plugins/metric_vis/public/metric_vis.less
new file mode 100644
index 0000000000000..e98e1b5d8d995
--- /dev/null
+++ b/src/core_plugins/metric_vis/public/metric_vis.less
@@ -0,0 +1,19 @@
+@import (reference) "~ui/styles/mixins.less";
+
+.metric-vis {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+
+  .metric-value {
+    font-weight: bold;
+    .ellipsis();
+  }
+
+  .metric-container {
+    text-align: center;
+    margin: auto;
+    padding: 16px;
+  }
+}
diff --git a/src/core_plugins/metric_vis/public/metric_vis_controller.js b/src/core_plugins/metric_vis/public/metric_vis_controller.js
new file mode 100644
index 0000000000000..d155e7c8756c5
--- /dev/null
+++ b/src/core_plugins/metric_vis/public/metric_vis_controller.js
@@ -0,0 +1,126 @@
+import _ from 'lodash';
+import { uiModules } from 'ui/modules';
+import { getHeatmapColors } from 'ui/vislib/components/color/heatmap_color';
+// get the kibana/metric_vis module, and make sure that it requires the "kibana" module if it
+// didn't already
+const module = uiModules.get('kibana/metric_vis', ['kibana']);
+
+module.controller('KbnMetricVisController', function ($scope, $element) {
+
+  const metrics = $scope.metrics = [];
+  let labels = [];
+  let colors = [];
+
+  const getLabels = () => {
+    const config = $scope.vis.params.metric;
+    const isPercentageMode = config.percentageMode;
+    const colorsRange = config.colorsRange;
+    const max = _.last(colorsRange).to;
+    const labels = [];
+    colorsRange.forEach(range => {
+      const from = isPercentageMode ? Math.round(100 * range.from / max) : range.from;
+      const to = isPercentageMode ? Math.round(100 * range.to / max) : range.to;
+      labels.push(`${from} - ${to}`);
+    });
+
+    return labels;
+  };
+
+  const getColors = () => {
+    const config = $scope.vis.params.metric;
+    const invertColors = config.invertColors;
+    const colorSchema = config.colorSchema;
+    const colorsRange = config.colorsRange;
+    const labels = getLabels();
+    const colors = {};
+    for (let i = 0; i < labels.length; i += 1) {
+      const divider = Math.max(colorsRange.length - 1, 1);
+      const val = invertColors ? 1 - i / divider : i / divider;
+      colors[labels[i]] = getHeatmapColors(val, colorSchema);
+    }
+    return colors;
+  };
+
+  const getBucket = (val) => {
+    const config = $scope.vis.params.metric;
+    let bucket = _.findIndex(config.colorsRange, range => {
+      return range.from <= val && range.to > val;
+    });
+
+    if (bucket === -1) {
+      if (val < config.colorsRange[0].from) bucket = 0;
+      else bucket = config.colorsRange.length - 1;
+    }
+
+    return bucket;
+  };
+
+  const getColor = (val) => {
+    const bucket = getBucket(val);
+    const label = labels[bucket];
+    return colors[label];
+  };
+
+  $scope.processTableGroups = function (tableGroups) {
+    const config = $scope.vis.params.metric;
+    const isPercentageMode = config.percentageMode;
+    const min = config.colorsRange[0].from;
+    const max = _.last(config.colorsRange).to;
+
+    tableGroups.tables.forEach(function (table) {
+      let bucketAgg;
+
+      table.columns.forEach(function (column, i) {
+        const aggConfig = column.aggConfig;
+
+        if (aggConfig && aggConfig.schema.group === 'buckets') {
+          bucketAgg = aggConfig;
+          return;
+        }
+
+        table.rows.forEach(row => {
+
+          let title = column.title;
+          let value = row[i];
+          const color = getColor(value);
+
+          if (isPercentageMode) {
+            const percentage = Math.round(100 * (value - min) / (max - min));
+            value = `${percentage}%`;
+          }
+
+          if (aggConfig) {
+            if (!isPercentageMode) value = aggConfig.fieldFormatter('html')(value);
+            if (bucketAgg) {
+              const bucketValue = bucketAgg.fieldFormatter('text')(row[0]);
+              title = `${bucketValue} - ${aggConfig.makeLabel()}`;
+            } else {
+              title = aggConfig.makeLabel();
+            }
+          }
+
+          const shouldColor = config.colorsRange.length > 1;
+
+          metrics.push({
+            label: title,
+            value: value,
+            color: shouldColor && config.style.labelColor ? color : null,
+            bgColor: shouldColor && config.style.bgColor ? color : null
+          });
+        });
+      });
+    });
+  };
+
+  $scope.$watch('esResponse', function (resp) {
+    if (resp) {
+      metrics.length = 0;
+      labels.length = 0;
+      colors.length = 0;
+      colors = getColors();
+      labels = getLabels();
+      $scope.processTableGroups(resp);
+      $element.trigger('renderComplete');
+    }
+  });
+});
diff --git a/src/core_plugins/metric_vis/public/metric_vis_params.html b/src/core_plugins/metric_vis/public/metric_vis_params.html
new file mode 100644
index 0000000000000..dc5ea3dd5b8e2
--- /dev/null
+++ b/src/core_plugins/metric_vis/public/metric_vis_params.html
@@ -0,0 +1,206 @@
+<div class="kuiSideBarSection">
+
+  <div class="kuiSideBarFormRow">
+    <label class="kuiSideBarFormRow__label" for="percentageMode">
+      Percentage Mode
+    </label>
+    <div class="kuiSideBarFormRow__control">
+      <input class="kuiCheckBox" id="percentageMode" type="checkbox" ng-model="vis.params.metric.percentageMode">
+    </div>
+  </div>
+
+  <div class="kuiSideBarFormRow">
+    <label class="kuiSideBarFormRow__label" for="showLabels">
+      Show Labels
+    </label>
+    <div class="kuiSideBarFormRow__control">
+      <input class="kuiCheckBox" id="showLabels" type="checkbox" ng-model="vis.params.metric.labels.show">
+    </div>
+  </div>
+
+  <div>
+    <div class="kuiSideBarCollapsibleTitle">
+      <div
+        kbn-accessible-click
+        aria-expanded="{{!!showColorRange}}"
+        aria-controls="metricOptionsRanges"
+        aria-label="Toggle range options"
+        class="kuiSideBarCollapsibleTitle__label"
+        ng-click="showColorRange = !showColorRange"
+      >
+      <span
+        aria-hidden="true"
+        ng-class="{ 'fa-caret-down': showColorRange, 'fa-caret-right': !showColorRange }"
+        class="fa fa-caret-right kuiSideBarCollapsibleTitle__caret"
+      ></span>
+        <span class="kuiSideBarCollapsibleTitle__text">
+        Ranges
+      </span>
+      </div>
+    </div>
+
+    <div id="metricOptionsRanges" ng-show="showColorRange" class="kuiSideBarCollapsibleSection">
+      <div class="kuiSideBarSection">
+        <table class="vis-editor-agg-editor-ranges form-group" ng-show="vis.params.metric.colorsRange.length">
+          <tr>
+            <th>
+              <label id="metricOptionsCustomRangeFrom">From</label>
+            </th>
+            <th colspan="2">
+              <label id="metricOptionsCustomRangeTo">To</label>
+            </th>
+          </tr>
+
+          <tr ng-repeat="range in vis.params.metric.colorsRange track by $index">
+            <td>
+              <input
+                aria-labelledby="metricOptionsCustomRangeFrom"
+                ng-model="range.from"
+                type="number"
+                class="form-control"
+                name="range.from"
+                greater-or-equal-than="{{getGreaterThan($index)}}"
+                required
+                step="any" />
+            </td>
+            <td>
+              <input
+                aria-labelledby="metricOptionsCustomRangeTo"
+                ng-model="range.to"
+                type="number"
+                class="form-control"
+                name="range.to"
+                greater-or-equal-than="{{range.from}}"
+                required
+                step="any" />
+            </td>
+            <td>
+              <button
+                type="button"
+                ng-click="removeRange($index)"
+                ng-show="vis.params.metric.colorsRange.length > 1"
+                class="kuiButton kuiButton--danger kuiButton--small">
+                <i class="fa fa-times"></i>
+              </button>
+            </td>
+          </tr>
+        </table>
+
+        <div class="hintbox" ng-show="!vis.params.metric.colorsRange.length">
+          <p>
+            <i class="fa fa-danger text-danger"></i>
+            <strong>Required:</strong> You must specify at least one range.
+          </p>
+        </div>
+
+        <div
+          ng-click="addRange()"
+          class="kuiButton kuiButton--primary kuiButton--fullWidth">
+          Add Range
+        </div>
+      </div>
+    </div>
+  </div>
+  <div ng-show="vis.params.metric.colorsRange.length > 1">
+    <div class="kuiSideBarCollapsibleTitle">
+      <div
+        kbn-accessible-click
+        aria-expanded="{{!!showColorOptions}}"
+        aria-controls="metricOptionsColors"
+        aria-label="Toggle color options"
+        class="kuiSideBarCollapsibleTitle__label"
+        ng-click="showColorOptions = !showColorOptions"
+      >
+      <span
+        aria-hidden="true"
+        ng-class="{
+        'fa-caret-down': showColorOptions,
+        'fa-caret-right': !showColorOptions
+        }"
+        class="fa fa-caret-right kuiSideBarCollapsibleTitle__caret"
+      ></span>
+        <span class="kuiSideBarCollapsibleTitle__text">
+        Color Options
+      </span>
+      </div>
+    </div>
+    <div id="metricOptionsColors" ng-if="showColorOptions" class="kuiSideBarCollapsibleSection">
+      <div class="kuiSideBarSection">
+        <div class="kuiSideBarFormRow">
+          <label class="kuiSideBarFormRow__label" for="colorSchema">
+            Color Schema
+          </label>
+          <div class="kuiSideBarFormRow__control">
+            <select
+              id="colorSchema"
+              class="kuiSelect kuiSideBarSelect"
+              ng-model="vis.params.metric.colorSchema"
+              ng-options="mode for mode in collections.colorSchemas"
+            ></select>
+          </div>
+          <div class="text-info text-center" ng-show="customColors" ng-click="resetColors()">reset colors</div>
+        </div>
+
+        <div class="kuiSideBarFormRow">
+          <label class="kuiSideBarFormRow__label" for="invertColors">
+            Reverse Color Schema
+          </label>
+          <div class="kuiSideBarFormRow__control">
+            <input class="kuiCheckBox" id="invertColors" type="checkbox" ng-model="vis.params.metric.invertColors">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div>
+    <div class="kuiSideBarCollapsibleTitle">
+      <div
+        kbn-accessible-click
+        aria-expanded="{{!!showStyle}}"
+        aria-controls="metricOptionsStyle"
+        aria-label="Toggle style options"
+        class="kuiSideBarCollapsibleTitle__label"
+        ng-click="showStyle = !showStyle"
+      >
+        <span
+          aria-hidden="true"
+          ng-class="{
+          'fa-caret-down': showStyle,
+          'fa-caret-right': !showStyle
+          }"
+          class="fa fa-caret-right kuiSideBarCollapsibleTitle__caret"
+        ></span>
+        <span class="kuiSideBarCollapsibleTitle__text">
+          Style
+        </span>
+      </div>
+    </div>
+    <div id="metricOptionsStyle" ng-if="showStyle" class="kuiSideBarCollapsibleSection">
+
+      <div class="kuiSideBarSection">
+        <div class="kuiSideBarFormRow" ng-show="vis.params.metric.colorsRange.length > 1">
+          <label class="kuiSideBarFormRow__label" for="metricColorMode">
+            Color
+          </label>
+          <div class="kuiSideBarFormRow__control">
+            <select
+              id="metricColorMode"
+              class="kuiSelect kuiSideBarSelect"
+              ng-model="vis.params.metric.metricColorMode"
+              ng-options="mode for mode in collections.metricColorMode"
+            ></select>
+          </div>
+        </div>
+        <div class="kuiSideBarFormRow">
+          <label class="kuiSideBarFormRow__label" for="metricFontSize">
+            Font Size (<span ng-bind="vis.params.metric.style.fontSize"></span>pt)
+          </label>
+          <div class="kuiSideBarFormRow__control">
+            <input id="metricFontSize" type="range" ng-model="vis.params.metric.style.fontSize" class="form-control" min="12" max="120" />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/core_plugins/metric_vis/public/metric_vis_params.js b/src/core_plugins/metric_vis/public/metric_vis_params.js
new file mode 100644
index 0000000000000..5efe6206e03f5
--- /dev/null
+++ b/src/core_plugins/metric_vis/public/metric_vis_params.js
@@ -0,0 +1,66 @@
+import { uiModules } from 'ui/modules';
+import metricVisParamsTemplate from './metric_vis_params.html';
+import _ from 'lodash';
+const module = uiModules.get('kibana');
+
+module.directive('metricVisParams', function () {
+  return {
+    restrict: 'E',
+    template: metricVisParamsTemplate,
+    replace: true,
+    link: function ($scope) {
+      $scope.collections = $scope.vis.type.editorConfig.collections;
+      $scope.showColorRange = true;
+
+      $scope.$watch('vis.params.metric.metricColorMode', newValue => {
+        switch (newValue) {
+          case 'Labels':
+            $scope.vis.params.metric.style.labelColor = true;
+            $scope.vis.params.metric.style.bgColor = false;
+            break;
+          case 'Background':
+            $scope.vis.params.metric.style.labelColor = false;
+            $scope.vis.params.metric.style.bgColor = true;
+            break;
+          case 'None':
+            $scope.vis.params.metric.style.labelColor = false;
+            $scope.vis.params.metric.style.bgColor = false;
+            break;
+        }
+      });
+
+      $scope.resetColors = function () {
+        $scope.uiState.set('vis.colors', null);
+        $scope.customColors = false;
+      };
+
+      $scope.getGreaterThan = function (index) {
+        if (index === 0) return 0;
+        return $scope.vis.params.metric.colorsRange[index - 1].to;
+      };
+
+      $scope.addRange = function () {
+        const previousRange = _.last($scope.vis.params.metric.colorsRange);
+        const from = previousRange ? previousRange.to : 0;
+        const to = previousRange ? from + (previousRange.to - previousRange.from) : 100;
+        $scope.vis.params.metric.colorsRange.push({ from: from, to: to });
+      };
+
+      $scope.removeRange = function (index) {
+        $scope.vis.params.metric.colorsRange.splice(index, 1);
+      };
+
+      $scope.getColor = function (index) {
+        const defaultColors = this.uiState.get('vis.defaultColors');
+        const overwriteColors = this.uiState.get('vis.colors');
+        const colors = defaultColors ? _.defaults({}, overwriteColors, defaultColors) : overwriteColors;
+        return colors ? Object.values(colors)[index] : 'transparent';
+      };
+
+      $scope.uiState.on('colorChanged', () => {
+        $scope.customColors = true;
+      });
+
+    }
+  };
+});
diff --git a/src/ui/public/vis/vis_update.js b/src/ui/public/vis/vis_update.js
index 5510ae33c0382..7bab9642273ae 100644
--- a/src/ui/public/vis/vis_update.js
+++ b/src/ui/public/vis/vis_update.js
@@ -5,6 +5,23 @@ const updateVisualizationConfig = (stateConfig, config) => {
     delete config.fontSize;
   }
 
+  // update old metric to the new one
+  if (config.type === 'gauge' && config.gauge.gaugeType === 'Metric') {
+    config.type = 'metric';
+    config.metric = config.gauge;
+    delete config.gauge;
+    delete config.metric.gaugeType;
+    delete config.metric.gaugeStyle;
+    delete config.metric.backStyle;
+    delete config.metric.scale;
+    delete config.metric.type;
+    delete config.metric.orientation;
+    delete config.metric.verticalSplit;
+    delete config.metric.autoExtend;
+    config.metric.metricColorMode = config.metric.gaugeColorMode;
+    delete config.metric.gaugeColorMode;
+  }
+
   if (!stateConfig || stateConfig.seriesParams) return;
   if (!['line', 'area', 'histogram'].includes(config.type)) return;
 
diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js
new file mode 100644
index 0000000000000..401d69eb51932
--- /dev/null
+++ b/test/functional/apps/visualize/_metric_chart.js
@@ -0,0 +1,263 @@
+import expect from 'expect.js';
+
+export default function ({ getService, getPageObjects }) {
+  const log = getService('log');
+  const retry = getService('retry');
+  const screenshots = getService('screenshots');
+  const PageObjects = getPageObjects(['common', 'visualize', 'header']);
+
+  describe('visualize app', function describeIndexTests() {
+    const fromTime = '2015-09-19 06:31:44.000';
+    const toTime = '2015-09-23 18:31:44.000';
+
+    before(function () {
+      log.debug('navigateToApp visualize');
+      return PageObjects.common.navigateToUrl('visualize', 'new')
+      .then(function () {
+        log.debug('clickMetric');
+        return PageObjects.visualize.clickMetric();
+      })
+      .then(function clickNewSearch() {
+        return PageObjects.visualize.clickNewSearch();
+      })
+      .then(function setAbsoluteRange() {
+        log.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
+        return PageObjects.header.setAbsoluteRange(fromTime, toTime);
+      });
+    });
+
+    describe('metric chart', function indexPatternCreation() {
+
+      it('should show Count', function () {
+        const expectedCount = ['14,004', 'Count'];
+
+        // initial metric of "Count" is selected by default
+        return retry.try(function tryingForTime() {
+          return PageObjects.visualize.getMetric()
+          .then(function (metricValue) {
+            screenshots.take('Visualize-metric-chart');
+            expect(expectedCount).to.eql(metricValue.split('\n'));
+          });
+        });
+      });
+
+      it('should show Average', function () {
+        const avgMachineRam = ['13,104,036,080.615', 'Average machine.ram'];
+        return PageObjects.visualize.clickMetricEditor()
+        .then(function () {
+          log.debug('Aggregation = Average');
+          return PageObjects.visualize.selectAggregation('Average');
+        })
+        .then(function selectField() {
+          log.debug('Field = machine.ram');
+          return PageObjects.visualize.selectField('machine.ram', 'metrics');
+        })
+        .then(function clickGo() {
+          return PageObjects.visualize.clickGo();
+        })
+        .then(function () {
+          return retry.try(function tryingForTime() {
+            return PageObjects.visualize.getMetric()
+              .then(function (metricValue) {
+                expect(avgMachineRam).to.eql(metricValue.split('\n'));
+              });
+          });
+        });
+      });
+
+      it('should show Sum', function () {
+        const sumPhpMemory = ['85,865,880', 'Sum of phpmemory'];
+        log.debug('Aggregation = Sum');
+        return PageObjects.visualize.selectAggregation('Sum')
+        .then(function selectField() {
+          log.debug('Field = phpmemory');
+          return PageObjects.visualize.selectField('phpmemory', 'metrics');
+        })
+        .then(function clickGo() {
+          return PageObjects.visualize.clickGo();
+        })
+        .then(function () {
+          return retry.try(function tryingForTime() {
+            return PageObjects.visualize.getMetric()
+              .then(function (metricValue) {
+                expect(sumPhpMemory).to.eql(metricValue.split('\n'));
+              });
+          });
+        });
+      });
+
+      it('should show Median', function () {
+        const medianBytes = ['5,565.263', '50th percentile of bytes'];
+        //  For now, only comparing the text label part of the metric
+        log.debug('Aggregation = Median');
+        return PageObjects.visualize.selectAggregation('Median')
+        .then(function selectField() {
+          log.debug('Field = bytes');
+          return PageObjects.visualize.selectField('bytes', 'metrics');
+        })
+        .then(function clickGo() {
+          return PageObjects.visualize.clickGo();
+        })
+        .then(function () {
+          return retry.try(function tryingForTime() {
+            return PageObjects.visualize.getMetric()
+              .then(function (metricValue) {
+                // only comparing the text label!
+                expect(medianBytes[1]).to.eql(metricValue.split('\n')[1]);
+              });
+          });
+        });
+      });
+
+      it('should show Min', function () {
+        const minTimestamp = ['September 20th 2015, 00:00:00.000', 'Min @timestamp'];
+        log.debug('Aggregation = Min');
+        return PageObjects.visualize.selectAggregation('Min')
+        .then(function selectField() {
+          log.debug('Field = @timestamp');
+          return PageObjects.visualize.selectField('@timestamp', 'metrics');
+        })
+        .then(function clickGo() {
+          return PageObjects.visualize.clickGo();
+        })
+        .then(function () {
+          return retry.try(function tryingForTime() {
+            return PageObjects.visualize.getMetric()
+              .then(function (metricValue) {
+                expect(minTimestamp).to.eql(metricValue.split('\n'));
+              });
+          });
+        });
+      });
+
+      it('should show Max', function () {
+        const maxRelatedContentArticleModifiedTime = ['April 4th 2015, 00:54:41.000', 'Max relatedContent.article:modified_time'];
+        log.debug('Aggregation = Max');
+        return PageObjects.visualize.selectAggregation('Max')
+        .then(function selectField() {
+          log.debug('Field = relatedContent.article:modified_time');
+          return PageObjects.visualize.selectField('relatedContent.article:modified_time', 'metrics');
+        })
+        .then(function clickGo() {
+          return PageObjects.visualize.clickGo();
+        })
+        .then(function () {
+          return retry.try(function tryingForTime() {
+            return PageObjects.visualize.getMetric()
+              .then(function (metricValue) {
+                expect(maxRelatedContentArticleModifiedTime).to.eql(metricValue.split('\n'));
+              });
+          });
+        });
+      });
+
+      it('should show Standard Deviation', function () {
+        const standardDeviationBytes = [
+          '-1,435.138', 'Lower Standard Deviation of bytes',
+          '12,889.766', 'Upper Standard Deviation of bytes'
+        ];
+        log.debug('Aggregation = Standard Deviation');
+        return PageObjects.visualize.selectAggregation('Standard Deviation')
+        .then(function selectField() {
+          log.debug('Field = bytes');
+          return PageObjects.visualize.selectField('bytes', 'metrics');
+        })
+        .then(function clickGo() {
+          return PageObjects.visualize.clickGo();
+        })
+        .then(function () {
+          return retry.try(function tryingForTime() {
+            return PageObjects.visualize.getMetric()
+              .then(function (metricValue) {
+                expect(standardDeviationBytes).to.eql(metricValue.split('\n'));
+              });
+          });
+        });
+      });
+
+      it('should show Unique Count', function () {
+        const uniqueCountClientip = ['1,000', 'Unique count of clientip'];
+        log.debug('Aggregation = Unique Count');
+        return PageObjects.visualize.selectAggregation('Unique Count')
+        .then(function selectField() {
+          log.debug('Field = clientip');
+          return PageObjects.visualize.selectField('clientip', 'metrics');
+        })
+        .then(function clickGo() {
+          return PageObjects.visualize.clickGo();
+        })
+        .then(function () {
+          return retry.try(function tryingForTime() {
+            return PageObjects.visualize.getMetric()
+              .then(function (metricValue) {
+                expect(uniqueCountClientip).to.eql(metricValue.split('\n'));
+              });
+          });
+        })
+        .then(function () {
+          return PageObjects.visualize.getMetric()
+            .then(function (metricValue) {
+              log.debug('metricValue=' + metricValue.split('\n'));
+              expect(uniqueCountClientip).to.eql(metricValue.split('\n'));
+            });
+        });
+      });
+
+      it('should show Percentiles', function () {
+        const percentileMachineRam = [
+          '2,147,483,648', '1st percentile of machine.ram',
+          '3,221,225,472', '5th percentile of machine.ram',
+          '7,516,192,768', '25th percentile of machine.ram',
+          '12,884,901,888', '50th percentile of machine.ram',
+          '18,253,611,008', '75th percentile of machine.ram',
+          '32,212,254,720', '95th percentile of machine.ram',
+          '32,212,254,720', '99th percentile of machine.ram'
+        ];
+
+        log.debug('Aggregation = Percentiles');
+        return PageObjects.visualize.selectAggregation('Percentiles')
+        .then(function selectField() {
+          log.debug('Field =  machine.ram');
+          return PageObjects.visualize.selectField('machine.ram', 'metrics');
+        })
+        .then(function clickGo() {
+          return PageObjects.visualize.clickGo();
+        })
+        .then(function () {
+          return retry.try(function tryingForTime() {
+            return PageObjects.visualize.getMetric()
+              .then(function (metricValue) {
+                expect(percentileMachineRam).to.eql(metricValue.split('\n'));
+              });
+          });
+        });
+      });
+
+      it('should show Percentile Ranks', function () {
+        const percentileRankBytes = [ '2.036%', 'Percentile rank 99 of "memory"'];
+        log.debug('Aggregation = Percentile Ranks');
+        return PageObjects.visualize.selectAggregation('Percentile Ranks')
+        .then(function selectField() {
+          log.debug('Field =  bytes');
+          return PageObjects.visualize.selectField('memory', 'metrics');
+        })
+        .then(function selectField() {
+          log.debug('Values =  99');
+          return PageObjects.visualize.setValue('99');
+        })
+        .then(function clickGo() {
+          return PageObjects.visualize.clickGo();
+        })
+        .then(function () {
+          return retry.try(function tryingForTime() {
+            return PageObjects.visualize.getMetric()
+              .then(function (metricValue) {
+                expect(percentileRankBytes).to.eql(metricValue.split('\n'));
+              });
+          });
+        });
+      });
+
+    });
+  });
+}

From 9fa4a0435c4ed0bafe1bf0363573a2e2529a0f2b Mon Sep 17 00:00:00 2001
From: Stacey Gammon <gammon@elastic.co>
Date: Fri, 10 Nov 2017 08:24:29 -0500
Subject: [PATCH 05/18] fix console warning about missing required prop
 (#14876)

---
 .../kibana/public/dashboard/grid/dashboard_grid.test.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.test.js b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.test.js
index 16dd246b7594a..0d3450dfe99c2 100644
--- a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.test.js
+++ b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.test.js
@@ -32,7 +32,7 @@ function getProps(props = {}) {
     },
     getEmbeddableFactory: () => getEmbeddableFactoryMock(),
     getContainerApi: () => getContainerApiMock(),
-    onPanelUpdated: () => {},
+    onPanelsUpdated: () => {},
     useMargins: true,
   };
   return Object.assign(defaultTestProps, props);

From 30238e8744b2a168f86a4b80d4686645eda13193 Mon Sep 17 00:00:00 2001
From: Tim Roes <github@timroes.de>
Date: Fri, 10 Nov 2017 16:31:14 +0100
Subject: [PATCH 06/18] Fix broken date range look, fix #12731 (#14837)

---
 src/ui/public/agg_types/controls/date_ranges.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/public/agg_types/controls/date_ranges.html b/src/ui/public/agg_types/controls/date_ranges.html
index 7545718f91be5..735c64f98a96b 100644
--- a/src/ui/public/agg_types/controls/date_ranges.html
+++ b/src/ui/public/agg_types/controls/date_ranges.html
@@ -11,7 +11,7 @@
 
       <tr
         ng-repeat="range in agg.params.ranges track by $index">
-        <td class="kbn-timepicker">
+        <td>
           <input
             aria-labelledby="visEditorDateRangeFrom{{agg.id}}"
             ng-model="range.from"
@@ -20,7 +20,7 @@
             class="form-control"
             name="range.from" />
         </td>
-        <td class="kbn-timepicker">
+        <td>
           <input
             aria-labelledby="visEditorDateRangeTo{{agg.id}}"
             ng-model="range.to"

From 3bde84393c2857257fbdaf601627fcd9eeebc73b Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Fri, 10 Nov 2017 07:56:06 -0800
Subject: [PATCH 07/18] Fix Jest warnings for ConfirmModal. (#14892)

---
 .../components/modal/confirm_modal.test.js    | 72 ++++++++++++-------
 1 file changed, 48 insertions(+), 24 deletions(-)

diff --git a/ui_framework/src/components/modal/confirm_modal.test.js b/ui_framework/src/components/modal/confirm_modal.test.js
index 73b9e1372b405..ef98bbe895a39 100644
--- a/ui_framework/src/components/modal/confirm_modal.test.js
+++ b/ui_framework/src/components/modal/confirm_modal.test.js
@@ -34,10 +34,14 @@ test('renders KuiConfirmModal', () => {
 });
 
 test('onConfirm', () => {
-  const component = mount(<KuiConfirmModal
-    onCancel={onCancel}
-    onConfirm={onConfirm}
-  />);
+  const component = mount(
+    <KuiConfirmModal
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+      cancelButtonText="Cancel Button Text"
+      confirmButtonText="Confirm Button Text"
+    />
+  );
   component.find('[data-test-subj="confirmModalConfirmButton"]').simulate('click');
   sinon.assert.calledOnce(onConfirm);
   sinon.assert.notCalled(onCancel);
@@ -45,21 +49,29 @@ test('onConfirm', () => {
 
 describe('onCancel', () => {
   test('triggerd by click', () => {
-    const component = mount(<KuiConfirmModal
-      onCancel={onCancel}
-      onConfirm={onConfirm}
-    />);
+    const component = mount(
+      <KuiConfirmModal
+        onCancel={onCancel}
+        onConfirm={onConfirm}
+        cancelButtonText="Cancel Button Text"
+        confirmButtonText="Confirm Button Text"
+      />
+    );
     component.find('[data-test-subj="confirmModalCancelButton"]').simulate('click');
     sinon.assert.notCalled(onConfirm);
     sinon.assert.calledOnce(onCancel);
   });
 
   test('triggered by esc key', () => {
-    const component = mount(<KuiConfirmModal
-      onCancel={onCancel}
-      onConfirm={onConfirm}
-      data-test-subj="modal"
-    />);
+    const component = mount(
+      <KuiConfirmModal
+        onCancel={onCancel}
+        onConfirm={onConfirm}
+        cancelButtonText="Cancel Button Text"
+        confirmButtonText="Confirm Button Text"
+        data-test-subj="modal"
+      />
+    );
     component.find('[data-test-subj="modal"]').simulate('keydown', { keyCode: keyCodes.ESCAPE });
     sinon.assert.notCalled(onConfirm);
     sinon.assert.calledOnce(onCancel);
@@ -68,27 +80,39 @@ describe('onCancel', () => {
 
 describe('defaultFocusedButton', () => {
   test('is cancel', () => {
-    const component = mount(<KuiConfirmModal
-      onCancel={onCancel}
-      defaultFocusedButton={CANCEL_BUTTON}
-    />);
+    const component = mount(
+      <KuiConfirmModal
+        onCancel={onCancel}
+        defaultFocusedButton={CANCEL_BUTTON}
+        cancelButtonText="Cancel Button Text"
+        confirmButtonText="Confirm Button Text"
+      />
+    );
     const button = component.find('[data-test-subj="confirmModalCancelButton"]').getDOMNode();
     expect(document.activeElement).toEqual(button);
   });
 
   test('is confirm', () => {
-    const component = mount(<KuiConfirmModal
-      onCancel={onCancel}
-      defaultFocusedButton={CONFIRM_BUTTON}
-    />);
+    const component = mount(
+      <KuiConfirmModal
+        onCancel={onCancel}
+        defaultFocusedButton={CONFIRM_BUTTON}
+        cancelButtonText="Cancel Button Text"
+        confirmButtonText="Confirm Button Text"
+      />
+    );
     const button = component.find('[data-test-subj="confirmModalConfirmButton"]').getDOMNode();
     expect(document.activeElement).toEqual(button);
   });
 
   test('when not given gives focus to the modal', () => {
-    const component = mount(<KuiConfirmModal
-      onCancel={onCancel}
-    />);
+    const component = mount(
+      <KuiConfirmModal
+        onCancel={onCancel}
+        cancelButtonText="Cancel Button Text"
+        confirmButtonText="Confirm Button Text"
+      />
+    );
     expect(document.activeElement).toEqual(component.getDOMNode().firstChild);
   });
 });

From 2b06e4bac661d15963172cf3ca4856ac731d404c Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jbudz@users.noreply.github.com>
Date: Fri, 10 Nov 2017 11:47:12 -0600
Subject: [PATCH 08/18] Bump react-grid-layout to 0.16.0 (#14620)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cab0142dca69b..d8ed225a4eaad 100644
--- a/package.json
+++ b/package.json
@@ -171,7 +171,7 @@
     "react-anything-sortable": "1.6.1",
     "react-color": "2.11.7",
     "react-dom": "15.6.1",
-    "react-grid-layout": "0.14.7",
+    "react-grid-layout": "0.16.0",
     "react-input-autosize": "1.1.0",
     "react-input-range": "1.2.1",
     "react-markdown": "2.4.2",

From 05f4ad03441f49e23a367a982d3afd3df79dcb7e Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jbudz@users.noreply.github.com>
Date: Fri, 10 Nov 2017 12:26:17 -0600
Subject: [PATCH 09/18] [console] assorted autocomplete fixes (#14770)

* [console] add miminum_should_match to match query

* [console] source include,exclude -> includes,excludes

* [console] Remove lowercase expanded terms

* [console] _source_{include,exclude} -> _source_{includes,excludes}

* [console] autocomplete for rollover api

* [console] autocomplete for extended_bounds
---
 .../console/api_server/es_5_0/aggregations.js    | 16 ++++++++++++++++
 .../console/api_server/es_5_0/document.js        |  8 ++++----
 .../console/api_server/es_5_0/indices.js         | 13 +++++++++++++
 .../console/api_server/es_5_0/query.js           |  7 ++-----
 .../console/api_server/es_5_0/search.js          |  9 ++++-----
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/core_plugins/console/api_server/es_5_0/aggregations.js b/src/core_plugins/console/api_server/es_5_0/aggregations.js
index fff4655c56a27..e006bda27877d 100644
--- a/src/core_plugins/console/api_server/es_5_0/aggregations.js
+++ b/src/core_plugins/console/api_server/es_5_0/aggregations.js
@@ -188,6 +188,14 @@ var rules = {
       },
       "field": "{field}",
       "interval": 50,
+      "extended_bounds": {
+        "__template": {
+          "min": 0,
+          "max": 50
+        },
+        "min": 0,
+        "max": 50
+      },
       "min_doc_count": 0,
       "order": {
         __template: {
@@ -208,6 +216,14 @@ var rules = {
       "field": "{field}",
       "interval": { __one_of: ["year", "quarter", "week", "day", "hour", "minute", "second"] },
       "min_doc_count": 0,
+      "extended_bounds": {
+        "__template": {
+          "min": "now/d",
+          "max": "now/d"
+        },
+        "min": "now/d",
+        "max": "now/d"
+      },
       "order": {
         __template: {
           "_key": "asc"
diff --git a/src/core_plugins/console/api_server/es_5_0/document.js b/src/core_plugins/console/api_server/es_5_0/document.js
index 1c0537a2ca701..e1d1c4bb92108 100644
--- a/src/core_plugins/console/api_server/es_5_0/document.js
+++ b/src/core_plugins/console/api_server/es_5_0/document.js
@@ -9,8 +9,8 @@ export default function (api) {
       "routing": "",
       "parent": "",
       "_source": "",
-      "_source_exclude": "",
-      "_source_include": ""
+      "_source_excludes": "",
+      "_source_includes": ""
     }
   });
   api.addEndpointDescription('_get_doc_source', {
@@ -22,8 +22,8 @@ export default function (api) {
       "version": 1,
       "routing": "",
       "parent": "",
-      "_source_exclude": "",
-      "_source_include": ""
+      "_source_excludes": "",
+      "_source_includes": ""
     }
   });
   api.addEndpointDescription('_delete_doc', {
diff --git a/src/core_plugins/console/api_server/es_5_0/indices.js b/src/core_plugins/console/api_server/es_5_0/indices.js
index 45f898f51d89d..71160db4abfd0 100644
--- a/src/core_plugins/console/api_server/es_5_0/indices.js
+++ b/src/core_plugins/console/api_server/es_5_0/indices.js
@@ -19,6 +19,19 @@ export default function (api) {
     }
   });
 
+
+  api.addEndpointDescription('_rollover', {
+    methods: ['POST'],
+    patterns: [
+      "{name}/_rollover",
+      "{name}/_rollover/{name}"
+    ],
+    url_params: {
+      wait_for_active_shards: "",
+      dry_run: "__flag__"
+    }
+  });
+
   api.addEndpointDescription('_flush_synced', {
     methods: ['POST'],
     patterns: [
diff --git a/src/core_plugins/console/api_server/es_5_0/query.js b/src/core_plugins/console/api_server/es_5_0/query.js
index e6769b66eeaa0..34ddd7b21d9ca 100644
--- a/src/core_plugins/console/api_server/es_5_0/query.js
+++ b/src/core_plugins/console/api_server/es_5_0/query.js
@@ -84,7 +84,8 @@ export default function (api) {
         'max_expansions': 10,
         'analyzer': '',
         'fuzziness': 1.0,
-        'prefix_length': 1
+        'prefix_length': 1,
+        'minimum_should_match': 1
       }
     },
     match_phrase: {
@@ -287,9 +288,6 @@ export default function (api) {
       allow_leading_wildcard: {
         __one_of: [true, false]
       },
-      lowercase_expanded_terms: {
-        __one_of: [true, false]
-      },
       enable_position_increments: {
         __one_of: [true, false]
       },
@@ -324,7 +322,6 @@ export default function (api) {
       default_operator: { __one_of: ["OR", "AND"] },
       analyzer: "",
       flags: "OR|AND|PREFIX",
-      lowercase_expanded_terms: { __one_of: [true, false] },
       locale: "ROOT",
       lenient: { __one_of: [true, false] }
     },
diff --git a/src/core_plugins/console/api_server/es_5_0/search.js b/src/core_plugins/console/api_server/es_5_0/search.js
index edadb55822e25..855cd0db5490d 100644
--- a/src/core_plugins/console/api_server/es_5_0/search.js
+++ b/src/core_plugins/console/api_server/es_5_0/search.js
@@ -14,8 +14,8 @@ export default function (api) {
       default_operator: ["AND", "OR"],
       explain: "__flag__",
       _source: "",
-      _source_include: "",
-      _source_exclude: "",
+      _source_includes: "",
+      _source_excludes: "",
       stored_fields: [],
       sort: "",
       track_scores: "__flag__",
@@ -24,7 +24,6 @@ export default function (api) {
       size: 10,
       search_type: ["dfs_query_then_fetch", "dfs_query_and_fetch", "query_then_fetch", "query_and_fetch"],
       terminate_after: 10,
-      lowercase_expanded_terms: ["true", "false"],
       analyze_wildcard: "__flag__",
       preference: ["_primary", "_primary_first", "_local", "_only_node:xyz", "_prefer_node:xyz", "_shards:2,3"],
       scroll: "5m",
@@ -153,13 +152,13 @@ export default function (api) {
           "{field}",
           ["{field}"],
           {
-            "include": {
+            "includes": {
               __one_of: [
                 "{field}",
                 ["{field}"]
               ]
             },
-            "exclude": {
+            "excludes": {
               __one_of: [
                 "{field}",
                 ["{field}"]

From b4565aabdfa899eab05447a726203918e9e7d481 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jbudz@users.noreply.github.com>
Date: Fri, 10 Nov 2017 18:30:49 -0600
Subject: [PATCH 10/18] Revert "Bump react-grid-layout to 0.16.0 (#14620)"
 (#14912)

This reverts commit 2b06e4bac661d15963172cf3ca4856ac731d404c.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d8ed225a4eaad..cab0142dca69b 100644
--- a/package.json
+++ b/package.json
@@ -171,7 +171,7 @@
     "react-anything-sortable": "1.6.1",
     "react-color": "2.11.7",
     "react-dom": "15.6.1",
-    "react-grid-layout": "0.16.0",
+    "react-grid-layout": "0.14.7",
     "react-input-autosize": "1.1.0",
     "react-input-range": "1.2.1",
     "react-markdown": "2.4.2",

From fb4a3815148cb4ffba5b29c7f78e03f6a2733fce Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tylersmalley@me.com>
Date: Mon, 13 Nov 2017 10:25:10 -0800
Subject: [PATCH 11/18] Adds keystore for securely storing settings (#14714)

Introduces bin/kibana-keystore providing create, list, add, and remove actions.

Settings stored within the keystore will be loaded at runtime.

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 bin/kibana-keystore                           |  24 +++
 bin/kibana-keystore.bat                       |  29 +++
 docs/setup.asciidoc                           |   2 +
 docs/setup/secure-settings.asciidoc           |  64 ++++++
 src/cli/serve/__tests__/read_yaml_config.js   |   2 +-
 .../serve/__tests__/reload_logging_config.js  |   2 +-
 src/cli/serve/read_keystore.js                |  26 +++
 src/cli/serve/read_yaml_config.js             |   2 +-
 src/cli/serve/serve.js                        |   5 +-
 src/cli_keystore/__tests__/add.js             | 134 ++++++++++++
 src/cli_keystore/__tests__/create.js          |  79 +++++++
 src/cli_keystore/__tests__/list.js            |  48 +++++
 src/cli_keystore/__tests__/remove.js          |  46 +++++
 src/cli_keystore/add.js                       |  50 +++++
 src/cli_keystore/cli_keystore.js              |  31 +++
 src/cli_keystore/create.js                    |  26 +++
 src/cli_keystore/index.js                     |   2 +
 src/cli_keystore/list.js                      |  16 ++
 src/cli_keystore/remove.js                    |  12 ++
 src/cli_plugin/install/kibana.js              |   2 +-
 src/cli_plugin/lib/logger.js                  |   2 +-
 src/server/keystore/__tests__/keystore.js     | 193 ++++++++++++++++++
 src/server/keystore/errors.js                 |  12 ++
 src/server/keystore/index.js                  |   1 +
 src/server/keystore/keystore.js               | 103 ++++++++++
 src/server/utils/__tests__/prompt.js          | 100 +++++++++
 src/server/utils/index.js                     |   1 +
 src/server/utils/prompt.js                    |  73 +++++++
 28 files changed, 1081 insertions(+), 6 deletions(-)
 create mode 100755 bin/kibana-keystore
 create mode 100644 bin/kibana-keystore.bat
 create mode 100644 docs/setup/secure-settings.asciidoc
 create mode 100644 src/cli/serve/read_keystore.js
 create mode 100644 src/cli_keystore/__tests__/add.js
 create mode 100644 src/cli_keystore/__tests__/create.js
 create mode 100644 src/cli_keystore/__tests__/list.js
 create mode 100644 src/cli_keystore/__tests__/remove.js
 create mode 100644 src/cli_keystore/add.js
 create mode 100644 src/cli_keystore/cli_keystore.js
 create mode 100644 src/cli_keystore/create.js
 create mode 100644 src/cli_keystore/index.js
 create mode 100644 src/cli_keystore/list.js
 create mode 100644 src/cli_keystore/remove.js
 create mode 100644 src/server/keystore/__tests__/keystore.js
 create mode 100644 src/server/keystore/errors.js
 create mode 100644 src/server/keystore/index.js
 create mode 100644 src/server/keystore/keystore.js
 create mode 100644 src/server/utils/__tests__/prompt.js
 create mode 100644 src/server/utils/index.js
 create mode 100644 src/server/utils/prompt.js

diff --git a/bin/kibana-keystore b/bin/kibana-keystore
new file mode 100755
index 0000000000000..62735450f553e
--- /dev/null
+++ b/bin/kibana-keystore
@@ -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
+
+"${NODE}" "${DIR}/src/cli_keystore" "$@"
diff --git a/bin/kibana-keystore.bat b/bin/kibana-keystore.bat
new file mode 100644
index 0000000000000..c5b4131338db1
--- /dev/null
+++ b/bin/kibana-keystore.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 Keystore
+"%NODE%" "%DIR%\src\cli_keystore" %*
+
+:finally
+
+ENDLOCAL
diff --git a/docs/setup.asciidoc b/docs/setup.asciidoc
index 2ed96266e9f38..9c4ceec9c793d 100644
--- a/docs/setup.asciidoc
+++ b/docs/setup.asciidoc
@@ -50,6 +50,8 @@ include::setup/install.asciidoc[]
 
 include::setup/settings.asciidoc[]
 
+include::setup/secure-settings.asciidoc[]
+
 include::setup/docker.asciidoc[]
 
 include::setup/access.asciidoc[]
diff --git a/docs/setup/secure-settings.asciidoc b/docs/setup/secure-settings.asciidoc
new file mode 100644
index 0000000000000..2fa719519ffcf
--- /dev/null
+++ b/docs/setup/secure-settings.asciidoc
@@ -0,0 +1,64 @@
+[[secure-settings]]
+=== Secure Settings
+
+Some settings are sensitive, and relying on filesystem permissions to protect
+their values is not sufficient. For this use case, Kibana provides a
+keystore, and the `kibana-keystore` tool to manage the settings in the keystore.
+
+NOTE: All commands here should be run as the user which will run Kibana.
+
+[float]
+[[creating-keystore]]
+=== Creating the keystore
+
+To create the `kibana.keystore`, use the `create` command:
+
+[source,sh]
+----------------------------------------------------------------
+bin/kibana-keystore create
+----------------------------------------------------------------
+
+The file `kibana.keystore` will be created in the directory defined by the
+`path.data` configuration setting.
+
+[float]
+[[list-settings]]
+=== Listing settings in the keystore
+
+A list of the settings in the keystore is available with the `list` command:
+
+[source,sh]
+----------------------------------------------------------------
+bin/kibana-keystore list
+----------------------------------------------------------------
+
+[float]
+[[add-string-to-keystore]]
+=== Adding string settings
+
+Sensitive string settings, like authentication credentials for Elasticsearch
+can be added using the `add` command:
+
+[source,sh]
+----------------------------------------------------------------
+bin/kibana-keystore add the.setting.name.to.set
+----------------------------------------------------------------
+
+The tool will prompt for the value of the setting. To pass the value
+through stdin, use the `--stdin` flag:
+
+[source,sh]
+----------------------------------------------------------------
+cat /file/containing/setting/value | bin/kibana-keystore add --stdin the.setting.name.to.set
+----------------------------------------------------------------
+
+[float]
+[[remove-settings]]
+=== Removing settings
+
+To remove a setting from the keystore, use the `remove` command:
+
+[source,sh]
+----------------------------------------------------------------
+bin/kibana-keystore remove the.setting.name.to.remove
+----------------------------------------------------------------
diff --git a/src/cli/serve/__tests__/read_yaml_config.js b/src/cli/serve/__tests__/read_yaml_config.js
index ed57437d74379..ef72c63799e87 100644
--- a/src/cli/serve/__tests__/read_yaml_config.js
+++ b/src/cli/serve/__tests__/read_yaml_config.js
@@ -1,6 +1,6 @@
 import expect from 'expect.js';
 import { join, relative, resolve } from 'path';
-import readYamlConfig from '../read_yaml_config';
+import { readYamlConfig } from '../read_yaml_config';
 
 function fixture(name) {
   return resolve(__dirname, 'fixtures', name);
diff --git a/src/cli/serve/__tests__/reload_logging_config.js b/src/cli/serve/__tests__/reload_logging_config.js
index 19ff760746e21..ab9f826665c17 100644
--- a/src/cli/serve/__tests__/reload_logging_config.js
+++ b/src/cli/serve/__tests__/reload_logging_config.js
@@ -3,7 +3,7 @@ import { writeFileSync } from 'fs';
 import { relative, resolve } from 'path';
 import { safeDump } from 'js-yaml';
 import es from 'event-stream';
-import readYamlConfig from '../read_yaml_config';
+import { readYamlConfig } from '../read_yaml_config';
 import expect from 'expect.js';
 
 const testConfigFile = follow(`fixtures/reload_logging_config/kibana.test.yml`);
diff --git a/src/cli/serve/read_keystore.js b/src/cli/serve/read_keystore.js
new file mode 100644
index 0000000000000..ecaa6e55deb29
--- /dev/null
+++ b/src/cli/serve/read_keystore.js
@@ -0,0 +1,26 @@
+import { join } from 'path';
+import { set } from 'lodash';
+
+import { Keystore } from '../../server/keystore';
+import { getData } from '../../server/path';
+
+export function loadKeystore() {
+  const path = join(getData(), 'kibana.keystore');
+
+  const keystore = new Keystore(path);
+  keystore.load();
+
+  return keystore;
+}
+
+export function readKeystore() {
+  const keystore = loadKeystore();
+  const keys = Object.keys(keystore.data);
+
+  const data = {};
+  keys.forEach(key => {
+    set(data, key, keystore.data[key]);
+  });
+
+  return data;
+}
diff --git a/src/cli/serve/read_yaml_config.js b/src/cli/serve/read_yaml_config.js
index dad9f4e03a92a..76b68f086d343 100644
--- a/src/cli/serve/read_yaml_config.js
+++ b/src/cli/serve/read_yaml_config.js
@@ -24,7 +24,7 @@ export function merge(sources) {
   }, {});
 }
 
-export default function (paths) {
+export function readYamlConfig(paths) {
   const files = [].concat(paths || []);
   const yamls = files.map(path => safeLoad(read(path, 'utf8')));
   return merge(yamls);
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index 4dad11c97feb2..f201df7e167c8 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -2,9 +2,11 @@ import _ from 'lodash';
 import { statSync } from 'fs';
 import { isWorker } from 'cluster';
 import { resolve } from 'path';
+
 import { fromRoot } from '../../utils';
 import { getConfig } from '../../server/path';
-import readYamlConfig from './read_yaml_config';
+import { readYamlConfig } from './read_yaml_config';
+import { readKeystore } from './read_keystore';
 
 import { DEV_SSL_CERT_PATH, DEV_SSL_KEY_PATH } from '../dev_ssl';
 
@@ -67,6 +69,7 @@ function readServerSettings(opts, extraCliOptions) {
     opts.pluginPath
   )));
 
+  merge(readKeystore());
   merge(extraCliOptions);
 
   return settings;
diff --git a/src/cli_keystore/__tests__/add.js b/src/cli_keystore/__tests__/add.js
new file mode 100644
index 0000000000000..257d2b688de8f
--- /dev/null
+++ b/src/cli_keystore/__tests__/add.js
@@ -0,0 +1,134 @@
+import expect from 'expect.js';
+import sinon from 'sinon';
+import mockFs from 'mock-fs';
+import { PassThrough } from 'stream';
+
+import { Keystore } from '../../server/keystore';
+import { add } from '../add';
+import Logger from '../../cli_plugin/lib/logger';
+import * as prompt from '../../server/utils/prompt';
+
+describe('Kibana keystore', () => {
+  describe('add', () => {
+    const sandbox = sinon.sandbox.create();
+
+    const keystoreData = '1:IxR0geiUTMJp8ueHDkqeUJ0I9eEw4NJPXIJi22UDyfGfJSy4mH'
+      + 'BBuGPkkAix/x/YFfIxo4tiKGdJ2oVTtU8LgKDkVoGdL+z7ylY4n3myatt6osqhI4lzJ9M'
+      + 'Ry21UcAJki2qFUTj4TYuvhta3LId+RM5UX/dJ2468hQ==';
+
+    beforeEach(() => {
+      mockFs({
+        '/data': {
+          'test.keystore': JSON.stringify(keystoreData),
+        }
+      });
+
+      sandbox.stub(prompt, 'confirm');
+      sandbox.stub(prompt, 'question');
+
+      sandbox.stub(Logger.prototype, 'log');
+      sandbox.stub(Logger.prototype, 'error');
+    });
+
+    afterEach(() => {
+      mockFs.restore();
+      sandbox.restore();
+    });
+
+    it('returns an error for a nonexistent keystore', async () => {
+      const keystore = new Keystore('/data/nonexistent.keystore');
+      const message = 'ERROR: Kibana keystore not found. Use \'create\' command to create one.';
+
+      await add(keystore, 'foo');
+
+      sinon.assert.calledOnce(Logger.prototype.error);
+      sinon.assert.calledWith(Logger.prototype.error, message);
+    });
+
+    it('does not attempt to create a keystore', async () => {
+      const keystore = new Keystore('/data/nonexistent.keystore');
+      sandbox.stub(keystore, 'save');
+
+      await add(keystore, 'foo');
+
+      sinon.assert.notCalled(keystore.save);
+    });
+
+    it('prompts for existing key', async () => {
+      prompt.confirm.returns(Promise.resolve(true));
+      prompt.question.returns(Promise.resolve('bar'));
+
+      const keystore = new Keystore('/data/test.keystore');
+      await add(keystore, 'a2');
+
+      sinon.assert.calledOnce(prompt.confirm);
+      sinon.assert.calledOnce(prompt.question);
+
+      const { args } = prompt.confirm.getCall(0);
+
+      expect(args[0]).to.eql('Setting a2 already exists. Overwrite?');
+    });
+
+    it('aborts if overwrite is denied', async () => {
+      prompt.confirm.returns(Promise.resolve(false));
+
+      const keystore = new Keystore('/data/test.keystore');
+      await add(keystore, 'a2');
+
+      sinon.assert.notCalled(prompt.question);
+
+      sinon.assert.calledOnce(Logger.prototype.log);
+      sinon.assert.calledWith(Logger.prototype.log, 'Exiting without modifying keystore.');
+    });
+
+    it('overwrites without prompt if force is supplied', async () => {
+      prompt.question.returns(Promise.resolve('bar'));
+
+      const keystore = new Keystore('/data/test.keystore');
+      sandbox.stub(keystore, 'save');
+
+      await add(keystore, 'a2', { force: true });
+
+      sinon.assert.notCalled(prompt.confirm);
+      sinon.assert.calledOnce(keystore.save);
+    });
+
+    it('trims value', async () => {
+      prompt.question.returns(Promise.resolve('bar\n'));
+
+      const keystore = new Keystore('/data/test.keystore');
+      sandbox.stub(keystore, 'save');
+
+      await add(keystore, 'foo');
+
+      expect(keystore.data.foo).to.eql('bar');
+    });
+
+    it('persists updated keystore', async () => {
+      prompt.question.returns(Promise.resolve('bar\n'));
+
+
+      const keystore = new Keystore('/data/test.keystore');
+      sandbox.stub(keystore, 'save');
+
+      await add(keystore, 'foo');
+
+      sinon.assert.calledOnce(keystore.save);
+    });
+
+    it('accepts stdin', async () => {
+      const keystore = new Keystore('/data/test.keystore');
+      sandbox.stub(keystore, 'save');
+
+      const stdin = new PassThrough();
+      process.nextTick(() => {
+        stdin.write('kibana\n');
+        stdin.end();
+      });
+
+      await add(keystore, 'foo', { stdin });
+
+      expect(keystore.data.foo).to.eql('kibana');
+    });
+  });
+});
diff --git a/src/cli_keystore/__tests__/create.js b/src/cli_keystore/__tests__/create.js
new file mode 100644
index 0000000000000..f08b3981eb955
--- /dev/null
+++ b/src/cli_keystore/__tests__/create.js
@@ -0,0 +1,79 @@
+import expect from 'expect.js';
+import sinon from 'sinon';
+import mockFs from 'mock-fs';
+
+import { Keystore } from '../../server/keystore';
+import { create } from '../create';
+import Logger from '../../cli_plugin/lib/logger';
+import * as prompt from '../../server/utils/prompt';
+
+describe('Kibana keystore', () => {
+  describe('create', () => {
+    const sandbox = sinon.sandbox.create();
+
+    const keystoreData = '1:IxR0geiUTMJp8ueHDkqeUJ0I9eEw4NJPXIJi22UDyfGfJSy4mH'
+      + 'BBuGPkkAix/x/YFfIxo4tiKGdJ2oVTtU8LgKDkVoGdL+z7ylY4n3myatt6osqhI4lzJ9M'
+      + 'Ry21UcAJki2qFUTj4TYuvhta3LId+RM5UX/dJ2468hQ==';
+
+    beforeEach(() => {
+      mockFs({
+        '/data': {
+          'test.keystore': JSON.stringify(keystoreData),
+        }
+      });
+
+      sandbox.stub(Logger.prototype, 'log');
+      sandbox.stub(Logger.prototype, 'error');
+    });
+
+    afterEach(() => {
+      mockFs.restore();
+      sandbox.restore();
+    });
+
+    it('creates keystore file', async () => {
+      const keystore = new Keystore('/data/foo.keystore');
+      sandbox.stub(keystore, 'save');
+
+      await create(keystore);
+
+      sinon.assert.calledOnce(keystore.save);
+    });
+
+    it('logs successful keystore creating', async () => {
+      const path = '/data/foo.keystore';
+      const keystore = new Keystore(path);
+
+      await create(keystore);
+
+      sinon.assert.calledOnce(Logger.prototype.log);
+      sinon.assert.calledWith(Logger.prototype.log, `Created Kibana keystore in ${path}`);
+    });
+
+    it('prompts for overwrite', async () => {
+      sandbox.stub(prompt, 'confirm').returns(Promise.resolve(true));
+
+      const keystore = new Keystore('/data/test.keystore');
+      await create(keystore);
+
+      sinon.assert.calledOnce(prompt.confirm);
+      const { args } = prompt.confirm.getCall(0);
+
+      expect(args[0]).to.eql('A Kibana keystore already exists. Overwrite?');
+    });
+
+    it('aborts if overwrite is denied', async () => {
+      sandbox.stub(prompt, 'confirm').returns(Promise.resolve(false));
+
+      const keystore = new Keystore('/data/test.keystore');
+      sandbox.stub(keystore, 'save');
+
+      await create(keystore);
+
+      sinon.assert.calledOnce(Logger.prototype.log);
+      sinon.assert.calledWith(Logger.prototype.log, 'Exiting without modifying keystore.');
+
+      sinon.assert.notCalled(keystore.save);
+    });
+  });
+});
diff --git a/src/cli_keystore/__tests__/list.js b/src/cli_keystore/__tests__/list.js
new file mode 100644
index 0000000000000..c717306fac444
--- /dev/null
+++ b/src/cli_keystore/__tests__/list.js
@@ -0,0 +1,48 @@
+import sinon from 'sinon';
+import mockFs from 'mock-fs';
+
+import { Keystore } from '../../server/keystore';
+import { list } from '../list';
+import Logger from '../../cli_plugin/lib/logger';
+
+describe('Kibana keystore', () => {
+  describe('list', () => {
+    const sandbox = sinon.sandbox.create();
+
+    const keystoreData = '1:IxR0geiUTMJp8ueHDkqeUJ0I9eEw4NJPXIJi22UDyfGfJSy4mH'
+      + 'BBuGPkkAix/x/YFfIxo4tiKGdJ2oVTtU8LgKDkVoGdL+z7ylY4n3myatt6osqhI4lzJ9M'
+      + 'Ry21UcAJki2qFUTj4TYuvhta3LId+RM5UX/dJ2468hQ==';
+
+    beforeEach(() => {
+      mockFs({
+        '/data': {
+          'test.keystore': JSON.stringify(keystoreData),
+        }
+      });
+
+      sandbox.stub(Logger.prototype, 'log');
+      sandbox.stub(Logger.prototype, 'error');
+    });
+
+    afterEach(() => {
+      mockFs.restore();
+      sandbox.restore();
+    });
+
+    it('outputs keys', () => {
+      const keystore = new Keystore('/data/test.keystore');
+      list(keystore);
+
+      sinon.assert.calledOnce(Logger.prototype.log);
+      sinon.assert.calledWith(Logger.prototype.log, 'a1.b2.c3\na2');
+    });
+
+    it('handles a nonexistent keystore', () => {
+      const keystore = new Keystore('/data/nonexistent.keystore');
+      list(keystore);
+
+      sinon.assert.calledOnce(Logger.prototype.log);
+      sinon.assert.calledWith(Logger.prototype.log, '');
+    });
+  });
+});
diff --git a/src/cli_keystore/__tests__/remove.js b/src/cli_keystore/__tests__/remove.js
new file mode 100644
index 0000000000000..08398e585bcfc
--- /dev/null
+++ b/src/cli_keystore/__tests__/remove.js
@@ -0,0 +1,46 @@
+import expect from 'expect.js';
+import sinon from 'sinon';
+import mockFs from 'mock-fs';
+
+import { Keystore } from '../../server/keystore';
+import { remove } from '../remove';
+
+describe('Kibana keystore', () => {
+  describe('remove', () => {
+    const sandbox = sinon.sandbox.create();
+
+    const keystoreData = '1:IxR0geiUTMJp8ueHDkqeUJ0I9eEw4NJPXIJi22UDyfGfJSy4mH'
+      + 'BBuGPkkAix/x/YFfIxo4tiKGdJ2oVTtU8LgKDkVoGdL+z7ylY4n3myatt6osqhI4lzJ9M'
+      + 'Ry21UcAJki2qFUTj4TYuvhta3LId+RM5UX/dJ2468hQ==';
+
+    beforeEach(() => {
+      mockFs({
+        '/data': {
+          'test.keystore': JSON.stringify(keystoreData),
+        }
+      });
+    });
+
+    afterEach(() => {
+      mockFs.restore();
+      sandbox.restore();
+    });
+
+    it('removes key', () => {
+      const keystore = new Keystore('/data/test.keystore');
+
+      remove(keystore, 'a2');
+
+      expect(keystore.data).to.eql({ 'a1.b2.c3': 'foo' });
+    });
+
+    it('persists the keystore', () => {
+      const keystore = new Keystore('/data/test.keystore');
+      sandbox.stub(keystore, 'save');
+
+      remove(keystore, 'a2');
+
+      sinon.assert.calledOnce(keystore.save);
+    });
+  });
+});
diff --git a/src/cli_keystore/add.js b/src/cli_keystore/add.js
new file mode 100644
index 0000000000000..bbedeaaf333f9
--- /dev/null
+++ b/src/cli_keystore/add.js
@@ -0,0 +1,50 @@
+import Logger from '../cli_plugin/lib/logger';
+import { confirm, question } from '../server/utils';
+import { createPromiseFromStreams, createConcatStream } from '../utils';
+
+/**
+ * @param {Keystore} keystore
+ * @param {String} key
+ * @param {Object|null} options
+ * @property {Boolean} options.force - if true, will overwrite without prompting
+ * @property {Stream|Boolean} options.stdin - if true, uses process.stdin
+ */
+
+export async function add(keystore, key, options = {}) {
+  const logger = new Logger(options);
+  let value;
+
+  if (!keystore.exists()) {
+    return logger.error('ERROR: Kibana keystore not found. Use \'create\' command to create one.');
+  }
+
+  if (!options.force && keystore.has(key)) {
+    const overwrite = await confirm(`Setting ${key} already exists. Overwrite?`);
+
+    if (!overwrite) {
+      return logger.log('Exiting without modifying keystore.');
+    }
+  }
+
+  if (options.stdin) {
+    value = await createPromiseFromStreams([
+      options.stdin || process.stdin,
+      createConcatStream('')
+    ]);
+  } else {
+    value = await question(`Enter value for ${key}`, { mask: '*' });
+  }
+
+  keystore.add(key, value.trim());
+  keystore.save();
+}
+
+export function addCli(program, keystore) {
+  program
+    .command('add <key>')
+    .description('Add a string setting to the keystore')
+    .option('-f, --force', 'overwrite existing setting without prompting')
+    .option('-x, --stdin', 'read setting value from stdin')
+    .option('-s, --silent', 'prevent all logging')
+    .action(add.bind(null, keystore));
+}
diff --git a/src/cli_keystore/cli_keystore.js b/src/cli_keystore/cli_keystore.js
new file mode 100644
index 0000000000000..182168566051d
--- /dev/null
+++ b/src/cli_keystore/cli_keystore.js
@@ -0,0 +1,31 @@
+import { join } from 'path';
+
+import { pkg } from '../utils';
+import Command from '../cli/command';
+import { getData } from '../server/path';
+import { Keystore } from '../server/keystore';
+
+const path = join(getData(), 'kibana.keystore');
+const keystore = new Keystore(path);
+
+import { createCli } from './create';
+import { listCli } from './list';
+import { addCli } from './add';
+import { removeCli } from './remove';
+
+const program = new Command('bin/kibana-keystore');
+
+program
+  .version(pkg.version)
+  .description('A tool for managing settings stored in the Kibana keystore');
+
+createCli(program, keystore);
+listCli(program, keystore);
+addCli(program, keystore);
+removeCli(program, keystore);
+
+program.parse(process.argv);
+
+if (!program.args.length) {
+  program.help();
+}
diff --git a/src/cli_keystore/create.js b/src/cli_keystore/create.js
new file mode 100644
index 0000000000000..c7f9d5a40ec42
--- /dev/null
+++ b/src/cli_keystore/create.js
@@ -0,0 +1,26 @@
+import Logger from '../cli_plugin/lib/logger';
+import { confirm } from '../server/utils';
+
+export async function create(keystore, command, options) {
+  const logger = new Logger(options);
+
+  if (keystore.exists()) {
+    const overwrite = await confirm('A Kibana keystore already exists. Overwrite?');
+
+    if (!overwrite) {
+      return logger.log('Exiting without modifying keystore.');
+    }
+  }
+
+  keystore.save();
+
+  logger.log(`Created Kibana keystore in ${keystore.path}`);
+}
+
+export function createCli(program, keystore) {
+  program
+    .command('create')
+    .description('Creates a new Kibana keystore')
+    .option('-s, --silent', 'prevent all logging')
+    .action(create.bind(null, keystore));
+}
diff --git a/src/cli_keystore/index.js b/src/cli_keystore/index.js
new file mode 100644
index 0000000000000..9abdc46bc8f8c
--- /dev/null
+++ b/src/cli_keystore/index.js
@@ -0,0 +1,2 @@
+require('../babel-register');
+require('./cli_keystore');
diff --git a/src/cli_keystore/list.js b/src/cli_keystore/list.js
new file mode 100644
index 0000000000000..fba2fb9026e9f
--- /dev/null
+++ b/src/cli_keystore/list.js
@@ -0,0 +1,16 @@
+import Logger from '../cli_plugin/lib/logger';
+
+export function list(keystore, command, options = {}) {
+  const logger = new Logger(options);
+  const keys = keystore.keys();
+
+  logger.log(keys.join('\n'));
+}
+
+export function listCli(program, keystore) {
+  program
+    .command('list')
+    .description('List entries in the keystore')
+    .option('-s, --silent', 'prevent all logging')
+    .action(list.bind(null, keystore));
+}
diff --git a/src/cli_keystore/remove.js b/src/cli_keystore/remove.js
new file mode 100644
index 0000000000000..627f557f81b49
--- /dev/null
+++ b/src/cli_keystore/remove.js
@@ -0,0 +1,12 @@
+export async function remove(keystore, key) {
+  keystore.remove(key);
+  keystore.save();
+}
+
+export function removeCli(program, keystore) {
+  program
+    .command('remove <key>')
+    .description('Remove a setting from the keystore')
+    .option('-s, --silent', 'prevent all logging')
+    .action(remove.bind(null, keystore));
+}
diff --git a/src/cli_plugin/install/kibana.js b/src/cli_plugin/install/kibana.js
index 5adcfc5f3ed17..d14f9a83d7304 100644
--- a/src/cli_plugin/install/kibana.js
+++ b/src/cli_plugin/install/kibana.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import path from 'path';
 import { fromRoot } from '../../utils';
 import KbnServer from '../../server/kbn_server';
-import readYamlConfig from '../../cli/serve/read_yaml_config';
+import { readYamlConfig } from '../../cli/serve/read_yaml_config';
 import { versionSatisfies, cleanVersion } from '../../utils/version';
 import { statSync } from 'fs';
 
diff --git a/src/cli_plugin/lib/logger.js b/src/cli_plugin/lib/logger.js
index 13adcd2201cec..11dd761220fb7 100644
--- a/src/cli_plugin/lib/logger.js
+++ b/src/cli_plugin/lib/logger.js
@@ -3,7 +3,7 @@
  */
 export default class Logger {
 
-  constructor(settings) {
+  constructor(settings = {}) {
     this.previousLineEnded = true;
     this.silent = !!settings.silent;
     this.quiet = !!settings.quiet;
diff --git a/src/server/keystore/__tests__/keystore.js b/src/server/keystore/__tests__/keystore.js
new file mode 100644
index 0000000000000..0416501401681
--- /dev/null
+++ b/src/server/keystore/__tests__/keystore.js
@@ -0,0 +1,193 @@
+import expect from 'expect.js';
+import mockFs from 'mock-fs';
+import sinon from 'sinon';
+import { readFileSync } from 'fs';
+
+import { Keystore } from '../keystore';
+
+describe('Keystore', () => {
+  const sandbox = sinon.sandbox.create();
+
+  const protoctedKeystoreData = '1:4BnWfydL8NwFIQJg+VQKe0jlIs7uXtty6+++yaWPbSB'
+    + 'KIX3d9nPfQ20K1C6Xh26E/gMJAQ9jh7BxK0+W3lt/iDJBJn44wqX3pQ0189iGkNBL0ibDCc'
+    + 'tz4mRy6+hqwiLxiukpH8ELAJsff8LNNHr+gNzX/2k/GvB7nQ==';
+
+  const unprotectedKeystoreData = '1:IxR0geiUTMJp8ueHDkqeUJ0I9eEw4NJPXIJi22UDy'
+    + 'fGfJSy4mHBBuGPkkAix/x/YFfIxo4tiKGdJ2oVTtU8LgKDkVoGdL+z7ylY4n3myatt6osqh'
+    + 'I4lzJ9MRy21UcAJki2qFUTj4TYuvhta3LId+RM5UX/dJ2468hQ==';
+
+  beforeEach(() => {
+    mockFs({
+      '/data': {
+        'protected.keystore': protoctedKeystoreData,
+        'unprotected.keystore': unprotectedKeystoreData,
+      },
+      '/inaccessible': mockFs.directory({
+        mode: '0000',
+      })
+    });
+  });
+
+  afterEach(() => {
+    mockFs.restore();
+    sandbox.restore();
+  });
+
+  describe('save', () => {
+    it('thows permission denied', () => {
+      const path = '/inaccessible/test.keystore';
+
+      try {
+        const keystore = new Keystore(path);
+        keystore.save();
+
+        expect().fail('should throw error');
+      } catch(e) {
+        expect(e.code).to.eql('EACCES');
+      }
+    });
+
+    it('creates keystore with version', () => {
+      const path = '/data/test.keystore';
+
+      const keystore = new Keystore(path);
+      keystore.save();
+
+      const fileBuffer = readFileSync(path);
+      const contents = fileBuffer.toString();
+      const [version, data] = contents.split(':');
+
+      expect(version).to.eql(1);
+      expect(data.length).to.be.greaterThan(100);
+    });
+  });
+
+  describe('load', () => {
+    it('is called on initialization', () => {
+      const load = sandbox.spy(Keystore.prototype, 'load');
+
+      new Keystore('/data/protected.keystore', 'changeme');
+
+      expect(load.calledOnce).to.be(true);
+    });
+
+    it('can load a password protected keystore', () => {
+      const keystore = new Keystore('/data/protected.keystore', 'changeme');
+      expect(keystore.data).to.eql({ 'a1.b2.c3': 'foo', 'a2': 'bar' });
+    });
+
+    it('throws unable to read keystore', () => {
+      try {
+        new Keystore('/data/protected.keystore', 'wrongpassword');
+
+        expect().fail('should throw error');
+      } catch(e) {
+        expect(e).to.be.a(Keystore.errors.UnableToReadKeystore);
+      }
+    });
+
+    it('gracefully handles keystore not found', () => {
+      new Keystore('/data/nonexistent.keystore');
+    });
+  });
+
+  describe('keys', () => {
+    it('lists object keys', () => {
+      const keystore = new Keystore('/data/unprotected.keystore');
+      const keys = keystore.keys();
+
+      expect(keys).to.eql(['a1.b2.c3', 'a2']);
+    });
+  });
+
+  describe('has', () => {
+    it('returns true if key exists', () => {
+      const keystore = new Keystore('/data/unprotected.keystore');
+
+      expect(keystore.has('a2')).to.be(true);
+    });
+
+    it('returns false if key does not exist', () => {
+      const keystore = new Keystore('/data/unprotected.keystore');
+
+      expect(keystore.has('invalid')).to.be(false);
+    });
+  });
+
+  describe('add', () => {
+    it('adds a key/value pair', () => {
+      const keystore = new Keystore('/data/unprotected.keystore');
+      keystore.add('a3', 'baz');
+
+      expect(keystore.data).to.eql({
+        'a1.b2.c3': 'foo',
+        'a2': 'bar',
+        'a3': 'baz',
+      });
+    });
+  });
+
+  describe('remove', () => {
+    it('removes a key/value pair', () => {
+      const keystore = new Keystore('/data/unprotected.keystore');
+      keystore.remove('a1.b2.c3');
+
+      expect(keystore.data).to.eql({
+        'a2': 'bar',
+      });
+    });
+  });
+
+  describe('encrypt', () => {
+    it('has randomness ', () => {
+      const text = 'foo';
+      const password = 'changeme';
+
+      const dataOne = Keystore.encrypt(text, password);
+      const dataTwo = Keystore.encrypt(text, password);
+
+      expect(dataOne).to.not.eql(dataTwo);
+    });
+
+    it('can immediately be decrypted', () => {
+      const password = 'changeme';
+      const secretText = 'foo';
+
+      const data = Keystore.encrypt(secretText, password);
+      const text = Keystore.decrypt(data, password);
+
+      expect(text).to.eql(secretText);
+    });
+  });
+
+  describe('decrypt', () => {
+    const text = 'foo';
+    const password = 'changeme';
+    const ciphertext = 'ctvRsD0l0u958QoPuINQX+wgspbXt2+7IJ7gNbCND2dCGZxYOCwMH9'
+    + 'MEdZZG4cevSrnhYOaxh24POFhtisSdCSlLWsKNQU8NK1zqNQ3RRP8HxayZJB7ly9uOLbDS+'
+    + 'Ew=';
+
+    it('can decrypt data', () => {
+      const data = Keystore.decrypt(ciphertext, password);
+      expect(data).to.eql(text);
+    });
+
+    it('throws error for invalid password', () => {
+      try {
+        Keystore.decrypt(ciphertext, 'invalid');
+        expect().fail('should throw error');
+      } catch(e) {
+        expect(e).to.be.a(Keystore.errors.UnableToReadKeystore);
+      }
+    });
+
+    it('throws error for corrupt ciphertext', () => {
+      try {
+        Keystore.decrypt('thisisinvalid', password);
+        expect().fail('should throw error');
+      } catch(e) {
+        expect(e).to.be.a(Keystore.errors.UnableToReadKeystore);
+      }
+    });
+  });
+});
diff --git a/src/server/keystore/errors.js b/src/server/keystore/errors.js
new file mode 100644
index 0000000000000..c6adcc6249b54
--- /dev/null
+++ b/src/server/keystore/errors.js
@@ -0,0 +1,12 @@
+class KeystoreError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = this.constructor.name;
+  }
+}
+
+export class UnableToReadKeystore extends KeystoreError {
+  constructor(message) {
+    super(message || 'unable to read keystore');
+  }
+}
diff --git a/src/server/keystore/index.js b/src/server/keystore/index.js
new file mode 100644
index 0000000000000..c501c26e91870
--- /dev/null
+++ b/src/server/keystore/index.js
@@ -0,0 +1 @@
+export { Keystore } from './keystore';
diff --git a/src/server/keystore/keystore.js b/src/server/keystore/keystore.js
new file mode 100644
index 0000000000000..5f0a6cd675886
--- /dev/null
+++ b/src/server/keystore/keystore.js
@@ -0,0 +1,103 @@
+import { writeFileSync, readFileSync, existsSync } from 'fs';
+import { createCipheriv, createDecipheriv, randomBytes, pbkdf2Sync } from 'crypto';
+import * as errors from './errors';
+
+const VERSION = 1;
+const ALGORITHM = 'aes-256-gcm';
+const ITERATIONS = 10000;
+
+export class Keystore {
+  constructor(path, password = '') {
+    this.path = path;
+    this.data = {};
+    this.password = password;
+
+    this.load();
+  }
+
+  static errors = errors;
+
+  static encrypt(text, password = '') {
+    const iv = randomBytes(12);
+    const salt = randomBytes(64);
+    const key = pbkdf2Sync(password, salt, ITERATIONS, 32, 'sha512');
+
+    const cipher = createCipheriv(ALGORITHM, key, iv);
+
+    const ciphertext = Buffer.concat([cipher.update(text, 'utf8'), cipher.final()]);
+    const tag = cipher.getAuthTag();
+
+    return Buffer.concat([salt, iv, tag, ciphertext]).toString('base64');
+  }
+
+  static decrypt(data, password = '') {
+    try {
+      const bData = new Buffer(data, 'base64');
+
+      // convert data to buffers
+      const salt = bData.slice(0, 64);
+      const iv = bData.slice(64, 76);
+      const tag = bData.slice(76, 92);
+      const text = bData.slice(92);
+
+      const key = pbkdf2Sync(password, salt, ITERATIONS, 32, 'sha512');
+
+      const decipher = createDecipheriv(ALGORITHM, key, iv);
+      decipher.setAuthTag(tag);
+
+      return decipher.update(text, 'binary', 'utf8') + decipher.final('utf8');
+    } catch (e) {
+      throw new errors.UnableToReadKeystore();
+    }
+  }
+
+  save() {
+    const text = JSON.stringify(this.data);
+
+    // The encrypted text and the version are colon delimited to make
+    // it easy to visually read the version as we could have easily
+    // included it with the buffer
+
+    const keystore = [
+      VERSION,
+      Keystore.encrypt(text, this.password)
+    ].join(':');
+
+    writeFileSync(this.path, keystore);
+  }
+
+  load() {
+    try {
+      const keystore = readFileSync(this.path);
+      const [, data] = keystore.toString().split(':');
+
+      this.data = JSON.parse(Keystore.decrypt(data, this.password));
+    } catch (e) {
+      if (e.code === 'ENOENT') {
+        return;
+      }
+
+      throw e;
+    }
+  }
+
+  exists() {
+    return existsSync(this.path);
+  }
+
+  keys() {
+    return Object.keys(this.data);
+  }
+
+  has(key) {
+    return this.keys().indexOf(key) > -1;
+  }
+
+  add(key, value) {
+    this.data[key] = value;
+  }
+
+  remove(key) {
+    delete this.data[key];
+  }
+}
diff --git a/src/server/utils/__tests__/prompt.js b/src/server/utils/__tests__/prompt.js
new file mode 100644
index 0000000000000..1ac2719f5c1c2
--- /dev/null
+++ b/src/server/utils/__tests__/prompt.js
@@ -0,0 +1,100 @@
+import expect from 'expect.js';
+import sinon from 'sinon';
+import { PassThrough } from 'stream';
+
+import { confirm, question } from '../prompt';
+
+describe('prompt', () => {
+  const sandbox = sinon.sandbox.create();
+
+  let input;
+  let output;
+
+  beforeEach(() => {
+    input = new PassThrough();
+    output = new PassThrough();
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  describe('confirm', () => {
+    it('prompts for question', async () => {
+      const onData = sandbox.stub(output, 'write');
+
+      confirm('my question', { output });
+
+      sinon.assert.calledOnce(onData);
+
+      const { args } = onData.getCall(0);
+      expect(args[0]).to.eql('my question [y/N] ');
+    });
+
+    it('prompts for question with default true', async () => {
+      const onData = sandbox.stub(output, 'write');
+
+      confirm('my question', { output, default: true });
+
+      sinon.assert.calledOnce(onData);
+
+      const { args } = onData.getCall(0);
+      expect(args[0]).to.eql('my question [Y/n] ');
+    });
+
+    it('defaults to false', async () => {
+      process.nextTick(() => input.write('\n'));
+
+      const answer = await confirm('my question', { output, input });
+      expect(answer).to.be(false);
+    });
+
+    it('accepts "y"', async () => {
+      process.nextTick(() => input.write('y\n'));
+
+      const answer = await confirm('my question', { output, input });
+      expect(answer).to.be(true);
+    });
+
+    it('accepts "Y"', async () => {
+      process.nextTick(() => input.write('Y\n'));
+
+      const answer = await confirm('my question', { output, input });
+      expect(answer).to.be(true);
+    });
+
+    it('accepts "yes"', async () => {
+      process.nextTick(() => input.write('yes\n'));
+
+      const answer = await confirm('my question', { output, input });
+      expect(answer).to.be(true);
+    });
+
+    it('is false when unknown', async () => {
+      process.nextTick(() => input.write('unknown\n'));
+
+      const answer = await confirm('my question', { output, input });
+      expect(answer).to.be(false);
+    });
+  });
+
+  describe('question', () => {
+    it('prompts for question', async () => {
+      const onData = sandbox.stub(output, 'write');
+
+      question('my question', { output });
+
+      sinon.assert.calledOnce(onData);
+
+      const { args } = onData.getCall(0);
+      expect(args[0]).to.eql('my question: ');
+    });
+
+    it('can be answered', async () => {
+      process.nextTick(() => input.write('my answer\n'));
+
+      const answer = await question('my question', { input, output });
+      expect(answer).to.be('my answer');
+    });
+  });
+});
diff --git a/src/server/utils/index.js b/src/server/utils/index.js
new file mode 100644
index 0000000000000..965dd1cf4c4d6
--- /dev/null
+++ b/src/server/utils/index.js
@@ -0,0 +1 @@
+export { confirm, question } from './prompt';
diff --git a/src/server/utils/prompt.js b/src/server/utils/prompt.js
new file mode 100644
index 0000000000000..a33c6d0ba9bf7
--- /dev/null
+++ b/src/server/utils/prompt.js
@@ -0,0 +1,73 @@
+import { createInterface } from 'readline';
+
+/**
+ * @param {String} question
+ * @param {Object|null} options
+ * @property {Boolean} options.default
+ * @property {Stream} options.input - defaults to process.stdin
+ * @property {Stream} options.output - defaults to process.stdout
+ */
+
+export function confirm(question, options = {}) {
+  const rl = createInterface({
+    input: options.input || process.stdin,
+    output: options.output || process.stdout
+  });
+
+  return new Promise(resolve => {
+    const defautValue = options.default ? true : false;
+    const defaultPrompt = defautValue ? 'Y/n' : 'y/N';
+
+    rl.question(`${question} [${defaultPrompt}] `, input => {
+      let value = defautValue;
+
+      if (input != null && input !== '') {
+        value = /^y(es)?/i.test(input);
+      }
+
+      rl.close();
+      resolve(value);
+    });
+  });
+}
+
+/**
+ * @param {String} question
+ * @param {Object|null} options
+ * @property {Boolean} options.mask
+ * @property {Stream} options.input - defaults to process.stdin
+ * @property {Stream} options.output - defaults to process.stdout
+ */
+
+export function question(question, options = {}) {
+  const input = options.input || process.stdin;
+  const output = options.output || process.stdout;
+
+  const questionPrompt = `${question}: `;
+  const rl = createInterface({ input, output });
+
+  return new Promise(resolve => {
+    input.on('data', (char) => {
+      char = char + '';
+
+      switch (char) {
+        case '\n':
+        case '\r':
+        case '\u0004':
+          input.pause();
+          break;
+        default:
+          if (options.mask) {
+            output.cursorTo(questionPrompt.length);
+            output.write(Array(rl.line.length + 1).join(options.mask || '*'));
+          }
+
+          break;
+      }
+    });
+
+    rl.question(questionPrompt, value => {
+      resolve(value);
+    });
+  });
+}

From a5bd0af3186635cdecdc26dc6bda6df2637ef92c Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Mon, 13 Nov 2017 14:10:37 -0500
Subject: [PATCH 12/18] [Management] Address UI searching bug with index
 pattern creation (#14646)

* Move this logic to a separate directive. Also fix a couple bugs with it around how it interacts with angular.

* Updated variable name

* Handle some edge cases and simplify code

* Fixing typo and further simplyfing code
---
 .../step_index_pattern/append_wildcard.js     | 48 +++++++++++++++++++
 .../step_index_pattern.html                   |  1 +
 .../step_index_pattern/step_index_pattern.js  | 17 +------
 3 files changed, 51 insertions(+), 15 deletions(-)
 create mode 100644 src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/append_wildcard.js

diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/append_wildcard.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/append_wildcard.js
new file mode 100644
index 0000000000000..febad67d2c973
--- /dev/null
+++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/append_wildcard.js
@@ -0,0 +1,48 @@
+import { uiModules } from 'ui/modules';
+
+const module = uiModules.get('apps/management');
+
+/**
+ * This directive automatically appends a wildcard to the input field
+ * after the user starts typing. It lets the user delete the wildcard
+ * if necessary. If the value of the input field is set back to an empty
+ * string, the wildcard is immediately re-appended after the user starts
+ * typing. This is intended to be a UX improvement for the index pattern
+ * creation page. See https://github.com/elastic/kibana/pull/13454
+ */
+module.directive('appendWildcard', function () {
+  return {
+    require: 'ngModel',
+    link: function ($scope, $elem, $attrs, $ctrl) {
+      $elem.on('keydown', (e) => {
+        // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode
+        // is not recommended so we need to rely on `key` but browser support
+        // is still spotty (https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key)
+        // so just bail if it's not supported
+        if (!e.key) {
+          return;
+        }
+
+        if (!/[a-z0-9]/i.test(e.key)) {
+          return;
+        }
+
+        // If the user is holding down ctrl/cmd, they are performing some shortcut
+        // and do not interpret literally
+        if (e.metaKey) {
+          return;
+        }
+
+        let indexPatternName = $elem.val() + e.key;
+        if (indexPatternName.length === 1 && indexPatternName !== '*') {
+          indexPatternName += '*';
+          e.preventDefault();
+          $elem.val(indexPatternName);
+          $elem[0].setSelectionRange(1, 1);
+        }
+
+        $ctrl.$setViewValue(indexPatternName);
+      });
+    }
+  };
+});
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html
index 3159e868baf25..64c633c8420ba 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html
+++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html
@@ -34,6 +34,7 @@ <h2 class="kuiPanelHeader__title">
                 placeholder="index-name-*"
                 validate-index-pattern
                 validate-index-pattern-allow-wildcard
+                append-wildcard
                 name="name"
                 required
                 type="text"
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.js
index d8b7ce520af0c..77775c7864036 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.js
@@ -1,6 +1,7 @@
 import { uiModules } from 'ui/modules';
 import './step_index_pattern.less';
 import template from './step_index_pattern.html';
+import './append_wildcard';
 
 const module = uiModules.get('apps/management');
 
@@ -23,24 +24,10 @@ module.directive('stepIndexPattern', function () {
       matchingIndices: '=',
       goToNextStep: '&',
     },
-    link: function (scope, element) {
-      scope.stepIndexPattern.appendedWildcard = false;
-
+    link: function (scope) {
       scope.$watch('stepIndexPattern.allIndices', scope.stepIndexPattern.updateList);
       scope.$watch('stepIndexPattern.matchingIndices', scope.stepIndexPattern.updateList);
       scope.$watch('stepIndexPattern.indexPatternName', () => {
-        if (scope.stepIndexPattern.indexPatternName && scope.stepIndexPattern.indexPatternName.length === 1) {
-          if (scope.stepIndexPattern.indexPatternName === '*') {
-            if (scope.stepIndexPattern.appendedWildcard) {
-              scope.stepIndexPattern.indexPatternName = '';
-              scope.stepIndexPattern.appendedWildcard = false;
-            }
-          } else {
-            scope.stepIndexPattern.indexPatternName += '*';
-            scope.stepIndexPattern.appendedWildcard = true;
-            setTimeout(() => element.find('#indexPatternNameField')[0].setSelectionRange(1, 1));
-          }
-        }
         // Only send the request if there's valid input.
         if (scope.stepIndexPattern.indexPatternNameForm && scope.stepIndexPattern.indexPatternNameForm.$valid) {
           scope.stepIndexPattern.fetchMatchingIndices();

From 5321d7a567c37acbcedf7e96fc9c6e4d89c9fd62 Mon Sep 17 00:00:00 2001
From: Matt Bargar <mbargar@gmail.com>
Date: Mon, 13 Nov 2017 15:39:53 -0500
Subject: [PATCH 13/18] Remove support for expression based scripted fields
 (#14310)

This PR removes the ability to create scripted fields with the expression language. It also adds an error message to the scripted field list page if any expression scripts already exist which instructs the user to convert all their scripts to painless.
---
 .../scripted_fields_table.html                |  42 ++++++++++
 .../scripted_fields_table.js                  |  16 ++++
 .../field_editor/__tests__/field_editor.js    |   2 +-
 src/ui/public/field_editor/field_editor.html  |  23 +++++-
 src/ui/public/field_editor/field_editor.js    |  14 +++-
 src/ui/public/scripting_languages/index.js    |   6 +-
 .../apps/management/_scripted_fields.js       |  77 +-----------------
 .../management/_scripted_fields_filter.js     |  29 ++++---
 .../es_archiver/management/data.json.gz       | Bin 1279 -> 1324 bytes
 9 files changed, 117 insertions(+), 92 deletions(-)

diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.html b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.html
index 46c3eb1ca50ad..98b5eaa438c2c 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.html
+++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.html
@@ -6,6 +6,48 @@ <h3 class="kuiTextTitle kuiVerticalRhythm">
   These scripted fields are computed on the fly from your data. They can be used in visualizations and displayed in your documents, however they can not be searched. You can manage them here and add new ones as you see fit, but be careful, scripts can be tricky!
 </p>
 
+<div class="kuiInfoPanel kuiInfoPanel--warning kuiVerticalRhythm" ng-if="getDeprecatedLanguagesInUse().length !== 0">
+  <div class="kuiInfoPanelHeader">
+    <span
+      class="kuiInfoPanelHeader__icon kuiIcon kuiIcon--warning fa-bolt"
+      aria-label="Warning"
+      role="img"
+    ></span>
+    <span class="kuiInfoPanelHeader__title">
+      Deprecation Warning
+    </span>
+  </div>
+
+  <div class="kuiInfoPanelBody">
+    <div class="kuiInfoPanelBody__message">
+      We've detected that the following deprecated languages are in use: {{ getDeprecatedLanguagesInUse().join(', ') }}.
+      Support for these languages will be removed in the next major version of Kibana and Elasticsearch.
+      We recommend converting your scripted fields to
+      <a class="kuiLink" ng-href="{{docLinks.painless}}">Painless</a>.
+    </div>
+  </div>
+</div>
+
+<div class="kuiInfoPanel kuiInfoPanel--error kuiVerticalRhythm" ng-if="getUnsupportedLanguagesInUse().length !== 0">
+  <div class="kuiInfoPanelHeader">
+    <span
+      class="kuiInfoPanelHeader__icon kuiIcon kuiIcon--error fa-warning"
+      aria-label="Error"
+      role="img"
+    ></span>
+    <span class="kuiInfoPanelHeader__title">
+      Unsupported Languages
+    </span>
+  </div>
+
+  <div class="kuiInfoPanelBody">
+    <div class="kuiInfoPanelBody__message">
+      We've detected that the following unsupported languages are in use: {{ getUnsupportedLanguagesInUse().join(', ') }}.
+      All scripted fields must be converted to <a class="kuiLink" ng-href="{{docLinks.painless}}">Painless</a>.
+    </div>
+  </div>
+</div>
+
 <a
   data-test-subj="addScriptedFieldLink"
   ng-href="{{ kbnUrl.getRouteHref(indexPattern, 'addField') }}"
diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.js
index 39e91f7a16ffa..f2414ab493d0d 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/scripted_fields_table.js
@@ -4,6 +4,8 @@ import fieldControlsHtml from '../field_controls.html';
 import { dateScripts } from './date_scripts';
 import { uiModules } from 'ui/modules';
 import template from './scripted_fields_table.html';
+import { getSupportedScriptingLanguages, getDeprecatedScriptingLanguages } from 'ui/scripting_languages';
+import { documentationLinks } from 'ui/documentation_links/documentation_links';
 
 uiModules.get('apps/management')
 .directive('scriptedFieldsTable', function (kbnUrl, Notifier, $filter, confirmModal) {
@@ -21,6 +23,7 @@ uiModules.get('apps/management')
       const fieldCreatorPath = '/management/kibana/indices/{{ indexPattern }}/scriptedField';
       const fieldEditorPath = fieldCreatorPath + '/{{ fieldName }}';
 
+      $scope.docLinks = documentationLinks.scriptedFields;
       $scope.perPage = 25;
       $scope.columns = [
         { title: 'name' },
@@ -110,6 +113,19 @@ uiModules.get('apps/management')
         };
         confirmModal(`Are you sure want to delete ${field.name}? This action is irreversible!`, confirmModalOptions);
       };
+
+      function getLanguagesInUse() {
+        const fields = $scope.indexPattern.getScriptedFields();
+        return _.uniq(_.map(fields, 'lang'));
+      }
+
+      $scope.getDeprecatedLanguagesInUse = function () {
+        return _.intersection(getLanguagesInUse(), getDeprecatedScriptingLanguages());
+      };
+
+      $scope.getUnsupportedLanguagesInUse = function () {
+        return _.difference(getLanguagesInUse(), _.union(getSupportedScriptingLanguages(), getDeprecatedScriptingLanguages()));
+      };
     }
   };
 });
diff --git a/src/ui/public/field_editor/__tests__/field_editor.js b/src/ui/public/field_editor/__tests__/field_editor.js
index c84854adc3f92..8c188b8ee445a 100644
--- a/src/ui/public/field_editor/__tests__/field_editor.js
+++ b/src/ui/public/field_editor/__tests__/field_editor.js
@@ -158,7 +158,7 @@ describe('FieldEditor directive', function () {
           .respond(['expression', 'painless', 'groovy']);
 
         $httpBackend.flush();
-        expect(editor.scriptingLangs).to.eql(['expression', 'painless']);
+        expect(editor.scriptingLangs).to.eql(['painless']);
       });
 
       it('provides specific type when language is painless', function () {
diff --git a/src/ui/public/field_editor/field_editor.html b/src/ui/public/field_editor/field_editor.html
index a8a2e66a2ca6f..4efe315e509be 100644
--- a/src/ui/public/field_editor/field_editor.html
+++ b/src/ui/public/field_editor/field_editor.html
@@ -28,12 +28,33 @@
 
   <div ng-if="editor.field.scripted" class="form-group">
     <label for="scriptedFieldLang">Language</label>
+    <div class="kuiInfoPanel kuiInfoPanel--warning kuiVerticalRhythm" ng-if="editor.field.lang && editor.isDeprecatedLang(editor.field.lang)">
+      <div class="kuiInfoPanelHeader">
+        <span
+          class="kuiInfoPanelHeader__icon kuiIcon kuiIcon--warning fa-bolt"
+          aria-label="Warning"
+          role="img"
+        ></span>
+        <span class="kuiInfoPanelHeader__title">
+          Deprecation Warning
+        </span>
+      </div>
+
+      <div class="kuiInfoPanelBody">
+        <div class="kuiInfoPanelBody__message">
+          <span class="text-capitalize">{{editor.field.lang}}</span> is deprecated and support will be removed in the
+          next major version of Kibana and Elasticsearch. We recommend using
+          <a class="kuiLink" ng-href="{{editor.docLinks.painless}}">Painless</a>
+          for new scripted fields.
+        </div>
+      </div>
+    </div>
     <select
       ng-model="editor.field.lang"
       id="scriptedFieldLang"
       ng-options="lang as lang for lang in editor.scriptingLangs"
       required
-      class="form-control"
+      class="form-control kuiVerticalRhythm"
       data-test-subj="editorFieldLang">
       <option value="">-- Select Language --</option>
     </select>
diff --git a/src/ui/public/field_editor/field_editor.js b/src/ui/public/field_editor/field_editor.js
index 7083719eb5b70..2da58a5f8a9cb 100644
--- a/src/ui/public/field_editor/field_editor.js
+++ b/src/ui/public/field_editor/field_editor.js
@@ -8,7 +8,11 @@ import { uiModules } from 'ui/modules';
 import fieldEditorTemplate from 'ui/field_editor/field_editor.html';
 import '../directives/documentation_href';
 import './field_editor.less';
-import { GetEnabledScriptingLanguagesProvider, getSupportedScriptingLanguages } from '../scripting_languages';
+import {
+  GetEnabledScriptingLanguagesProvider,
+  getSupportedScriptingLanguages,
+  getDeprecatedScriptingLanguages
+} from '../scripting_languages';
 import { getKbnTypeNames } from '../../../utils';
 
 uiModules
@@ -38,7 +42,7 @@ uiModules
       const notify = new Notifier({ location: 'Field Editor' });
 
       getScriptingLangs().then((langs) => {
-        self.scriptingLangs = _.intersection(langs, ['expression', 'painless']);
+        self.scriptingLangs = langs;
         if (!_.includes(self.scriptingLangs, self.field.lang)) {
           self.field.lang = undefined;
         }
@@ -103,6 +107,10 @@ uiModules
         );
       };
 
+      self.isDeprecatedLang = function (lang) {
+        return _.contains(getDeprecatedScriptingLanguages(), lang);
+      };
+
       $scope.$watch('editor.selectedFormatId', function (cur, prev) {
         const format = self.field.format;
         const changedFormat = cur !== prev;
@@ -179,7 +187,7 @@ uiModules
       function getScriptingLangs() {
         return getEnabledScriptingLanguages()
         .then((enabledLanguages) => {
-          return _.intersection(enabledLanguages, getSupportedScriptingLanguages());
+          return _.intersection(enabledLanguages, _.union(getSupportedScriptingLanguages(), getDeprecatedScriptingLanguages()));
         });
       }
 
diff --git a/src/ui/public/scripting_languages/index.js b/src/ui/public/scripting_languages/index.js
index 74a38bf0f2495..2ffdf05e85c26 100644
--- a/src/ui/public/scripting_languages/index.js
+++ b/src/ui/public/scripting_languages/index.js
@@ -4,7 +4,11 @@ import { Notifier } from 'ui/notify/notifier';
 const notify = new Notifier({ location: 'Scripting Language Service' });
 
 export function getSupportedScriptingLanguages() {
-  return ['expression', 'painless'];
+  return ['painless'];
+}
+
+export function getDeprecatedScriptingLanguages() {
+  return [];
 }
 
 export function GetEnabledScriptingLanguagesProvider($http) {
diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
index 3e3909ccb0a27..a1a6d36efce9e 100644
--- a/test/functional/apps/management/_scripted_fields.js
+++ b/test/functional/apps/management/_scripted_fields.js
@@ -1,9 +1,8 @@
-// Tests for 5 scripted fields;
-// 1. Lucene expression (number type)
-// 2. Painless (number type)
-// 3. Painless (string type)
+// Tests for 4 scripted fields;
+// 1. Painless (number type)
+// 2. Painless (string type)
 // 3. Painless (boolean type)
-// 3. Painless (date type)
+// 4. Painless (date type)
 //
 // Each of these scripted fields has 4 tests (12 tests total);
 // 1. Create scripted field
@@ -38,74 +37,6 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.settings.removeIndexPattern();
     });
 
-    describe('creating and using Lucence expression scripted fields', function describeIndexTests() {
-      const scriptedExpressionFieldName = 'ram_expr1';
-
-      it('should create scripted field', async function () {
-        await PageObjects.settings.navigateTo();
-        await PageObjects.settings.clickKibanaIndices();
-        const startingCount = parseInt(await PageObjects.settings.getScriptedFieldsTabCount());
-        await PageObjects.settings.clickScriptedFieldsTab();
-        await log.debug('add scripted field');
-        await PageObjects.settings
-          .addScriptedField(scriptedExpressionFieldName,
-            'expression', 'number', null, '1', 'doc[\'machine.ram\'].value / (1024 * 1024 * 1024)'
-          );
-        await retry.try(async function () {
-          expect(parseInt(await PageObjects.settings.getScriptedFieldsTabCount())).to.be(startingCount + 1);
-        });
-      });
-
-      it('should see scripted field value in Discover', async function () {
-        const fromTime = '2015-09-17 06:31:44.000';
-        const toTime = '2015-09-18 18:31:44.000';
-        await PageObjects.common.navigateToApp('discover');
-        await log.debug('setAbsoluteRange (' + fromTime + ') to (' + toTime + ')');
-        await PageObjects.header.setAbsoluteRange(fromTime, toTime);
-        await PageObjects.header.waitUntilLoadingHasFinished();
-        await PageObjects.visualize.waitForVisualization();
-        await PageObjects.discover.clickFieldListItem(scriptedExpressionFieldName);
-        await retry.try(async function () {
-          await PageObjects.discover.clickFieldListItemAdd(scriptedExpressionFieldName);
-        });
-        await PageObjects.header.waitUntilLoadingHasFinished();
-        await PageObjects.visualize.waitForVisualization();
-        await retry.try(async function () {
-          const rowData = await PageObjects.discover.getDocTableIndex(1);
-          expect(rowData).to.be('September 18th 2015, 18:20:57.916\n18');
-        });
-      });
-
-      it('should filter by scripted field value in Discover', async function () {
-        await PageObjects.discover.clickFieldListItem(scriptedExpressionFieldName);
-        await log.debug('filter by the first value (14) in the expanded scripted field list');
-        await PageObjects.discover.clickFieldListPlusFilter(scriptedExpressionFieldName, '14');
-        await PageObjects.header.waitUntilLoadingHasFinished();
-        await PageObjects.visualize.waitForVisualization();
-        await retry.try(async function () {
-          expect(await PageObjects.discover.getHitCount()).to.be('31');
-        });
-      });
-
-      it('should visualize scripted field in vertical bar chart', async function () {
-        const expectedChartValues = [ '14', '31', '10', '29', '7', '24', '11', '24', '12', '23',
-          '20', '23', '19', '21', '6', '20', '17', '20', '30', '20', '13', '19', '18', '18', '16', '17', '5', '16',
-          '8', '16', '15', '14', '3', '13', '2', '12', '9', '10', '4', '9'
-        ];
-        await PageObjects.discover.removeAllFilters();
-        await PageObjects.discover.clickFieldListItemVisualize(scriptedExpressionFieldName);
-        await PageObjects.header.waitUntilLoadingHasFinished();
-        await PageObjects.visualize.waitForVisualization();
-        await PageObjects.visualize.toggleSpyPanel();
-        await PageObjects.settings.setPageSize('All');
-        const data = await PageObjects.visualize.getDataTableData();
-        await log.debug('getDataTableData = ' + data.split('\n'));
-        await log.debug('data=' + data);
-        await log.debug('data.length=' + data.length);
-        expect(data.trim().split('\n')).to.eql(expectedChartValues);
-      });
-    });
-
     describe('creating and using Painless numeric scripted fields', function describeIndexTests() {
       const scriptedPainlessFieldName = 'ram_Pain1';
 
diff --git a/test/functional/apps/management/_scripted_fields_filter.js b/test/functional/apps/management/_scripted_fields_filter.js
index bed264cd6e872..fb696ee29e9db 100644
--- a/test/functional/apps/management/_scripted_fields_filter.js
+++ b/test/functional/apps/management/_scripted_fields_filter.js
@@ -5,21 +5,25 @@ export default function ({ getService, getPageObjects }) {
   const retry = getService('retry');
   const log = getService('log');
   const remote = getService('remote');
+  const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects(['settings']);
 
   describe('filter scripted fields', function describeIndexTests() {
-
-    beforeEach(async function () {
-      await remote.setWindowSize(1200, 800);
+    before(async function () {
       // delete .kibana index and then wait for Kibana to re-create it
+      await remote.setWindowSize(1200, 800);
+      await esArchiver.load('management');
+      await kibanaServer.uiSettings.replace({
+        'dateFormat:tz': 'UTC',
+        'defaultIndex': 'f1e4c910-a2e6-11e7-bb30-233be9be6a15'
+      });
+    });
+
+    after(async function () {
+      await esArchiver.unload('management');
       await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' });
-      await PageObjects.settings.navigateTo();
-      await PageObjects.settings.clickKibanaIndices();
-      await PageObjects.settings.createIndexPattern();
-      await kibanaServer.uiSettings.update({ 'dateFormat:tz': 'UTC' });
     });
 
-    const scriptedExpressionFieldName = 'ram_expr1';
     const scriptedPainlessFieldName = 'ram_pain1';
 
     it('should filter scripted fields', async function () {
@@ -28,10 +32,9 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.settings.clickScriptedFieldsTab();
       const scriptedFieldLangsBefore = await PageObjects.settings.getScriptedFieldLangs();
       await log.debug('add scripted field');
-      await PageObjects.settings
-      .addScriptedField(scriptedExpressionFieldName,
-        'expression', 'number', null, '1', 'doc[\'machine.ram\'].value / (1024 * 1024 * 1024)'
-      );
+
+      // The expression scripted field has been pre-created in the management esArchiver pack since it is no longer
+      // possible to create an expression script via the UI
       await PageObjects.settings
       .addScriptedField(scriptedPainlessFieldName,
         'painless', 'number', null, '1', 'doc[\'machine.ram\'].value / (1024 * 1024 * 1024)'
@@ -40,7 +43,7 @@ export default function ({ getService, getPageObjects }) {
       // confirm two additional scripted fields were created
       await retry.try(async function () {
         const scriptedFieldLangs = await PageObjects.settings.getScriptedFieldLangs();
-        expect(scriptedFieldLangs.length).to.be(scriptedFieldLangsBefore.length + 2);
+        expect(scriptedFieldLangs.length).to.be(scriptedFieldLangsBefore.length + 1);
       });
 
       await PageObjects.settings.setScriptedFieldLanguageFilter('painless');
diff --git a/test/functional/fixtures/es_archiver/management/data.json.gz b/test/functional/fixtures/es_archiver/management/data.json.gz
index e7df69e5d114669992bf4c4b2eedcc92f8871246..fd4fd89be6eebb17932a2dc15092301eccb2128a 100644
GIT binary patch
literal 1324
zcmV+{1=IQ;iwFp)6#`lS17u-zVJ>QOZ*Bn1TT5@-I1s+)R~Wt&Sj0x0?6#;+DT-a7
zi#9!Eu|N?A0!@x3ZYWVDsl=(_|Gq;?vL)L^)8;X}7}oGHpXNypsnyY7Fm(4N45x#k
z(0q983AapDp0dIRe3XTNrSCAlk#knC(CNT9-&J@*7%(cCb6|?;VgkSOx090*JB8Py
z$pqev=JT_Y(dpUQ9Ny01HJkj=j<>ope9OASq&H{NeXvX3j`Jg>Q(>smsdda|qu(~;
zLURs(Nl@Z~<)PcTr(nmt>~>rDF4nhSt!Bdl`_6{b+0eiO44B#QcorZAqIE_VX`pdk
z6%L6f_}_9PO9uiU7fe||Qh*&O&QzX&VpaFwdVNr=NzjCCx~-492v`c9!_)I`C_VOJ
zT%W%I#c<O1x^M_&tkbE?5!3We3YSHNtHwbFXld=(uscFi$$$yuMh#<MGXiQ(QWt~@
z%E7U5Wx<RUv#ut0!4y?KZ(RMwg~W`LT*1__lvsNy=rQW+SwhaQ$;RDDANK3G6Hmlx
zRc3*E!zNZ+<#^%~TOWczz_d!^%m`|q=NY5S;9N<Rh%EaMnrDh|Tqp1hWSUW~EHeE(
zQRbnh!FVPMK)=li^MI1YjU|+V6ofB-j_HniwNhqf4!Jh>@hk?qv6EOju|=);(toan
z#Lc6i&AwrZc!X0K6%QD+9V;CqzMXt)^c9;NIg0P?JqVQ+>Kw#^u_fa`nT@}b2)y}5
zQd=MtPEuD5`v|(k2SaEnKN7>k%VFdm9pVb*I?_);ECpDiPAqkiiFhrUJke6%>3pOc
z#o~*tanvUF!wT&Z%2xro)&^rf;@XM&*qD@BHpdb#zFtAe5C@u2RccVhV>GQrhXXP4
zgtT`$69p<;>cUdPIM2aa`b9%q0Mikzcz25G@c^qMGO@;%mQq!rR7vi^2jdEHrnH6=
zADPkH=4SC7O;n?f^1irDe7q8$w<3-R4!F@_$;(X9>85)uNPU_eQ~mhBPBA*&Z3^7+
ziH$lzx2x^=BojmBaC;k)?CffOzgJ;+;nUZ8S4e$LC0tEgNOS0JT0B=iqYHh}hUIoI
zTUK)=ZAN`Woa|opc;TvW@-+8zAA`VhZQ${d<`EEJSz@^H+oVCw;%Ct`>Td^61Iw#d
zA%?!X9tYlGykcImJ(hv~)0R}f#r3ecE5AN!f7eIrqodWcd|7ZSZN-%Q#=KWgFEeI9
zj6OKXNB?$PM(+%;_t@%w{9!?F%I${*ee&TC3p)G<J^q7T{_T{P4*l8>Mcp^+AJoJJ
z-1W!zm5)qVpp?w8+>0JZThIH;yQQ=pjS2CO)+$^n?9e_!3PsmOa;;tV5jVrOqg%_F
z+SGHPxfm%iVwqB_5RLjxxfZRnGJez6yZxd8saMwx9DM%7%#F9*trfw7Rmy$&(^m#u
z4+9*c-ZyW#TCe@AX&N}J>N{!(VA2;?;~?RcGRRq*NR8w>Qd|cgY-Ty#55P$#t<!0H
z5wJ6zg*0zJzvyZud@XWl{S*X=)?X{Ma=P~A3g^#1blXnrZzpnDB;MOvZ=W1Dl@x*L
zVva=7yusQ_8q)|ifoW)6qpM`FxxX(zUj)1BHFi>@Z#-<ZIBnfN=}>Eby=1o_KF|LH
z?mpp4rROHz>Cjeqb{Sl617LF}$(z&W%bf7iUn}rOq+XEWZ_?(04JC}KJ2&AexsyuN
imx=4#=51sll?x_!b-f;L5UmeJs{a8mod&f7H2?rF`jiO(

literal 1279
zcmV<b1OWRViwFqQXVqB%17u-zVJ>QOZ*Bn1TT5@-I1s+)R~SAnVk1s=yQohoiZ0Ma
zn;yJapojy3BF7RplBkkYY}fFA?~syg$#&6fn`C$~tl{g^Jjvl`b2b<Z?Ye~FbTAZ(
z56>Opfn}AWZ14deWg%eYI*jjS%nIf^ofzl33P<n*MkTWrbTM5_;CKFdaxr3;@M<)f
zz@MWyzPcD)UR}lTI)+zl@<%(~s7mww(w#+mb2i-vhvfY@H&WWn56x6!EHmlox7|43
zoWoxdGI7Il-|gB_uw!0!yDeN7<JxaG^I?H~=fmlIs9^yb^n7?e_YghNSS^dh)3~Y%
zi^L23Z@8AF1%ZzXmKi{jhwUj=SB`*e&DLLgeUPn@mxO7$ZO^+1SORW^r(eIJ^p^MI
z`s-`R7*6_D6&8VvRWg-1Vwx_cuxU`ZY8+&MR>q7qTN0{D3QXW?)G&@EBcNVMs)A5J
zIaoHX4CryjjIGICFh!Nejj6vllbE)WXE3!aA(mbOYK-!F7MJsLys=B^+<xtM!tpq*
z$P93&*u-M1ERS4Z>q8I-m{w?<X+drCJY|#-oM#d_BFjF6=9$7B*8w~QnWU6Ei&Q<2
zmwBveFrLZ+&~9_WIFQNW-Vky@3c{Da#&AcyTPf2rhg|7(IGcg4?<D3<XkIJ4@SiIo
z@$e{UqpzPL9OhIy3kMA9j*%83*G_&k`hrcC9L4v}9)v>kc@AR6n38dzjK<#y1WtVe
z$t@5vC#tiCeFR<Nqan1EAF<)_=`eDO_I`zOAL*tb<^rrxCWbo6M7)=bo@guZbT-oU
zV&VDLFmjW}ZiRLW<+6ZWDUCiKaUFPlY>Y}Jn`?;|->)ENh#ig3DmAFWQJPkx{e>8L
zKsvge2?CWVRbi-MT<2g6{idN!fT@6Xya!43aDdewnOI^gLn$hsswB7IlYWIbQX0*P
zugvImbGP{p#;Z|#d6(QKzFrB>S`kM87u;yD<Y}hhWYfJCq`u7#DSv$8q!^s+b_wqA
z*hU?o+ue3}oCzUwxUYsJySs|lM;V3}zJ0Avh16v#zBFwi^{Lvla7sRdbA7?O<@PLF
zR&gdxN_|Bf9hQ2$a8@{an)=*dL14Jj@avxD|3SDLHdW@^v-Wp;wmm!BJWEafgESS(
z<X7hGVLD5h1~GbXAs_wQZ5h4Mz}{l3{c%ZtZ_0g1exH20B)_x%ptt_uaQ$}5nMI3m
zLs4+e&H<%#1IzySz7TN{<|!r9EO)HO(Z;R)`OQk2j@1b9k5ZX0#_P~NKmtX_xJ<5;
zO+Vl<(sX2NILmgK5NJvYCEB_!Rp#xu-;^uSsyXBLZKl|TTcqCJHE{6xBh&Xz2lrY8
z3sz<J^E-E@wml4Rin?yza<kpKS(C)Cu&JxN5Wu9*u13-QE2WULHUw$O54gDX2Gq=Q
zdF;BPR2r+2wuG)Toq;58KV0Za#eZjUYUkk@iP~Qaw6dzU$qMJs-*?+C>#q)SSwzm-
zTC1I$H#rD_jy6W3Xx?D!IE@Y%n?N_TuF_S~>)hY7Pd8rgdX1gn;u=qDElyjvPde1v
zUT5q9#HaW_;PxZN_@0?KqeETc>CBtn4#2LO$Enlqn->4lUn+2yi;j{0Z`69w9mS8T
pJ2&nrTFOk+Ww>=za5}P(ne{4nd$%3#5N%I-s&9g_+BrQm003D1g|7er


From 0bfeb8cdf9ebc1f71e35ddbd056cf20d3620e87f Mon Sep 17 00:00:00 2001
From: Court Ewing <court@epixa.com>
Date: Mon, 13 Nov 2017 20:28:56 -0500
Subject: [PATCH 14/18] docs: fix erroneous references to es-ref

---
 docs/visualize/tilemap.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/visualize/tilemap.asciidoc b/docs/visualize/tilemap.asciidoc
index 1ae67110c6dc2..b1b3862261a66 100644
--- a/docs/visualize/tilemap.asciidoc
+++ b/docs/visualize/tilemap.asciidoc
@@ -33,7 +33,7 @@ Enter a string in the *Custom Label* field to change the display label.
 
 ===== Buckets
 
-Coordinate maps use the {es-ref}search-aggregations-bucket-geohashgrid-aggregation.html[_geohash_] aggregation. Select a field, typically coordinates, from the
+Coordinate maps use the {ref}search-aggregations-bucket-geohashgrid-aggregation.html[_geohash_] aggregation. Select a field, typically coordinates, from the
 drop-down.
 
 - The_Change precision on map zoom_ box is checked by default. Uncheck the box to disable this behavior.

From e41564c991d0561532676041e094f03d728f69ab Mon Sep 17 00:00:00 2001
From: lcawley <lcawley@elastic.co>
Date: Mon, 13 Nov 2017 19:48:37 -0800
Subject: [PATCH 15/18] [DOCS] Fixed broken link in tilemap.asciidoc

---
 docs/visualize/tilemap.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/visualize/tilemap.asciidoc b/docs/visualize/tilemap.asciidoc
index b1b3862261a66..e838337192a7c 100644
--- a/docs/visualize/tilemap.asciidoc
+++ b/docs/visualize/tilemap.asciidoc
@@ -33,7 +33,7 @@ Enter a string in the *Custom Label* field to change the display label.
 
 ===== Buckets
 
-Coordinate maps use the {ref}search-aggregations-bucket-geohashgrid-aggregation.html[_geohash_] aggregation. Select a field, typically coordinates, from the
+Coordinate maps use the {ref}/search-aggregations-bucket-geohashgrid-aggregation.html[_geohash_] aggregation. Select a field, typically coordinates, from the
 drop-down.
 
 - The_Change precision on map zoom_ box is checked by default. Uncheck the box to disable this behavior.

From 188796314df353a1c9ed65769111e9b6387118db Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tylersmalley@me.com>
Date: Tue, 14 Nov 2017 07:25:38 -0800
Subject: [PATCH 16/18] Removes index.mapper.dynamic from test fixture (#14930)

This was removed in ES 6.0+

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 .../fixtures/es_archiver/search/count/mappings.json              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/api_integration/fixtures/es_archiver/search/count/mappings.json b/test/api_integration/fixtures/es_archiver/search/count/mappings.json
index 011430cf843ce..f4e480e9522b9 100644
--- a/test/api_integration/fixtures/es_archiver/search/count/mappings.json
+++ b/test/api_integration/fixtures/es_archiver/search/count/mappings.json
@@ -5,7 +5,6 @@
     "settings": {
       "index": {
         "number_of_shards": "1",
-        "mapper.dynamic": false,
         "number_of_replicas": "1"
       }
     },

From a3014d7a63cf624812dad940ec58d018f2469349 Mon Sep 17 00:00:00 2001
From: Spencer <spalger@users.noreply.github.com>
Date: Tue, 14 Nov 2017 10:11:59 -0700
Subject: [PATCH 17/18] [eslint] add eslint dev script (#14889)

---
 package.json                    |  4 +--
 scripts/eslint.js               |  2 ++
 src/dev/default_eslint_paths.js | 14 +++++++++++
 src/dev/run_eslint.js           | 15 +++++++++++
 tasks/config/eslint.js          | 38 ----------------------------
 tasks/config/run.js             | 16 ++++++++++++
 tasks/eslint.js                 | 44 ---------------------------------
 tasks/jenkins.js                |  2 +-
 tasks/lint_staged_files.js      | 20 +++++++++------
 tasks/test.js                   |  2 +-
 10 files changed, 64 insertions(+), 93 deletions(-)
 create mode 100644 scripts/eslint.js
 create mode 100644 src/dev/default_eslint_paths.js
 create mode 100644 src/dev/run_eslint.js
 delete mode 100644 tasks/config/eslint.js
 delete mode 100644 tasks/eslint.js

diff --git a/package.json b/package.json
index cab0142dca69b..d3cee47e91fe4 100644
--- a/package.json
+++ b/package.json
@@ -57,8 +57,8 @@
     "precommit": "grunt precommit",
     "karma": "karma start",
     "elasticsearch": "grunt esvm:dev:keepalive",
-    "lint": "grunt eslint:source",
-    "lintroller": "grunt eslint:fixSource",
+    "lint": "echo 'use `node scripts/eslint`' && false",
+    "lintroller": "echo 'use `node scripts/eslint --fix`' && false",
     "makelogs": "echo 'use `node scripts/makelogs`' && false",
     "mocha": "echo 'use `node scripts/mocha`' && false",
     "sterilize": "grunt sterilize",
diff --git a/scripts/eslint.js b/scripts/eslint.js
new file mode 100644
index 0000000000000..e517abad2ca60
--- /dev/null
+++ b/scripts/eslint.js
@@ -0,0 +1,2 @@
+require('../src/babel-register');
+require('../src/dev/run_eslint');
diff --git a/src/dev/default_eslint_paths.js b/src/dev/default_eslint_paths.js
new file mode 100644
index 0000000000000..7635717565559
--- /dev/null
+++ b/src/dev/default_eslint_paths.js
@@ -0,0 +1,14 @@
+export const DEFAULT_ESLINT_PATHS = [
+  'Gruntfile.js',
+  'bin',
+  'config',
+  'src',
+  'scripts',
+  'tasks',
+  'test',
+  'ui_framework/src',
+  'ui_framework/doc_site/src',
+  'ui_framework/generator_kui',
+  'utilities',
+  'webpackShims'
+];
diff --git a/src/dev/run_eslint.js b/src/dev/run_eslint.js
new file mode 100644
index 0000000000000..1ceb794160434
--- /dev/null
+++ b/src/dev/run_eslint.js
@@ -0,0 +1,15 @@
+import { parse } from 'eslint/lib/options';
+import { DEFAULT_ESLINT_PATHS } from './default_eslint_paths';
+
+const options = parse(process.argv);
+
+if (!options._.length && !options.printConfig) {
+  process.argv.push(...DEFAULT_ESLINT_PATHS);
+}
+
+if (!process.argv.includes('--no-cache')) {
+  process.argv.push('--cache');
+}
+
+// common-js is requires to that logic before this executes before loading eslint
+require('eslint/bin/eslint');
diff --git a/tasks/config/eslint.js b/tasks/config/eslint.js
deleted file mode 100644
index 0f8f9d5518525..0000000000000
--- a/tasks/config/eslint.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { resolve } from 'path';
-export default grunt => ({
-  options: {
-    paths: [
-      'Gruntfile.js',
-      'bin',
-      'config',
-      'src',
-      'scripts',
-      'tasks',
-      'test',
-      'ui_framework/src',
-      'ui_framework/doc_site/src',
-      'ui_framework/generator_kui',
-      'utilities',
-      'webpackShims',
-    ],
-  },
-
-  source: {
-    options: {
-      cache: resolve(grunt.config.get('root'), '.eslint.fixSource.cache')
-    }
-  },
-
-  fixSource: {
-    options: {
-      cache: resolve(grunt.config.get('root'), '.eslint.fixSource.cache'),
-      fix: true
-    }
-  },
-
-  staged: {
-    options: {
-      paths: null // overridden by lintStagedFiles task
-    }
-  }
-});
diff --git a/tasks/config/run.js b/tasks/config/run.js
index 3d9557158ec87..8f5fc74847ccd 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -33,6 +33,22 @@ module.exports = function (grunt) {
   }, []);
 
   return {
+    eslint: {
+      cmd: process.execPath,
+      args: [
+        require.resolve('../../scripts/eslint'),
+        '--no-cache'
+      ]
+    },
+
+    eslintStaged: {
+      cmd: process.execPath,
+      args: [
+        require.resolve('../../scripts/eslint'),
+        // staged paths are written here by lintStagedFiles task
+      ]
+    },
+
     testServer: {
       options: {
         wait: false,
diff --git a/tasks/eslint.js b/tasks/eslint.js
deleted file mode 100644
index 4ee55056c2c6d..0000000000000
--- a/tasks/eslint.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { CLIEngine } from 'eslint';
-
-const OPTION_DEFAULTS = {
-  paths: null,
-  cache: null,
-  fix: false
-};
-
-export default grunt => {
-  grunt.registerMultiTask('eslint', function () {
-    const options = this.options(OPTION_DEFAULTS);
-
-    if (!options.paths) {
-      grunt.fatal(new Error('No eslint.options.paths specified'));
-      return;
-    }
-
-    const cli = new CLIEngine({
-      cache: options.cache,
-      fix: options.fix,
-      cwd: grunt.config.get('root'),
-    });
-
-    // report includes an entire list of files checked and the
-    // fixes, errors, and warning for each.
-    const report = cli.executeOnFiles(options.paths);
-
-    // output fixes to disk
-    if (options.fix) {
-      CLIEngine.outputFixes(report);
-    }
-
-    // log the formatted linting report
-    const formatter = cli.getFormatter();
-
-    const errTypes = [];
-    if (report.errorCount > 0) errTypes.push('errors');
-    if (report.warningCount > 0) errTypes.push('warning');
-    if (!errTypes.length) return;
-
-    grunt.log.write(formatter(report.results));
-    grunt.fatal(`eslint ${errTypes.join(' & ')}`);
-  });
-};
diff --git a/tasks/jenkins.js b/tasks/jenkins.js
index 43d9afca47776..7a7469d99bc36 100644
--- a/tasks/jenkins.js
+++ b/tasks/jenkins.js
@@ -29,7 +29,7 @@ module.exports = function (grunt) {
     'jenkins:env',
     'rejectRejFiles',
 
-    'eslint:source',
+    'run:eslint',
     'licenses',
     'test:server',
     'test:jest',
diff --git a/tasks/lint_staged_files.js b/tasks/lint_staged_files.js
index edb312317d676..5433314aa4773 100644
--- a/tasks/lint_staged_files.js
+++ b/tasks/lint_staged_files.js
@@ -4,6 +4,8 @@ import { CLIEngine } from 'eslint';
 import { red, blue } from 'ansicolors';
 import minimatch from 'minimatch';
 
+import { DEFAULT_ESLINT_PATHS } from '../src/dev/default_eslint_paths';
+
 const root = resolve(__dirname, '..');
 
 export default function (grunt) {
@@ -12,10 +14,7 @@ export default function (grunt) {
 
     // convert eslint paths to globs
     const cli = new CLIEngine();
-    const eslintSourcePaths = grunt.config.get('eslint.options.paths');
-    if (!eslintSourcePaths) grunt.fail.warn('eslint.options.paths is not defined');
-
-    const sourcePathGlobs = cli.resolveFileGlobPatterns(eslintSourcePaths);
+    const sourcePathGlobs = cli.resolveFileGlobPatterns(DEFAULT_ESLINT_PATHS);
 
     const files = grunt.config
     .get('filesToCommit')
@@ -25,7 +24,7 @@ export default function (grunt) {
     .filter(file => {
       if (!sourcePathGlobs.some(glob => minimatch(file, glob))) {
         if (extname(file) === '.js') {
-          grunt.log.writeln(`${red('WARNING:')} ${file} not selected by grunt eslint config`);
+          grunt.log.writeln(`${red('WARNING:')} ${file} not selected by src/eslint/default_eslint_paths`);
         }
         return false;
       }
@@ -40,7 +39,14 @@ export default function (grunt) {
       return true;
     });
 
-    grunt.config.set('eslint.staged.options.paths', files);
-    grunt.task.run(['eslint:staged']);
+    if (files.length) {
+      const args = grunt.config.get('run.eslintStaged.args');
+      grunt.config.set('run.eslintStaged.args', [
+        ...args,
+        ...files
+      ]);
+
+      grunt.task.run(['run:eslintStaged']);
+    }
   });
 }
diff --git a/tasks/test.js b/tasks/test.js
index 6cb9ea838b548..365bb69147481 100644
--- a/tasks/test.js
+++ b/tasks/test.js
@@ -97,7 +97,7 @@ module.exports = function (grunt) {
     if (subTask) grunt.fail.fatal(`invalid task "test:${subTask}"`);
 
     grunt.task.run(_.compact([
-      !grunt.option('quick') && 'eslint:source',
+      !grunt.option('quick') && 'run:eslint',
       'licenses',
       'test:quick'
     ]));

From 94b2b324aa50889f1a6dbc0b7a91e7effe8b9c6c Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Tue, 14 Nov 2017 10:56:16 -0700
Subject: [PATCH 18/18] Timelion typeahead for argument values (#14801)

* timelion argument value suggestions for legend function

* update functions with argument value suggestions

* use async/await instead of promise resolve/reject for suggestion generation

* lookup value suggestions for es index and timefield arguments

* custom handlers for es metric and split arguments

* update suggestions unit test

* remove duplicate code from insertSuggestion switch

* refactor arg_value_suggestions to provide three methods instead of single getSuggetions method

* template literal

* update es index argument desc to include note about type ahead support
---
 src/core_plugins/timelion/index.js            |   1 +
 src/core_plugins/timelion/public/chain.peg    |  26 ++-
 .../timelion_expression_input_helpers.js      |  69 ++++++--
 .../directives/timelion_expression_input.js   |  67 ++++----
 .../timelion_expression_input_helpers.js      | 134 +++++++++------
 .../arg_value_suggestions.js                  | 156 ++++++++++++++++++
 .../timelion_expression_suggestions.html      |   9 +
 .../server/series_functions/condition.js      |  30 +++-
 .../server/series_functions/es/index.js       |   3 +-
 .../timelion/server/series_functions/fit.js   |   5 +-
 .../server/series_functions/legend.js         |  24 ++-
 .../server/series_functions/movingaverage.js  |  15 +-
 .../server/series_functions/points.js         |  19 ++-
 .../server/series_functions/trend/index.js    |   5 +-
 .../timelion/server/series_functions/yaxis.js |   5 +-
 15 files changed, 450 insertions(+), 118 deletions(-)
 create mode 100644 src/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js

diff --git a/src/core_plugins/timelion/index.js b/src/core_plugins/timelion/index.js
index 0b4724997c16f..109abcb59dcfc 100644
--- a/src/core_plugins/timelion/index.js
+++ b/src/core_plugins/timelion/index.js
@@ -28,6 +28,7 @@ export default function (kibana) {
           };
         },
         uses: [
+          'fieldFormats',
           'savedObjectTypes'
         ]
       },
diff --git a/src/core_plugins/timelion/public/chain.peg b/src/core_plugins/timelion/public/chain.peg
index 769e4f76bf7e0..bba12430ebd2a 100644
--- a/src/core_plugins/timelion/public/chain.peg
+++ b/src/core_plugins/timelion/public/chain.peg
@@ -18,6 +18,9 @@
   }
  }
 
+ var currentFunction;
+ var currentArgs = [];
+
  var functions = [];
  var args = [];
  var variables = {};
@@ -40,18 +43,22 @@ arg_list
  }
 
 argument
- = name:function_name space? '=' space? value:arg_type {
-  return {
+ = name:argument_name space? '=' space? value:arg_type {
+  var arg = {
    type: 'namedArg',
    name: name,
    value: value,
    location: simpleLocation(location()),
    text: text()
-  }
+  };
+  currentArgs.push(arg);
+  return arg;
  }
- / name:function_name space? '=' {
+ / name:argument_name space? '=' {
   var exception = {
    type: 'incompleteArgument',
+   currentArgs: currentArgs,
+   currentFunction: currentFunction,
    name: name,
    location: simpleLocation(location()),
    text: text()
@@ -71,7 +78,7 @@ arg_type
  }
 
 variable_get
- = '$' name:function_name {
+ = '$' name:argument_name {
   if (variables[name]) {
    return variables[name];
   } else {
@@ -80,7 +87,7 @@ variable_get
  }
 
 variable_set
- = '$' name:function_name space? '=' space? value:arg_type {
+ = '$' name:argument_name space? '=' space? value:arg_type {
   variables[name] = value;
  }
 
@@ -97,6 +104,13 @@ series
  }
 
 function_name
+ = first:[a-zA-Z]+ rest:[.a-zA-Z0-9_-]* {
+  currentFunction = first.join('') + rest.join('');
+  currentArgs = [];
+  return currentFunction;
+}
+
+argument_name
  = first:[a-zA-Z]+ rest:[.a-zA-Z0-9_-]* { return first.join('') + rest.join('') }
 
 function "function"
diff --git a/src/core_plugins/timelion/public/directives/__tests__/timelion_expression_input_helpers.js b/src/core_plugins/timelion/public/directives/__tests__/timelion_expression_input_helpers.js
index 1e8808eca97ce..4b5987e56046f 100644
--- a/src/core_plugins/timelion/public/directives/__tests__/timelion_expression_input_helpers.js
+++ b/src/core_plugins/timelion/public/directives/__tests__/timelion_expression_input_helpers.js
@@ -5,6 +5,7 @@ import {
   SUGGESTION_TYPE,
   suggest
 } from '../timelion_expression_input_helpers';
+import { ArgValueSuggestionsProvider } from '../timelion_expression_suggestions/arg_value_suggestions';
 
 describe('Timelion expression suggestions', () => {
 
@@ -15,7 +16,10 @@ describe('Timelion expression suggestions', () => {
       args: [
         { name: 'inputSeries' },
         { name: 'argA' },
-        { name: 'argAB' }
+        {
+          name: 'argAB',
+          suggestions: [{ name: 'value1' }]
+        }
       ]
     };
     const myFunc2 = {
@@ -29,6 +33,13 @@ describe('Timelion expression suggestions', () => {
     };
     const functionList = [func1, myFunc2];
     let Parser;
+    const privateStub = () => {
+      return {};
+    };
+    const indexPatternsStub = {
+
+    };
+    const argValueSuggestions = ArgValueSuggestionsProvider(privateStub, indexPatternsStub); // eslint-disable-line new-cap
     beforeEach(function () {
       Parser = PEG.buildParser(grammar);
     });
@@ -39,7 +50,7 @@ describe('Timelion expression suggestions', () => {
         it('should return function suggestions', async () => {
           const expression = '.';
           const cursorPosition = 1;
-          const suggestions = await suggest(expression, functionList, Parser, cursorPosition);
+          const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
           expect(suggestions).to.eql({
             'list': [func1, myFunc2],
             'location': {
@@ -52,7 +63,7 @@ describe('Timelion expression suggestions', () => {
         it('should filter function suggestions by function name', async () => {
           const expression = '.myF';
           const cursorPosition = 4;
-          const suggestions = await suggest(expression, functionList, Parser, cursorPosition);
+          const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
           expect(suggestions).to.eql({
             'list': [myFunc2],
             'location': {
@@ -65,15 +76,29 @@ describe('Timelion expression suggestions', () => {
       });
 
       describe('incompleteArgument', () => {
-        it('should return argument value suggestions', async () => {
+        it('should return no argument value suggestions when not provided by help', async () => {
           const expression = '.func1(argA=)';
           const cursorPosition = 11;
-          const suggestions = await suggest(expression, functionList, Parser, cursorPosition);
+          const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
           expect(suggestions).to.eql({
             'list': [],
             'location': {
-              'min': 7,
-              'max': 12
+              'min': 11,
+              'max': 11
+            },
+            'type': 'argument_value'
+          });
+        });
+
+        it('should return argument value suggestions when provided by help', async () => {
+          const expression = '.func1(argAB=)';
+          const cursorPosition = 11;
+          const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
+          expect(suggestions).to.eql({
+            'list': [{ name: 'value1' }],
+            'location': {
+              'min': 11,
+              'max': 11
             },
             'type': 'argument_value'
           });
@@ -87,7 +112,7 @@ describe('Timelion expression suggestions', () => {
         it('should return function suggestion', async () => {
           const expression = '.func1()';
           const cursorPosition = 1;
-          const suggestions = await suggest(expression, functionList, Parser, cursorPosition);
+          const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
           expect(suggestions).to.eql({
             'list': [func1],
             'location': {
@@ -104,7 +129,7 @@ describe('Timelion expression suggestions', () => {
           it('should return argument suggestions', async () => {
             const expression = '.myFunc2()';
             const cursorPosition = 9;
-            const suggestions = await suggest(expression, functionList, Parser, cursorPosition);
+            const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
             expect(suggestions).to.eql({
               'list': myFunc2.args,
               'location': {
@@ -117,7 +142,7 @@ describe('Timelion expression suggestions', () => {
           it('should not provide argument suggestions for argument that is all ready set in function def', async () => {
             const expression = '.myFunc2(argAB=provided,)';
             const cursorPosition = 24;
-            const suggestions = await suggest(expression, functionList, Parser, cursorPosition);
+            const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
             expect(suggestions.type).to.equal(SUGGESTION_TYPE.ARGUMENTS);
             expect(suggestions).to.eql({
               'list': [{ name: 'argA' }, { name: 'argABC' }],
@@ -131,7 +156,7 @@ describe('Timelion expression suggestions', () => {
           it('should filter argument suggestions by argument name', async () => {
             const expression = '.myFunc2(argAB,)';
             const cursorPosition = 14;
-            const suggestions = await suggest(expression, functionList, Parser, cursorPosition);
+            const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
             expect(suggestions).to.eql({
               'list': [{ name: 'argAB' }, { name: 'argABC' }],
               'location': {
@@ -144,9 +169,9 @@ describe('Timelion expression suggestions', () => {
           it('should not show first argument for chainable functions', async () => {
             const expression = '.func1()';
             const cursorPosition = 7;
-            const suggestions = await suggest(expression, functionList, Parser, cursorPosition);
+            const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
             expect(suggestions).to.eql({
-              'list': [{ name: 'argA' }, { name: 'argAB' }],
+              'list': [{ name: 'argA' }, { name: 'argAB', suggestions: [{ name: 'value1' }] }],
               'location': {
                 'min': 7,
                 'max': 7
@@ -156,10 +181,10 @@ describe('Timelion expression suggestions', () => {
           });
         });
         describe('cursor in argument value', () => {
-          it('should return argument value suggestions', async () => {
+          it('should return no argument value suggestions when not provided by help', async () => {
             const expression = '.myFunc2(argA=42)';
             const cursorPosition = 14;
-            const suggestions = await suggest(expression, functionList, Parser, cursorPosition);
+            const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
             expect(suggestions).to.eql({
               'list': [],
               'location': {
@@ -169,6 +194,20 @@ describe('Timelion expression suggestions', () => {
               'type': 'argument_value'
             });
           });
+
+          it('should return no argument value suggestions when provided by help', async () => {
+            const expression = '.func1(argAB=val)';
+            const cursorPosition = 16;
+            const suggestions = await suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions);
+            expect(suggestions).to.eql({
+              'list': [{ name: 'value1' }],
+              'location': {
+                'min': 13,
+                'max': 16
+              },
+              'type': 'argument_value'
+            });
+          });
         });
       });
     });
diff --git a/src/core_plugins/timelion/public/directives/timelion_expression_input.js b/src/core_plugins/timelion/public/directives/timelion_expression_input.js
index 43c39a3471189..36240b1045077 100644
--- a/src/core_plugins/timelion/public/directives/timelion_expression_input.js
+++ b/src/core_plugins/timelion/public/directives/timelion_expression_input.js
@@ -35,11 +35,12 @@ import {
   insertAtLocation,
 } from './timelion_expression_input_helpers';
 import { comboBoxKeyCodes } from 'ui_framework/services';
+import { ArgValueSuggestionsProvider } from './timelion_expression_suggestions/arg_value_suggestions';
 
 const Parser = PEG.buildParser(grammar);
 const app = require('ui/modules').get('apps/timelion', []);
 
-app.directive('timelionExpressionInput', function ($document, $http, $interval, $timeout) {
+app.directive('timelionExpressionInput', function ($document, $http, $interval, $timeout, Private) {
   return {
     restrict: 'E',
     scope: {
@@ -51,6 +52,7 @@ app.directive('timelionExpressionInput', function ($document, $http, $interval,
     replace: true,
     template: timelionExpressionInputTemplate,
     link: function (scope, elem) {
+      const argValueSuggestions = Private(ArgValueSuggestionsProvider);
       const expressionInput = elem.find('[data-expression-input]');
       const functionReference = {};
       let suggestibleFunctionLocation = {};
@@ -81,35 +83,36 @@ app.directive('timelionExpressionInput', function ($document, $http, $interval,
           return;
         }
 
+        const { min, max } = suggestibleFunctionLocation;
+        let insertedValue;
+        let insertPositionMinOffset = 0;
+
         switch (scope.suggestions.type) {
           case SUGGESTION_TYPE.FUNCTIONS: {
-            const functionName = `${scope.suggestions.list[suggestionIndex].name}()`;
-            const { min, max } = suggestibleFunctionLocation;
+            // Position the caret inside of the function parentheses.
+            insertedValue = `${scope.suggestions.list[suggestionIndex].name}()`;
 
-            // Update the expression with the function.
             // min advanced one to not replace function '.'
-            const updatedExpression = insertAtLocation(functionName, scope.sheet, min + 1, max);
-            scope.sheet = updatedExpression;
-
-            // Position the caret inside of the function parentheses.
-            const newCaretOffset = min + functionName.length;
-            setCaretOffset(newCaretOffset);
+            insertPositionMinOffset = 1;
             break;
           }
           case SUGGESTION_TYPE.ARGUMENTS: {
-            const argumentName = `${scope.suggestions.list[suggestionIndex].name}=`;
-            const { min, max } = suggestibleFunctionLocation;
-
-            // Update the expression with the function.
-            const updatedExpression = insertAtLocation(argumentName, scope.sheet, min, max);
-            scope.sheet = updatedExpression;
-
             // Position the caret after the '='
-            const newCaretOffset = min + argumentName.length;
-            setCaretOffset(newCaretOffset);
+            insertedValue = `${scope.suggestions.list[suggestionIndex].name}=`;
+            break;
+          }
+          case SUGGESTION_TYPE.ARGUMENT_VALUE: {
+            // Position the caret after the argument value
+            insertedValue = `${scope.suggestions.list[suggestionIndex].name}`;
             break;
           }
         }
+
+        const updatedExpression = insertAtLocation(insertedValue, scope.sheet, min + insertPositionMinOffset, max);
+        scope.sheet = updatedExpression;
+
+        const newCaretOffset = min + insertedValue.length;
+        setCaretOffset(newCaretOffset);
       }
 
       function scrollToSuggestionAt(index) {
@@ -127,15 +130,18 @@ app.directive('timelionExpressionInput', function ($document, $http, $interval,
         return null;
       }
 
-      function getSuggestions() {
-        suggest(
+      async function getSuggestions() {
+        const suggestions = await suggest(
           scope.sheet,
           functionReference.list,
           Parser,
-          getCursorPosition()
-        ).then(suggestions => {
-          // We're using ES6 Promises, not $q, so we have to wrap this in $apply.
-          scope.$apply(() => {
+          getCursorPosition(),
+          argValueSuggestions
+        );
+
+        // We're using ES6 Promises, not $q, so we have to wrap this in $apply.
+        scope.$apply(() => {
+          if (suggestions) {
             scope.suggestions.setList(suggestions.list, suggestions.type);
             scope.suggestions.show();
             suggestibleFunctionLocation = suggestions.location;
@@ -143,12 +149,11 @@ app.directive('timelionExpressionInput', function ($document, $http, $interval,
               const suggestionsList = $('[data-suggestions-list]');
               suggestionsList.scrollTop(0);
             }, 0);
-          });
-        }, (noSuggestions = {}) => {
-          scope.$apply(() => {
-            suggestibleFunctionLocation = noSuggestions.location;
-            scope.suggestions.reset();
-          });
+            return;
+          }
+
+          suggestibleFunctionLocation = undefined;
+          scope.suggestions.reset();
         });
       }
 
diff --git a/src/core_plugins/timelion/public/directives/timelion_expression_input_helpers.js b/src/core_plugins/timelion/public/directives/timelion_expression_input_helpers.js
index ac7d6750d99fc..802d51f7821d7 100644
--- a/src/core_plugins/timelion/public/directives/timelion_expression_input_helpers.js
+++ b/src/core_plugins/timelion/public/directives/timelion_expression_input_helpers.js
@@ -73,7 +73,7 @@ function inLocation(cursorPosition, location) {
   return cursorPosition >= location.min && cursorPosition <= location.max;
 }
 
-function extractSuggestionsFromParsedResult(result, cursorPosition, functionList) {
+async function extractSuggestionsFromParsedResult(result, cursorPosition, functionList, argValueSuggestions) {
   const activeFunc = result.functions.find((func) => {
     return cursorPosition >= func.location.min && cursorPosition < func.location.max;
   });
@@ -82,32 +82,52 @@ function extractSuggestionsFromParsedResult(result, cursorPosition, functionList
     return;
   }
 
-  const funcDefinition = functionList.find((func) => {
+  const functionHelp = functionList.find((func) => {
     return func.name === activeFunc.function;
   });
-  const providedArguments = activeFunc.arguments.map((arg) => {
-    return arg.name;
-  });
 
-  // return function suggestion if cursor is outside of parentheses
+  // return function suggestion when cursor is outside of parentheses
   // location range includes '.', function name, and '('.
   const openParen = activeFunc.location.min + activeFunc.function.length + 2;
   if (cursorPosition < openParen) {
-    return { list: [funcDefinition], location: activeFunc.location, type: SUGGESTION_TYPE.FUNCTIONS };
+    return { list: [functionHelp], location: activeFunc.location, type: SUGGESTION_TYPE.FUNCTIONS };
   }
 
-  // Do not provide 'inputSeries' as argument suggestion for chainable functions
-  const args = funcDefinition.chainable ? funcDefinition.args.slice(1) : funcDefinition.args.slice(0);
-
+  // return argument value suggestions when cursor is inside agrument value
   const activeArg = activeFunc.arguments.find((argument) => {
     return inLocation(cursorPosition, argument.location);
   });
-  // return argument_value suggestions when cursor is inside agrument value
   if (activeArg && activeArg.type === 'namedArg' && inLocation(cursorPosition, activeArg.value.location)) {
-    // TODO - provide argument value suggestions once function list contains required data
-    return { list: [], location: activeArg.value.location, type: SUGGESTION_TYPE.ARGUMENT_VALUE };
+    const {
+      function: functionName,
+      arguments: functionArgs,
+    } = activeFunc;
+
+    const {
+      name: argName,
+      value: { text: partialInput },
+    } = activeArg;
+
+    let valueSuggestions;
+    if (argValueSuggestions.hasDynamicSuggestionsForArgument(functionName, argName)) {
+      valueSuggestions = await argValueSuggestions.getDynamicSuggestionsForArgument(functionName, argName, functionArgs, partialInput);
+    } else {
+      const {
+        suggestions: staticSuggestions,
+      } = functionHelp.args.find((arg) => {
+        return arg.name === activeArg.name;
+      });
+      valueSuggestions = argValueSuggestions.getStaticSuggestionsForInput(partialInput, staticSuggestions);
+    }
+    return { list: valueSuggestions, location: activeArg.value.location, type: SUGGESTION_TYPE.ARGUMENT_VALUE };
   }
 
+  // return argument suggestions
+  const providedArguments = activeFunc.arguments.map((arg) => {
+    return arg.name;
+  });
+  // Do not provide 'inputSeries' as argument suggestion for chainable functions
+  const args = functionHelp.chainable ? functionHelp.args.slice(1) : functionHelp.args.slice(0);
   const argumentSuggestions = args.filter(arg => {
     // ignore arguments that are all ready provided in function declaration
     if (providedArguments.includes(arg.name)) {
@@ -125,51 +145,63 @@ function extractSuggestionsFromParsedResult(result, cursorPosition, functionList
   return { list: argumentSuggestions, location: location, type: SUGGESTION_TYPE.ARGUMENTS };
 }
 
-export function suggest(expression, functionList, Parser, cursorPosition) {
-  return new Promise((resolve, reject) => {
+export async function suggest(expression, functionList, Parser, cursorPosition, argValueSuggestions) {
+  try {
+    const result = await Parser.parse(expression);
+    return await extractSuggestionsFromParsedResult(result, cursorPosition, functionList, argValueSuggestions);
+  } catch (e) {
+
+    let message;
     try {
-      // We rely on the grammar to throw an error in order to suggest function(s).
-      const result = Parser.parse(expression);
+      // The grammar will throw an error containing a message if the expression is formatted
+      // correctly and is prepared to accept suggestions. If the expression is not formmated
+      // correctly the grammar will just throw a regular PEG SyntaxError, and this JSON.parse
+      // attempt will throw an error.
+      message = JSON.parse(e.message);
+    } catch (e) {
+      // The expression isn't correctly formatted, so JSON.parse threw an error.
+      return;
+    }
 
-      const suggestions = extractSuggestionsFromParsedResult(result, cursorPosition, functionList);
-      if (suggestions) {
-        return resolve(suggestions);
+    switch (message.type) {
+      case 'incompleteFunction': {
+        let list;
+        if (message.function) {
+          // The user has start typing a function name, so we'll filter the list down to only
+          // possible matches.
+          list = functionList.filter(func => _.startsWith(func.name, message.function));
+        } else {
+          // The user hasn't typed anything yet, so we'll just return the entire list.
+          list = functionList;
+        }
+        return { list, location: message.location, type: SUGGESTION_TYPE.FUNCTIONS };
       }
-
-      return reject();
-    } catch (e) {
-      try {
-        // The grammar will throw an error containing a message if the expression is formatted
-        // correctly and is prepared to accept suggestions. If the expression is not formmated
-        // correctly the grammar will just throw a regular PEG SyntaxError, and this JSON.parse
-        // attempt will throw an error.
-        const message = JSON.parse(e.message);
-        const location = message.location;
-
-        if (message.type === 'incompleteFunction') {
-          let list;
-
-          if (message.function) {
-            // The user has start typing a function name, so we'll filter the list down to only
-            // possible matches.
-            list = functionList.filter(func => _.startsWith(func.name, message.function));
-          } else {
-            // The user hasn't typed anything yet, so we'll just return the entire list.
-            list = functionList;
+      case 'incompleteArgument': {
+        const {
+          name: argName,
+          currentFunction: functionName,
+          currentArgs: functionArgs,
+        } = message;
+        let valueSuggestions = [];
+        if (argValueSuggestions.hasDynamicSuggestionsForArgument(functionName, argName)) {
+          valueSuggestions = await argValueSuggestions.getDynamicSuggestionsForArgument(functionName, argName, functionArgs);
+        } else {
+          const functionHelp = functionList.find(func => func.name === functionName);
+          if (functionHelp) {
+            const argHelp = functionHelp.args.find(arg => arg.name === argName);
+            if (argHelp && argHelp.suggestions) {
+              valueSuggestions = argHelp.suggestions;
+            }
           }
-
-          return resolve({ list, location, type: SUGGESTION_TYPE.FUNCTIONS });
-        } else if (message.type === 'incompleteArgument') {
-          // TODO - provide argument value suggestions once function list contains required data
-          return resolve({ list: [], location, type: SUGGESTION_TYPE.ARGUMENT_VALUE });
         }
-
-      } catch (e) {
-        // The expression isn't correctly formatted, so JSON.parse threw an error.
-        return reject();
+        return {
+          list: valueSuggestions,
+          location: { min: cursorPosition, max: cursorPosition },
+          type: SUGGESTION_TYPE.ARGUMENT_VALUE
+        };
       }
     }
-  });
+  }
 }
 
 export function insertAtLocation(valueToInsert, destination, replacementRangeStart, replacementRangeEnd) {
diff --git a/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js b/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js
new file mode 100644
index 0000000000000..a6d3069239d9b
--- /dev/null
+++ b/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js
@@ -0,0 +1,156 @@
+import _ from 'lodash';
+import { SavedObjectsClientProvider } from 'ui/saved_objects';
+
+export function ArgValueSuggestionsProvider(Private, indexPatterns) {
+
+  const savedObjectsClient = Private(SavedObjectsClientProvider);
+
+  async function getIndexPattern(functionArgs) {
+    const indexPatternArg = functionArgs.find(argument => {
+      return argument.name === 'index';
+    });
+    if (!indexPatternArg) {
+      // index argument not provided
+      return;
+    }
+    const indexPatternTitle = _.get(indexPatternArg, 'value.text');
+
+    const resp = await savedObjectsClient.find({
+      type: 'index-pattern',
+      fields: ['title'],
+      search: `"${indexPatternTitle}"`,
+      search_fields: ['title'],
+      perPage: 10
+    });
+    const indexPatternSavedObject = resp.savedObjects.find(savedObject => {
+      return savedObject.attributes.title === indexPatternTitle;
+    });
+    if (!indexPatternSavedObject) {
+      // index argument does not match an index pattern
+      return;
+    }
+
+    return await indexPatterns.get(indexPatternSavedObject.id);
+  }
+
+  function containsFieldName(partial, field) {
+    if (!partial) {
+      return true;
+    }
+    return field.name.includes(partial);
+  }
+
+  // Argument value suggestion handlers requiring custom client side code
+  // Could not put with function definition since functions are defined on server
+  const customHandlers = {
+    es: {
+      index: async function (partial) {
+        const search = partial ? `${partial}*` : '*';
+        const resp = await savedObjectsClient.find({
+          type: 'index-pattern',
+          fields: ['title'],
+          search: `${search}`,
+          search_fields: ['title'],
+          perPage: 25
+        });
+        return resp.savedObjects.map(savedObject => {
+          return { name: savedObject.attributes.title };
+        });
+      },
+      metric: async function (partial, functionArgs) {
+        if (!partial || !partial.includes(':')) {
+          return [
+            { name: 'avg:' },
+            { name: 'cardinality:' },
+            { name: 'count' },
+            { name: 'max:' },
+            { name: 'min:' },
+            { name: 'sum:' }
+          ];
+        }
+
+        const indexPattern = await getIndexPattern(functionArgs);
+        if (!indexPattern) {
+          return [];
+        }
+
+        const valueSplit = partial.split(':');
+        return indexPattern.fields
+          .filter(field => {
+            return field.aggregatable && 'number' === field.type && containsFieldName(valueSplit[1], field);
+          })
+          .map(field => {
+            return { name: `${valueSplit[0]}:${field.name}`, help: field.type };
+          });
+
+      },
+      split: async function (partial, functionArgs) {
+        const indexPattern = await getIndexPattern(functionArgs);
+        if (!indexPattern) {
+          return [];
+        }
+
+        return indexPattern.fields
+          .filter(field => {
+            return field.aggregatable
+              && ['number', 'boolean', 'date', 'ip', 'string'].includes(field.type)
+              && containsFieldName(partial, field);
+          })
+          .map(field => {
+            return { name: field.name, help: field.type };
+          });
+      },
+      timefield: async function (partial, functionArgs) {
+        const indexPattern = await getIndexPattern(functionArgs);
+        if (!indexPattern) {
+          return [];
+        }
+
+        return indexPattern.fields
+          .filter(field => {
+            return 'date' === field.type && containsFieldName(partial, field);
+          })
+          .map(field => {
+            return { name: field.name };
+          });
+      }
+    }
+  };
+
+  return {
+    /**
+     * @param {string} functionName - user provided function name containing argument
+     * @param {string} argName - user provided argument name
+     * @return {boolean} true when dynamic suggestion handler provided for function argument
+     */
+    hasDynamicSuggestionsForArgument: (functionName, argName) => {
+      return (customHandlers[functionName] && customHandlers[functionName][argName]);
+    },
+
+    /**
+     * @param {string} functionName - user provided function name containing argument
+     * @param {string} argName - user provided argument name
+     * @param {object} functionArgs - user provided function arguments parsed ahead of current argument
+     * @param {string} partial - user provided argument value
+     * @return {array} array of dynamic suggestions matching partial
+     */
+    getDynamicSuggestionsForArgument: async (functionName, argName, functionArgs, partialInput = '') => {
+      return await customHandlers[functionName][argName](partialInput, functionArgs);
+    },
+
+    /**
+     * @param {string} partial - user provided argument value
+     * @param {array} staticSuggestions - arugment value suggestions
+     * @return {array} array of static suggestions matching partial
+     */
+    getStaticSuggestionsForInput: (partialInput = '', staticSuggestions = []) => {
+      if (partialInput) {
+        return staticSuggestions.filter(suggestion => {
+          return suggestion.name.includes(partialInput);
+        });
+      }
+
+      return staticSuggestions;
+    },
+  };
+}
diff --git a/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/timelion_expression_suggestions.html b/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/timelion_expression_suggestions.html
index 829443643a55e..49c5a51133041 100644
--- a/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/timelion_expression_suggestions.html
+++ b/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/timelion_expression_suggestions.html
@@ -70,6 +70,15 @@ <h4>
         </div>
       </div>
 
+      <div ng-switch-when="argument_value">
+        <h4>
+          <strong>{{suggestion.name}}</strong>
+          <small id="timelionSuggestionDescription{{$index}}">
+            {{suggestion.help}}
+          </small>
+        </h4>
+      </div>
+
     </div>
   </div>
 </div>
diff --git a/src/core_plugins/timelion/server/series_functions/condition.js b/src/core_plugins/timelion/server/series_functions/condition.js
index 5d930ef18a157..28a6f31e4e418 100644
--- a/src/core_plugins/timelion/server/series_functions/condition.js
+++ b/src/core_plugins/timelion/server/series_functions/condition.js
@@ -12,8 +12,34 @@ export default new Chainable('condition', {
     {
       name: 'operator', // <, <=, >, >=, ==, !=
       types: ['string'],
-      help: 'Operator to use for comparison, valid operators are eq (equal), ne (not equal), lt (less than), lte ' +
-        '(less than equal), gt (greater than), gte (greater than equal)'
+      help: 'comparision operator to use for comparison, valid operators are eq (equal), ne (not equal), lt (less than), lte ' +
+        '(less than equal), gt (greater than), gte (greater than equal)',
+      suggestions: [
+        {
+          name: 'eq',
+          help: 'equal',
+        },
+        {
+          name: 'ne',
+          help: 'not equal'
+        },
+        {
+          name: 'lt',
+          help: 'less than'
+        },
+        {
+          name: 'lte',
+          help: 'less than equal'
+        },
+        {
+          name: 'gt',
+          help: 'greater than'
+        },
+        {
+          name: 'gte',
+          help: 'greater than equal'
+        }
+      ]
     },
     {
       name: 'if',
diff --git a/src/core_plugins/timelion/server/series_functions/es/index.js b/src/core_plugins/timelion/server/series_functions/es/index.js
index 8b1fa214bee9d..2208fe0fdb709 100644
--- a/src/core_plugins/timelion/server/series_functions/es/index.js
+++ b/src/core_plugins/timelion/server/series_functions/es/index.js
@@ -27,7 +27,8 @@ export default new Datasource('es', {
     {
       name: 'index',
       types: ['string', 'null'],
-      help: 'Index to query, wildcards accepted. Provide Index Pattern name for scripted field support.'
+      help: 'Index to query, wildcards accepted. Provide Index Pattern name for scripted fields and ' +
+        'field name type ahead suggestions for metrics, split, and timefield arguments.'
     },
     {
       name: 'timefield',
diff --git a/src/core_plugins/timelion/server/series_functions/fit.js b/src/core_plugins/timelion/server/series_functions/fit.js
index f1492a7761612..ae3d116a5441e 100644
--- a/src/core_plugins/timelion/server/series_functions/fit.js
+++ b/src/core_plugins/timelion/server/series_functions/fit.js
@@ -13,7 +13,10 @@ export default new Chainable('fit', {
     {
       name: 'mode',
       types: ['string'],
-      help: 'The algorithm to use for fitting the series to the target. One of: ' + _.keys(fitFunctions).join(', ')
+      help: `The algorithm to use for fitting the series to the target. One of: ${_.keys(fitFunctions).join(', ')}`,
+      suggestions: _.keys(fitFunctions).map(key => {
+        return { name: key };
+      })
     }
   ],
   help: 'Fills null values using a defined fit function',
diff --git a/src/core_plugins/timelion/server/series_functions/legend.js b/src/core_plugins/timelion/server/series_functions/legend.js
index 0cbef9620a626..894f2b972a6d7 100644
--- a/src/core_plugins/timelion/server/series_functions/legend.js
+++ b/src/core_plugins/timelion/server/series_functions/legend.js
@@ -11,7 +11,29 @@ export default new Chainable('legend', {
     {
       name: 'position',
       types: ['string', 'boolean', 'null'],
-      help: 'Corner to place the legend in: nw, ne, se, or sw. You can also pass false to disable the legend'
+      help: 'Corner to place the legend in: nw, ne, se, or sw. You can also pass false to disable the legend',
+      suggestions: [
+        {
+          name: 'false',
+          help: 'disable legend',
+        },
+        {
+          name: 'nw',
+          help: 'place legend in north west corner'
+        },
+        {
+          name: 'ne',
+          help: 'place legend in north east corner'
+        },
+        {
+          name: 'se',
+          help: 'place legend in south east corner'
+        },
+        {
+          name: 'sw',
+          help: 'place legend in south west corner'
+        }
+      ]
     },
     {
       name: 'columns',
diff --git a/src/core_plugins/timelion/server/series_functions/movingaverage.js b/src/core_plugins/timelion/server/series_functions/movingaverage.js
index c36a75763ce1b..5e2bd01d25456 100644
--- a/src/core_plugins/timelion/server/series_functions/movingaverage.js
+++ b/src/core_plugins/timelion/server/series_functions/movingaverage.js
@@ -3,6 +3,9 @@ import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 import toMS from '../lib/to_milliseconds.js';
 
+const validPositions = ['left', 'right', 'center'];
+const defaultPosition = 'center';
+
 export default new Chainable('movingaverage', {
   args: [
     {
@@ -19,7 +22,14 @@ export default new Chainable('movingaverage', {
     {
       name: 'position',
       types: ['string', 'null'],
-      help: 'Position of the averaged points relative to the result time.  Options are left, right, and center (default).'
+      help: `Position of the averaged points relative to the result time. One of: ${validPositions.join(', ')}`,
+      suggestions: validPositions.map(position => {
+        const suggestion = { name: position };
+        if (position === defaultPosition) {
+          suggestion.help = 'default';
+        }
+        return suggestion;
+      })
     }
   ],
   aliases: ['mvavg'],
@@ -39,8 +49,7 @@ export default new Chainable('movingaverage', {
         _window = Math.round(windowMilliseconds / intervalMilliseconds) || 1;
       }
 
-      _position = _position || 'center';
-      const validPositions = ['left', 'right', 'center'];
+      _position = _position || defaultPosition;
       if (!_.contains(validPositions, _position)) throw new Error('Valid positions are: ' + validPositions.join(', '));
 
       const pairs = eachSeries.data;
diff --git a/src/core_plugins/timelion/server/series_functions/points.js b/src/core_plugins/timelion/server/series_functions/points.js
index c8499d6a456ca..b2f5b65ff956e 100644
--- a/src/core_plugins/timelion/server/series_functions/points.js
+++ b/src/core_plugins/timelion/server/series_functions/points.js
@@ -2,6 +2,9 @@ import alter from '../lib/alter.js';
 import _ from 'lodash';
 import Chainable from '../lib/classes/chainable';
 
+const validSymbols = ['triangle', 'cross', 'square', 'diamond', 'circle'];
+const defaultSymbol = 'circle';
+
 export default new Chainable('points', {
   args: [
     {
@@ -30,8 +33,15 @@ export default new Chainable('points', {
     },
     {
       name: 'symbol',
-      help: 'cross, circle, triangle, square or diamond',
-      types: ['string', 'null']
+      help: `point symbol. One of: ${validSymbols.join(', ')}`,
+      types: ['string', 'null'],
+      suggestions: validSymbols.map(symbol => {
+        const suggestion = { name: symbol };
+        if (symbol === defaultSymbol) {
+          suggestion.help = 'default';
+        }
+        return suggestion;
+      })
     },
     {
       name: 'show',
@@ -57,9 +67,8 @@ export default new Chainable('points', {
         eachSeries.points.lineWidth = weight;
       }
 
-      symbol = symbol || 'circle';
-      const validSymbols = ['triangle', 'cross', 'square', 'diamond', 'circle'];
-      if (!_.contains(['triangle', 'cross', 'square', 'diamond', 'circle'], symbol)) {
+      symbol = symbol || defaultSymbol;
+      if (!_.contains(validSymbols, symbol)) {
         throw new Error('Valid symbols are: ' + validSymbols.join(', '));
       }
 
diff --git a/src/core_plugins/timelion/server/series_functions/trend/index.js b/src/core_plugins/timelion/server/series_functions/trend/index.js
index 336cd534d13cd..f9a25dc606d9c 100644
--- a/src/core_plugins/timelion/server/series_functions/trend/index.js
+++ b/src/core_plugins/timelion/server/series_functions/trend/index.js
@@ -16,7 +16,10 @@ export default new Chainable('trend', {
     {
       name: 'mode',
       types: ['string'],
-      help: 'The algorithm to use for generating the trend line. One of: ' + _.keys(validRegressions).join(', ')
+      help: `The algorithm to use for generating the trend line. One of: ${_.keys(validRegressions).join(', ')}`,
+      suggestions: _.keys(validRegressions).map(key => {
+        return { name: key, help: validRegressions[key] };
+      })
     },
     {
       name: 'start',
diff --git a/src/core_plugins/timelion/server/series_functions/yaxis.js b/src/core_plugins/timelion/server/series_functions/yaxis.js
index b816f65ef87f3..03ba236159442 100644
--- a/src/core_plugins/timelion/server/series_functions/yaxis.js
+++ b/src/core_plugins/timelion/server/series_functions/yaxis.js
@@ -50,7 +50,10 @@ export default new Chainable('yaxis', {
     {
       name: 'units',
       types: ['string', 'null'],
-      help: 'The function to use for formatting y-axis labels. One of: ' + _.values(tickFormatters).join(', ')
+      help: `The function to use for formatting y-axis labels. One of: ${_.values(tickFormatters).join(', ')}`,
+      suggestions: _.keys(tickFormatters).map(key => {
+        return { name: key, help: tickFormatters[key] };
+      })
     },
     {
       name: 'tickDecimals',