Filter editors

src/core_plugins/kibana/index.js

@@ -8,6 +8,7 @@ import ingest from './server/routes/api/ingest';
 import search from './server/routes/api/search';
 import settings from './server/routes/api/settings';
 import scripts from './server/routes/api/scripts';
+import { registerSuggestionsApi } from './server/routes/api/suggestions';
 import * as systemApi from './server/lib/system_api';
 import handleEsError from './server/lib/handle_es_error';
 import mappings from './mappings.json';
@@ -127,6 +128,7 @@ module.exports = function (kibana) {
       search(server);
       settings(server);
       scripts(server);
+      registerSuggestionsApi(server);
 
       server.expose('systemApi', systemApi);
       server.expose('handleEsError', handleEsError);

src/core_plugins/kibana/public/context/app.html

@@ -13,7 +13,7 @@
   </div>
 </div>
 
-<filter-bar></filter-bar>
+<filter-bar index-patterns="[contextApp.indexPattern]"></filter-bar>
 
 <!-- Error feedback -->
 <div

src/core_plugins/kibana/public/dashboard/__tests__/panel.js

@@ -29,6 +29,7 @@ describe('dashboard panel', function () {
       parentScope.createChildUiState = sinon.stub().returns(mockUiState);
       parentScope.getVisClickHandler = sinon.stub();
       parentScope.getVisBrushHandler = sinon.stub();
+      parentScope.registerPanelIndexPattern = sinon.stub();
       parentScope.panel = {
         col: 3,
         id: 'foo1',
@@ -45,6 +46,7 @@ describe('dashboard panel', function () {
           get-vis-click-handler="getVisClickHandler"
           get-vis-brush-handler="getVisBrushHandler"
           save-state="saveState"
+          register-panel-index-pattern="registerPanelIndexPattern"
           create-child-ui-state="createChildUiState">
         </dashboard-panel>`)(parentScope);
       $scope = $el.isolateScope();

src/core_plugins/kibana/public/dashboard/dashboard.html

@@ -70,7 +70,10 @@
   </kbn-top-nav>
 
   <!-- Filters. -->
-  <filter-bar state="state"></filter-bar>
+  <filter-bar
+    state="state"
+    index-patterns="indexPatterns"
+  ></filter-bar>
 
   <div
     ng-show="getShouldShowEditHelp()"
@@ -106,6 +109,7 @@ <h2 class="kuiTitle kuiVerticalRhythm">
     toggle-expand="toggleExpandPanel"
     create-child-ui-state="createChildUiState"
     toggle-expand="toggleExpandPanel"
+    register-panel-index-pattern="registerPanelIndexPattern"
     data-shared-items-count="{{panels.length}}"
   ></dashboard-grid>
 
@@ -118,6 +122,7 @@ <h2 class="kuiTitle kuiVerticalRhythm">
     get-vis-click-handler="getFilterBarClickHandler"
     get-vis-brush-handler="getBrushEvent"
     save-state="saveState"
+    register-panel-index-pattern="registerPanelIndexPattern"
     create-child-ui-state="createChildUiState"
     toggle-expand="toggleExpandPanel(expandedPanel.panelIndex)"
   ></dashboard-panel>

src/core_plugins/kibana/public/dashboard/dashboard.js

@@ -22,6 +22,7 @@ import { UtilsBrushEventProvider } from 'ui/utils/brush_event';
 import { FilterBarClickHandlerProvider } from 'ui/filter_bar/filter_bar_click_handler';
 import { DashboardState } from './dashboard_state';
 import { notify } from 'ui/notify';
+import './panel/get_object_loaders_for_dashboard';
 import { documentationLinks } from 'ui/documentation_links/documentation_links';
 import { showCloneModal } from './top_nav/show_clone_modal';
 
@@ -201,15 +202,24 @@ app.directive('dashboardApp', function ($injector) {
         return dashboardState.uiState.createChild(path, uiState, true);
       };
 
-      $scope.onPanelRemoved = (panelIndex) => dashboardState.removePanel(panelIndex);
-
       $scope.$watch('model.darkTheme', () => {
         dashboardState.setDarkTheme($scope.model.darkTheme);
         updateTheme();
       });
       $scope.$watch('model.description', () => dashboardState.setDescription($scope.model.description));
       $scope.$watch('model.title', () => dashboardState.setTitle($scope.model.title));
       $scope.$watch('model.timeRestore', () => dashboardState.setTimeRestore($scope.model.timeRestore));
+      $scope.indexPatterns = [];
+
+      $scope.registerPanelIndexPattern = (panelIndex, pattern) => {
+        dashboardState.registerPanelIndexPatternMap(panelIndex, pattern);
+        $scope.indexPatterns = dashboardState.getPanelIndexPatterns();
+      };
+
+      $scope.onPanelRemoved = (panelIndex) => {
+        dashboardState.removePanel(panelIndex);
+        $scope.indexPatterns = dashboardState.getPanelIndexPatterns();
+      };
 
       $scope.$listen(timefilter, 'fetch', $scope.refresh);
 

src/core_plugins/kibana/public/dashboard/dashboard_state.js

@@ -77,10 +77,21 @@ export class DashboardState {
     //in the 'lose changes' warning message.
     this.lastSavedDashboardFilters = this.getFilterState();
 
+    // A mapping of panel index to the index pattern it uses.
+    this.panelIndexPatternMapping = {};
+
     PanelUtils.initPanelIndexes(this.getPanels());
     this.createStateMonitor();
   }
 
+  registerPanelIndexPatternMap(panelIndex, indexPattern) {
+    this.panelIndexPatternMapping[panelIndex] = indexPattern;
+  }
+
+  getPanelIndexPatterns() {
+    return _.uniq(Object.values(this.panelIndexPatternMapping));
+  }
+
   /**
    * Resets the state back to the last saved version of the dashboard.
    */
@@ -271,6 +282,7 @@ export class DashboardState {
     _.remove(this.getPanels(), (panel) => {
       if (panel.panelIndex === panelIndex) {
         this.uiState.removeChild(getPersistedStateId(panel));
+        delete this.panelIndexPatternMapping[panelIndex];
         return true;
       } else {
         return false;

src/core_plugins/kibana/public/dashboard/grid.js

@@ -23,6 +23,12 @@ app.directive('dashboardGrid', function ($compile, Notifier) {
        * @type {function} - Returns a {PersistedState} child uiState for this scope.
        */
       createChildUiState: '=',
+      /**
+       * Registers an index pattern with the dashboard app used by each panel. The index patterns are used by the
+       * filter bar for generating field suggestions.
+       * @type {function(IndexPattern)}
+       */
+      registerPanelIndexPattern: '=',
       /**
        * Trigger after a panel has been removed from the grid.
        */
@@ -195,6 +201,7 @@ app.directive('dashboardGrid', function ($compile, Notifier) {
                   get-vis-click-handler="getVisClickHandler"
                   get-vis-brush-handler="getVisBrushHandler"
                   save-state="saveState"
+                  register-panel-index-pattern="registerPanelIndexPattern"
                   toggle-expand="toggleExpand(${panel.panelIndex})"
                   create-child-ui-state="createChildUiState">
             </li>`;

src/core_plugins/kibana/public/dashboard/panel/panel.js

@@ -45,6 +45,12 @@ uiModules
        * @type {function} - Returns a {PersistedState} child uiState for this scope.
        */
       createChildUiState: '=',
+      /**
+       * Registers an index pattern with the dashboard app used by this panel. Used by the filter bar for
+       * generating field suggestions.
+       * @type {function(IndexPattern)}
+       */
+      registerPanelIndexPattern: '=',
       /**
        * Contains information about this panel.
        * @type {PanelState}
@@ -105,7 +111,11 @@ uiModules
           $scope.savedObj.vis.setUiState($scope.uiState);
           $scope.savedObj.vis.listeners.click = $scope.getVisClickHandler();
           $scope.savedObj.vis.listeners.brush = $scope.getVisBrushHandler();
+          $scope.registerPanelIndexPattern($scope.panel.panelIndex, $scope.savedObj.vis.indexPattern);
         } else if ($scope.panel.type === savedSearches.type) {
+          if ($scope.savedObj.searchSource) {
+            $scope.registerPanelIndexPattern($scope.panel.panelIndex, $scope.savedObj.searchSource.get('index'));
+          }
           // This causes changes to a saved search to be hidden, but also allows
           // the user to locally modify and save changes to a saved search only in a dashboard.
           // See https://github.com/elastic/kibana/issues/9523 for more details.

src/core_plugins/kibana/public/dashboard/panel/panel_utils.js

@@ -1,4 +1,5 @@
 import { DEFAULT_PANEL_WIDTH, DEFAULT_PANEL_HEIGHT } from 'plugins/kibana/dashboard/panel/panel_state';
+
 import _ from 'lodash';
 
 export class PanelUtils {

src/core_plugins/kibana/public/discover/index.html

@@ -66,7 +66,10 @@
 
   <div class="container-fluid" role="main">
     <div class="row">
-      <filter-bar state="state"></filter-bar>
+      <filter-bar
+        state="state"
+        index-patterns="[indexPattern]"
+      ></filter-bar>
     </div>
     <div class="row">
       <div class="col-md-2 sidebar-container collapsible-sidebar">

src/core_plugins/kibana/public/visualize/editor/editor.html

@@ -80,7 +80,10 @@
   </kbn-top-nav>
 
   <!-- Filters. -->
-  <filter-bar state="state"></filter-bar>
+  <filter-bar
+    state="state"
+    index-patterns="[indexPattern]"
+  ></filter-bar>
 
   <!-- Custom, full-screen editing UI. -->
   <div

src/core_plugins/kibana/public/visualize/editor/editor.js

@@ -178,6 +178,7 @@ function VisEditor($rootScope, $scope, $route, timefilter, AppState, $window, kb
     $scope.editableVis = editableVis;
     $scope.state = $state;
     $scope.queryDocLinks = documentationLinks.query;
+    $scope.dateDocLinks = documentationLinks.date;
 
     // Create a PersistedState instance.
     $scope.uiState = $state.makeStateful('uiState');

src/core_plugins/kibana/server/routes/api/suggestions/index.js

@@ -0,0 +1,5 @@
+import { registerValueSuggestions } from './register_value_suggestions';
+
+export function registerSuggestionsApi(server) {
+  registerValueSuggestions(server);
+}

src/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js

@@ -0,0 +1,31 @@
+import handleESError from '../../../lib/handle_es_error';
+
+export function registerValueSuggestions(server) {
+  server.route({
+    path: '/api/kibana/suggestions/values/{index}',
+    method: ['POST'],
+    handler: function (req, reply) {
+      const { index } = req.params;
+      const { field, query } = req.payload;
+
+      const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
+      const include = query ? `.*${query}.*` : undefined;
+      const body = getBody({ field, include });
+
+      return callWithRequest(req, 'search', { index, body })
+      .then((res) => {
+        const suggestions = res.aggregations.suggestions.buckets.map(bucket => bucket.key);
+        return reply(suggestions);
+      })
+      .catch(error => reply(handleESError(error)));
+    }
+  });
+}
+
+function getBody(terms) {
+  return {
+    aggs: {
+      suggestions: { terms }
+    }
+  };
+}

src/fixtures/filters/exists_filter.js

@@ -0,0 +1,16 @@
+export const existsFilter = {
+  'meta': {
+    'index': 'logstash-*',
+    'negate': false,
+    'disabled': false,
+    'type': 'exists',
+    'key': 'machine.os',
+    'value': 'exists'
+  },
+  'exists': {
+    'field': 'machine.os'
+  },
+  '$state': {
+    'store': 'appState'
+  }
+};

src/fixtures/filters/index.js

@@ -0,0 +1,5 @@
+export { phraseFilter } from './phrase_filter';
+export { scriptedPhraseFilter } from './scripted_phrase_filter';
+export { phrasesFilter } from './phrases_filter';
+export { rangeFilter } from './range_filter';
+export { existsFilter } from './exists_filter';

src/fixtures/filters/phrase_filter.js

@@ -0,0 +1,21 @@
+export const phraseFilter = {
+  meta: {
+    negate: false,
+    index: 'logstash-*',
+    type: 'phrase',
+    key: 'machine.os',
+    value: 'ios',
+    disabled: false
+  },
+  query: {
+    match: {
+      'machine.os': {
+        query: 'ios',
+        type: 'phrase'
+      }
+    }
+  },
+  $state: {
+    store: 'appState'
+  }
+};

src/fixtures/filters/phrases_filter.js

@@ -0,0 +1,34 @@
+export const phrasesFilter = {
+  meta: {
+    index: 'logstash-*',
+    type: 'phrases',
+    key: 'machine.os.raw',
+    value: 'win xp, osx',
+    params: [
+      'win xp',
+      'osx'
+    ],
+    negate: false,
+    disabled: false
+  },
+  query: {
+    bool: {
+      should: [
+        {
+          match_phrase: {
+            'machine.os.raw': 'win xp'
+          }
+        },
+        {
+          match_phrase: {
+            'machine.os.raw': 'osx'
+          }
+        }
+      ],
+      minimum_should_match: 1
+    }
+  },
+  $state: {
+    store: 'appState'
+  }
+};

src/fixtures/filters/range_filter.js

@@ -0,0 +1,20 @@
+export const rangeFilter = {
+  'meta': {
+    'index': 'logstash-*',
+    'negate': false,
+    'disabled': false,
+    'alias': null,
+    'type': 'range',
+    'key': 'bytes',
+    'value': '0 to 10'
+  },
+  'range': {
+    'bytes': {
+      'gte': 0,
+      'lt': 10
+    }
+  },
+  '$state': {
+    'store': 'appState'
+  }
+};

src/fixtures/filters/scripted_phrase_filter.js

@@ -0,0 +1,23 @@
+export const scriptedPhraseFilter = {
+  'meta': {
+    'negate': false,
+    'index': 'logstash-*',
+    'field': 'script string',
+    'type': 'phrase',
+    'key': 'script string',
+    'value': 'i am a string',
+    'disabled': false
+  },
+  'script': {
+    'script': {
+      'inline': 'boolean compare(Supplier s, def v) {return s.get() == v;}compare(() -> { \'i am a string\' }, params.value);',
+      'lang': 'painless',
+      'params': {
+        'value': 'i am a string'
+      }
+    }
+  },
+  '$state': {
+    'store': 'appState'
+  }
+};

src/ui/public/agg_types/controls/date_ranges.html

@@ -38,7 +38,13 @@
       <tr>
         <td colspan="3">
           <small>
-            <a target="_window" href="http://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html#date-math">Accepted Date Formats <i class="fa-link fa"></i></a>
+            <a
+              class="kuiLink"
+              ng-href="{{dateDocLinks.dateMath}}"
+              target="_blank"
+            >
+              Accepted date formats
+            </a>
           </small>
         </td>
       </tr>