From 820a25621b8c6c1c165468671b700cad608f0ce3 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Thu, 5 Mar 2020 16:09:58 +0200
Subject: [PATCH 01/18] Old search strategy cleanup

---
 src/legacy/core_plugins/data/public/plugin.ts |  10 +-
 .../data/public/search/fetch/call_client.ts   |  39 ++---
 src/plugins/data/public/search/index.ts       |   2 -
 .../public/search/search_strategy/index.ts    |   7 +-
 .../search_strategy_registry.test.ts          | 149 ------------------
 .../search_strategy_registry.ts               |  49 +-----
 .../vis_type_timeseries/server/plugin.ts      |   2 -
 x-pack/legacy/plugins/rollup/public/legacy.ts |   2 -
 x-pack/legacy/plugins/rollup/public/plugin.ts |   4 +-
 .../server/lib/search_strategies/index.ts     |   2 -
 .../register_rollup_search_strategy.ts        |  29 ----
 x-pack/legacy/plugins/rollup/server/plugin.ts |   6 -
 12 files changed, 15 insertions(+), 286 deletions(-)
 delete mode 100644 src/plugins/data/public/search/search_strategy/search_strategy_registry.test.ts
 delete mode 100644 x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.ts

diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
index 18230646ab412..f40cda8760bc7 100644
--- a/src/legacy/core_plugins/data/public/plugin.ts
+++ b/src/legacy/core_plugins/data/public/plugin.ts
@@ -18,12 +18,7 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import {
-  DataPublicPluginStart,
-  addSearchStrategy,
-  defaultSearchStrategy,
-  DataPublicPluginSetup,
-} from '../../../../plugins/data/public';
+import { DataPublicPluginStart, DataPublicPluginSetup } from '../../../../plugins/data/public';
 import { ExpressionsSetup } from '../../../../plugins/expressions/public';
 
 import {
@@ -111,9 +106,6 @@ export class DataPlugin
   public setup(core: CoreSetup, { data, uiActions }: DataPluginSetupDependencies) {
     setInjectedMetadata(core.injectedMetadata);
 
-    // This is to be deprecated once we switch to the new search service fully
-    addSearchStrategy(defaultSearchStrategy);
-
     uiActions.attachAction(
       SELECT_RANGE_TRIGGER,
       selectRangeAction(data.query.filterManager, data.query.timefilter.timefilter)
diff --git a/src/plugins/data/public/search/fetch/call_client.ts b/src/plugins/data/public/search/fetch/call_client.ts
index 6cc58b05ea183..b3c4c682fa60c 100644
--- a/src/plugins/data/public/search/fetch/call_client.ts
+++ b/src/plugins/data/public/search/fetch/call_client.ts
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-import { groupBy } from 'lodash';
 import { handleResponse } from './handle_response';
 import { FetchOptions, FetchHandlers } from './types';
-import { getSearchStrategyForSearchRequest, getSearchStrategyById } from '../search_strategy';
+import { defaultSearchStrategy } from '../search_strategy';
 import { SearchRequest } from '..';
 
 export function callClient(
@@ -34,34 +33,18 @@ export function callClient(
     FetchOptions
   ]> = searchRequests.map((request, i) => [request, requestsOptions[i]]);
   const requestOptionsMap = new Map<SearchRequest, FetchOptions>(requestOptionEntries);
-
-  // Group the requests by the strategy used to search that specific request
-  const searchStrategyMap = groupBy(searchRequests, (request, i) => {
-    const searchStrategy = getSearchStrategyForSearchRequest(request, requestsOptions[i]);
-    return searchStrategy.id;
-  });
-
-  // Execute each search strategy with the group of requests, but return the responses in the same
-  // order in which they were received. We use a map to correlate the original request with its
-  // response.
   const requestResponseMap = new Map();
-  Object.keys(searchStrategyMap).forEach(searchStrategyId => {
-    const searchStrategy = getSearchStrategyById(searchStrategyId);
-    const requests = searchStrategyMap[searchStrategyId];
 
-    // There's no way `searchStrategy` could be undefined here because if we didn't get a matching strategy for this ID
-    // then an error would have been thrown above
-    const { searching, abort } = searchStrategy!.search({
-      searchRequests: requests,
-      ...fetchHandlers,
-    });
+  const { searching, abort } = defaultSearchStrategy.search({
+    searchRequests,
+    ...fetchHandlers,
+  });
 
-    requests.forEach((request, i) => {
-      const response = searching.then(results => handleResponse(request, results[i]));
-      const { abortSignal = null } = requestOptionsMap.get(request) || {};
-      if (abortSignal) abortSignal.addEventListener('abort', abort);
-      requestResponseMap.set(request, response);
-    });
-  }, []);
+  searchRequests.forEach((request, i) => {
+    const response = searching.then(results => handleResponse(request, results[i]));
+    const { abortSignal = null } = requestOptionsMap.get(request) || {};
+    if (abortSignal) abortSignal.addEventListener('abort', abort);
+    requestResponseMap.set(request, response);
+  });
   return searchRequests.map(request => requestResponseMap.get(request));
 }
diff --git a/src/plugins/data/public/search/index.ts b/src/plugins/data/public/search/index.ts
index 2a54cfe2be785..ca586bb09a8d1 100644
--- a/src/plugins/data/public/search/index.ts
+++ b/src/plugins/data/public/search/index.ts
@@ -43,9 +43,7 @@ export { IKibanaSearchResponse, IKibanaSearchRequest } from '../../common/search
 export { LegacyApiCaller, SearchRequest, SearchResponse } from './es_client';
 
 export {
-  addSearchStrategy,
   hasSearchStategyForIndexPattern,
-  defaultSearchStrategy,
   SearchError,
   SearchStrategyProvider,
   getSearchErrorType,
diff --git a/src/plugins/data/public/search/search_strategy/index.ts b/src/plugins/data/public/search/search_strategy/index.ts
index 330e10d7d30e4..5feef5604582a 100644
--- a/src/plugins/data/public/search/search_strategy/index.ts
+++ b/src/plugins/data/public/search/search_strategy/index.ts
@@ -17,12 +17,7 @@
  * under the License.
  */
 
-export {
-  addSearchStrategy,
-  hasSearchStategyForIndexPattern,
-  getSearchStrategyById,
-  getSearchStrategyForSearchRequest,
-} from './search_strategy_registry';
+export { hasSearchStategyForIndexPattern } from './search_strategy_registry';
 
 export { SearchError, getSearchErrorType } from './search_error';
 
diff --git a/src/plugins/data/public/search/search_strategy/search_strategy_registry.test.ts b/src/plugins/data/public/search/search_strategy/search_strategy_registry.test.ts
deleted file mode 100644
index eaf86e1b270d5..0000000000000
--- a/src/plugins/data/public/search/search_strategy/search_strategy_registry.test.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { IndexPattern } from '../..';
-import { noOpSearchStrategy } from './no_op_search_strategy';
-import {
-  searchStrategies,
-  addSearchStrategy,
-  getSearchStrategyByViability,
-  getSearchStrategyById,
-  getSearchStrategyForSearchRequest,
-  hasSearchStategyForIndexPattern,
-} from './search_strategy_registry';
-import { SearchStrategyProvider } from './types';
-
-const mockSearchStrategies: SearchStrategyProvider[] = [
-  {
-    id: '0',
-    isViable: (index: IndexPattern) => index.id === '0',
-    search: () => ({
-      searching: Promise.resolve([]),
-      abort: () => void 0,
-    }),
-  },
-  {
-    id: '1',
-    isViable: (index: IndexPattern) => index.id === '1',
-    search: () => ({
-      searching: Promise.resolve([]),
-      abort: () => void 0,
-    }),
-  },
-];
-
-describe('Search strategy registry', () => {
-  beforeEach(() => {
-    searchStrategies.length = 0;
-  });
-
-  describe('addSearchStrategy', () => {
-    it('adds a search strategy', () => {
-      addSearchStrategy(mockSearchStrategies[0]);
-      expect(searchStrategies.length).toBe(1);
-    });
-
-    it('does not add a search strategy if it is already included', () => {
-      addSearchStrategy(mockSearchStrategies[0]);
-      addSearchStrategy(mockSearchStrategies[0]);
-      expect(searchStrategies.length).toBe(1);
-    });
-  });
-
-  describe('getSearchStrategyByViability', () => {
-    beforeEach(() => {
-      mockSearchStrategies.forEach(addSearchStrategy);
-    });
-
-    it('returns the viable strategy', () => {
-      expect(getSearchStrategyByViability({ id: '0' } as IndexPattern)).toBe(
-        mockSearchStrategies[0]
-      );
-      expect(getSearchStrategyByViability({ id: '1' } as IndexPattern)).toBe(
-        mockSearchStrategies[1]
-      );
-    });
-
-    it('returns undefined if there is no viable strategy', () => {
-      expect(getSearchStrategyByViability({ id: '-1' } as IndexPattern)).toBe(undefined);
-    });
-  });
-
-  describe('getSearchStrategyById', () => {
-    beforeEach(() => {
-      mockSearchStrategies.forEach(addSearchStrategy);
-    });
-
-    it('returns the strategy by ID', () => {
-      expect(getSearchStrategyById('0')).toBe(mockSearchStrategies[0]);
-      expect(getSearchStrategyById('1')).toBe(mockSearchStrategies[1]);
-    });
-
-    it('returns undefined if there is no strategy with that ID', () => {
-      expect(getSearchStrategyById('-1')).toBe(undefined);
-    });
-
-    it('returns the noOp search strategy if passed that ID', () => {
-      expect(getSearchStrategyById('noOp')).toBe(noOpSearchStrategy);
-    });
-  });
-
-  describe('getSearchStrategyForSearchRequest', () => {
-    beforeEach(() => {
-      mockSearchStrategies.forEach(addSearchStrategy);
-    });
-
-    it('returns the strategy by ID if provided', () => {
-      expect(getSearchStrategyForSearchRequest({}, { searchStrategyId: '1' })).toBe(
-        mockSearchStrategies[1]
-      );
-    });
-
-    it('throws if there is no strategy by provided ID', () => {
-      expect(() =>
-        getSearchStrategyForSearchRequest({}, { searchStrategyId: '-1' })
-      ).toThrowErrorMatchingInlineSnapshot(`"No strategy with ID -1"`);
-    });
-
-    it('returns the strategy by viability if there is one', () => {
-      expect(
-        getSearchStrategyForSearchRequest({
-          index: {
-            id: '1',
-          },
-        })
-      ).toBe(mockSearchStrategies[1]);
-    });
-
-    it('returns the no op strategy if there is no viable strategy', () => {
-      expect(getSearchStrategyForSearchRequest({ index: '3' })).toBe(noOpSearchStrategy);
-    });
-  });
-
-  describe('hasSearchStategyForIndexPattern', () => {
-    beforeEach(() => {
-      mockSearchStrategies.forEach(addSearchStrategy);
-    });
-
-    it('returns whether there is a search strategy for this index pattern', () => {
-      expect(hasSearchStategyForIndexPattern({ id: '0' } as IndexPattern)).toBe(true);
-      expect(hasSearchStategyForIndexPattern({ id: '-1' } as IndexPattern)).toBe(false);
-    });
-  });
-});
diff --git a/src/plugins/data/public/search/search_strategy/search_strategy_registry.ts b/src/plugins/data/public/search/search_strategy/search_strategy_registry.ts
index 1ab6f7d4e1eff..77c1d0c8dec23 100644
--- a/src/plugins/data/public/search/search_strategy/search_strategy_registry.ts
+++ b/src/plugins/data/public/search/search_strategy/search_strategy_registry.ts
@@ -18,54 +18,7 @@
  */
 
 import { IndexPattern } from '../..';
-import { SearchStrategyProvider } from './types';
-import { noOpSearchStrategy } from './no_op_search_strategy';
-import { SearchResponse } from '..';
-
-export const searchStrategies: SearchStrategyProvider[] = [];
-
-export const addSearchStrategy = (searchStrategy: SearchStrategyProvider) => {
-  if (searchStrategies.includes(searchStrategy)) {
-    return;
-  }
-
-  searchStrategies.push(searchStrategy);
-};
-
-export const getSearchStrategyByViability = (indexPattern: IndexPattern) => {
-  return searchStrategies.find(searchStrategy => {
-    return searchStrategy.isViable(indexPattern);
-  });
-};
-
-export const getSearchStrategyById = (searchStrategyId: string) => {
-  return [...searchStrategies, noOpSearchStrategy].find(searchStrategy => {
-    return searchStrategy.id === searchStrategyId;
-  });
-};
-
-export const getSearchStrategyForSearchRequest = (
-  searchRequest: SearchResponse,
-  { searchStrategyId }: { searchStrategyId?: string } = {}
-) => {
-  // Allow the searchSource to declare the correct strategy with which to execute its searches.
-  if (searchStrategyId != null) {
-    const strategy = getSearchStrategyById(searchStrategyId);
-    if (!strategy) throw Error(`No strategy with ID ${searchStrategyId}`);
-    return strategy;
-  }
-
-  // Otherwise try to match it to a strategy.
-  const viableSearchStrategy = getSearchStrategyByViability(searchRequest.index);
-
-  if (viableSearchStrategy) {
-    return viableSearchStrategy;
-  }
-
-  // This search strategy automatically rejects with an error.
-  return noOpSearchStrategy;
-};
 
 export const hasSearchStategyForIndexPattern = (indexPattern: IndexPattern) => {
-  return Boolean(getSearchStrategyByViability(indexPattern));
+  return true;
 };
diff --git a/src/plugins/vis_type_timeseries/server/plugin.ts b/src/plugins/vis_type_timeseries/server/plugin.ts
index 6ef6362c6e37b..70ca41796dadb 100644
--- a/src/plugins/vis_type_timeseries/server/plugin.ts
+++ b/src/plugins/vis_type_timeseries/server/plugin.ts
@@ -52,7 +52,6 @@ export interface VisTypeTimeseriesSetup {
     fakeRequest: FakeRequest,
     options: GetVisDataOptions
   ) => ReturnType<GetVisData>;
-  addSearchStrategy: SearchStrategyRegistry['addStrategy'];
 }
 
 export interface Framework {
@@ -110,7 +109,6 @@ export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
       ) => {
         return await getVisData(requestContext, { ...fakeRequest, body: options }, framework);
       },
-      addSearchStrategy: searchStrategyRegistry.addStrategy.bind(searchStrategyRegistry),
     };
   }
 
diff --git a/x-pack/legacy/plugins/rollup/public/legacy.ts b/x-pack/legacy/plugins/rollup/public/legacy.ts
index e3e663ac7b0f4..e137799bd34fe 100644
--- a/x-pack/legacy/plugins/rollup/public/legacy.ts
+++ b/x-pack/legacy/plugins/rollup/public/legacy.ts
@@ -7,7 +7,6 @@
 import { npSetup, npStart } from 'ui/new_platform';
 import { aggTypeFilters } from 'ui/agg_types';
 import { aggTypeFieldFilters } from 'ui/agg_types';
-import { addSearchStrategy } from '../../../../../src/plugins/data/public';
 import { RollupPlugin } from './plugin';
 import { setup as management } from '../../../../../src/legacy/core_plugins/management/public/legacy';
 
@@ -18,7 +17,6 @@ export const setup = plugin.setup(npSetup.core, {
   __LEGACY: {
     aggTypeFilters,
     aggTypeFieldFilters,
-    addSearchStrategy,
     managementLegacy: management,
   },
 });
diff --git a/x-pack/legacy/plugins/rollup/public/plugin.ts b/x-pack/legacy/plugins/rollup/public/plugin.ts
index a01383f4733ef..742393e57ae3b 100644
--- a/x-pack/legacy/plugins/rollup/public/plugin.ts
+++ b/x-pack/legacy/plugins/rollup/public/plugin.ts
@@ -37,7 +37,6 @@ export interface RollupPluginSetupDependencies {
   __LEGACY: {
     aggTypeFilters: AggTypeFilters;
     aggTypeFieldFilters: AggTypeFieldFilters;
-    addSearchStrategy: (searchStrategy: SearchStrategyProvider) => void;
     managementLegacy: ManagementSetupLegacy;
   };
   home?: HomePublicPluginSetup;
@@ -49,7 +48,7 @@ export class RollupPlugin implements Plugin {
   setup(
     core: CoreSetup,
     {
-      __LEGACY: { aggTypeFilters, aggTypeFieldFilters, addSearchStrategy, managementLegacy },
+      __LEGACY: { aggTypeFilters, aggTypeFieldFilters, managementLegacy },
       home,
       management,
       indexManagement,
@@ -67,7 +66,6 @@ export class RollupPlugin implements Plugin {
     if (isRollupIndexPatternsEnabled) {
       managementLegacy.indexPattern.creation.add(RollupIndexPatternCreationConfig);
       managementLegacy.indexPattern.list.add(RollupIndexPatternListConfig);
-      addSearchStrategy(getRollupSearchStrategy(core.http.fetch));
       initAggTypeFilter(aggTypeFilters);
       initAggTypeFieldFilter(aggTypeFieldFilters);
     }
diff --git a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/index.ts b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/index.ts
index 7db0b38ea29dd..41bc2aa258807 100644
--- a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/index.ts
+++ b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/index.ts
@@ -3,5 +3,3 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
-export { registerRollupSearchStrategy } from './register_rollup_search_strategy';
diff --git a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.ts b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.ts
deleted file mode 100644
index 93c4c1b52140b..0000000000000
--- a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { getRollupSearchStrategy } from './rollup_search_strategy';
-import { getRollupSearchRequest } from './rollup_search_request';
-import { getRollupSearchCapabilities } from './rollup_search_capabilities';
-import {
-  AbstractSearchRequest,
-  DefaultSearchCapabilities,
-  AbstractSearchStrategy,
-} from '../../../../../../../src/plugins/vis_type_timeseries/server';
-import { RouteDependencies } from '../../types';
-
-export const registerRollupSearchStrategy = (
-  { elasticsearchService }: RouteDependencies,
-  addSearchStrategy: (searchStrategy: any) => void
-) => {
-  const RollupSearchRequest = getRollupSearchRequest(AbstractSearchRequest);
-  const RollupSearchCapabilities = getRollupSearchCapabilities(DefaultSearchCapabilities);
-  const RollupSearchStrategy = getRollupSearchStrategy(
-    AbstractSearchStrategy,
-    RollupSearchRequest,
-    RollupSearchCapabilities
-  );
-
-  addSearchStrategy(new RollupSearchStrategy(elasticsearchService));
-};
diff --git a/x-pack/legacy/plugins/rollup/server/plugin.ts b/x-pack/legacy/plugins/rollup/server/plugin.ts
index 090cb8a47377a..94af3d723c88f 100644
--- a/x-pack/legacy/plugins/rollup/server/plugin.ts
+++ b/x-pack/legacy/plugins/rollup/server/plugin.ts
@@ -24,7 +24,6 @@ import {
 import { registerRollupUsageCollector } from './collectors';
 
 import { rollupDataEnricher } from './rollup_data_enricher';
-import { registerRollupSearchStrategy } from './lib/search_strategies';
 
 export class RollupsServerPlugin implements Plugin<void, void, any, any> {
   log: Logger;
@@ -82,11 +81,6 @@ export class RollupsServerPlugin implements Plugin<void, void, any, any> {
     if (indexManagement && indexManagement.indexDataEnricher) {
       indexManagement.indexDataEnricher.add(rollupDataEnricher);
     }
-
-    if (metrics) {
-      const { addSearchStrategy } = metrics;
-      registerRollupSearchStrategy(routeDependencies, addSearchStrategy);
-    }
   }
 
   start() {}

From 01bc8ceb70956dc8fa7c6f5b3123804e68114932 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Sun, 8 Mar 2020 13:11:24 +0200
Subject: [PATCH 02/18] restore rollup strategy

---
 .../vis_type_timeseries/server/plugin.ts      |  2 ++
 .../server/lib/search_strategies/index.ts     |  2 ++
 .../register_rollup_search_strategy.ts        | 29 +++++++++++++++++++
 x-pack/legacy/plugins/rollup/server/plugin.ts |  6 ++++
 4 files changed, 39 insertions(+)
 create mode 100644 x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.ts

diff --git a/src/plugins/vis_type_timeseries/server/plugin.ts b/src/plugins/vis_type_timeseries/server/plugin.ts
index 70ca41796dadb..6ef6362c6e37b 100644
--- a/src/plugins/vis_type_timeseries/server/plugin.ts
+++ b/src/plugins/vis_type_timeseries/server/plugin.ts
@@ -52,6 +52,7 @@ export interface VisTypeTimeseriesSetup {
     fakeRequest: FakeRequest,
     options: GetVisDataOptions
   ) => ReturnType<GetVisData>;
+  addSearchStrategy: SearchStrategyRegistry['addStrategy'];
 }
 
 export interface Framework {
@@ -109,6 +110,7 @@ export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
       ) => {
         return await getVisData(requestContext, { ...fakeRequest, body: options }, framework);
       },
+      addSearchStrategy: searchStrategyRegistry.addStrategy.bind(searchStrategyRegistry),
     };
   }
 
diff --git a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/index.ts b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/index.ts
index 41bc2aa258807..7db0b38ea29dd 100644
--- a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/index.ts
+++ b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/index.ts
@@ -3,3 +3,5 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
+export { registerRollupSearchStrategy } from './register_rollup_search_strategy';
diff --git a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.ts b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.ts
new file mode 100644
index 0000000000000..93c4c1b52140b
--- /dev/null
+++ b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { getRollupSearchStrategy } from './rollup_search_strategy';
+import { getRollupSearchRequest } from './rollup_search_request';
+import { getRollupSearchCapabilities } from './rollup_search_capabilities';
+import {
+  AbstractSearchRequest,
+  DefaultSearchCapabilities,
+  AbstractSearchStrategy,
+} from '../../../../../../../src/plugins/vis_type_timeseries/server';
+import { RouteDependencies } from '../../types';
+
+export const registerRollupSearchStrategy = (
+  { elasticsearchService }: RouteDependencies,
+  addSearchStrategy: (searchStrategy: any) => void
+) => {
+  const RollupSearchRequest = getRollupSearchRequest(AbstractSearchRequest);
+  const RollupSearchCapabilities = getRollupSearchCapabilities(DefaultSearchCapabilities);
+  const RollupSearchStrategy = getRollupSearchStrategy(
+    AbstractSearchStrategy,
+    RollupSearchRequest,
+    RollupSearchCapabilities
+  );
+
+  addSearchStrategy(new RollupSearchStrategy(elasticsearchService));
+};
diff --git a/x-pack/legacy/plugins/rollup/server/plugin.ts b/x-pack/legacy/plugins/rollup/server/plugin.ts
index 94af3d723c88f..090cb8a47377a 100644
--- a/x-pack/legacy/plugins/rollup/server/plugin.ts
+++ b/x-pack/legacy/plugins/rollup/server/plugin.ts
@@ -24,6 +24,7 @@ import {
 import { registerRollupUsageCollector } from './collectors';
 
 import { rollupDataEnricher } from './rollup_data_enricher';
+import { registerRollupSearchStrategy } from './lib/search_strategies';
 
 export class RollupsServerPlugin implements Plugin<void, void, any, any> {
   log: Logger;
@@ -81,6 +82,11 @@ export class RollupsServerPlugin implements Plugin<void, void, any, any> {
     if (indexManagement && indexManagement.indexDataEnricher) {
       indexManagement.indexDataEnricher.add(rollupDataEnricher);
     }
+
+    if (metrics) {
+      const { addSearchStrategy } = metrics;
+      registerRollupSearchStrategy(routeDependencies, addSearchStrategy);
+    }
   }
 
   start() {}

From 9ee289db88a8fb9cad5effdfe4d9887e6f1a0dd3 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Sun, 8 Mar 2020 13:45:26 +0200
Subject: [PATCH 03/18] Remove hasSearchStategyForIndexPattern

---
 .../kibana/public/discover/kibana_services.ts |  1 -
 .../discover/np_ready/angular/discover.js     |  7 +++---
 src/plugins/data/public/search/index.ts       |  7 +-----
 .../public/search/search_strategy/index.ts    |  2 --
 .../search_strategy_registry.ts               | 24 -------------------
 5 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 src/plugins/data/public/search/search_strategy/search_strategy_registry.ts

diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index 91b5c7f13dc95..3788ad9259e2d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -73,7 +73,6 @@ export {
   IIndexPattern,
   IndexPattern,
   indexPatterns,
-  hasSearchStategyForIndexPattern,
   IFieldType,
   SearchSource,
   ISearchSource,
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index fb4158a6e3e03..7f06836a54f59 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -49,7 +49,6 @@ import {
   getRequestInspectorStats,
   getResponseInspectorStats,
   getServices,
-  hasSearchStategyForIndexPattern,
   intervalOptions,
   migrateLegacyQuery,
   unhashUrl,
@@ -1065,9 +1064,9 @@ function discoverController(
 
   // Block the UI from loading if the user has loaded a rollup index pattern but it isn't
   // supported.
-  $scope.isUnsupportedIndexPattern =
-    !indexPatternsUtils.isDefault($route.current.locals.savedObjects.ip.loaded) &&
-    !hasSearchStategyForIndexPattern($route.current.locals.savedObjects.ip.loaded);
+  $scope.isUnsupportedIndexPattern = !indexPatternsUtils.isDefault(
+    $route.current.locals.savedObjects.ip.loaded
+  );
 
   if ($scope.isUnsupportedIndexPattern) {
     $scope.unsupportedIndexPatternType = $route.current.locals.savedObjects.ip.loaded.type;
diff --git a/src/plugins/data/public/search/index.ts b/src/plugins/data/public/search/index.ts
index ca586bb09a8d1..6ccd90c6a9eff 100644
--- a/src/plugins/data/public/search/index.ts
+++ b/src/plugins/data/public/search/index.ts
@@ -42,12 +42,7 @@ export { IKibanaSearchResponse, IKibanaSearchRequest } from '../../common/search
 
 export { LegacyApiCaller, SearchRequest, SearchResponse } from './es_client';
 
-export {
-  hasSearchStategyForIndexPattern,
-  SearchError,
-  SearchStrategyProvider,
-  getSearchErrorType,
-} from './search_strategy';
+export { SearchError, SearchStrategyProvider, getSearchErrorType } from './search_strategy';
 
 export {
   ISearchSource,
diff --git a/src/plugins/data/public/search/search_strategy/index.ts b/src/plugins/data/public/search/search_strategy/index.ts
index 5feef5604582a..e3de2ea46e3ec 100644
--- a/src/plugins/data/public/search/search_strategy/index.ts
+++ b/src/plugins/data/public/search/search_strategy/index.ts
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-export { hasSearchStategyForIndexPattern } from './search_strategy_registry';
-
 export { SearchError, getSearchErrorType } from './search_error';
 
 export { SearchStrategyProvider, SearchStrategySearchParams } from './types';
diff --git a/src/plugins/data/public/search/search_strategy/search_strategy_registry.ts b/src/plugins/data/public/search/search_strategy/search_strategy_registry.ts
deleted file mode 100644
index 77c1d0c8dec23..0000000000000
--- a/src/plugins/data/public/search/search_strategy/search_strategy_registry.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { IndexPattern } from '../..';
-
-export const hasSearchStategyForIndexPattern = (indexPattern: IndexPattern) => {
-  return true;
-};

From a336c5ae4d3bd29447a59c93ba6212460ec85e75 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Sun, 8 Mar 2020 15:21:49 +0200
Subject: [PATCH 04/18] ts

---
 x-pack/legacy/plugins/rollup/public/plugin.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/x-pack/legacy/plugins/rollup/public/plugin.ts b/x-pack/legacy/plugins/rollup/public/plugin.ts
index 742393e57ae3b..2d2ff4c8449d8 100644
--- a/x-pack/legacy/plugins/rollup/public/plugin.ts
+++ b/x-pack/legacy/plugins/rollup/public/plugin.ts
@@ -7,14 +7,12 @@
 import { i18n } from '@kbn/i18n';
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import { AggTypeFilters, AggTypeFieldFilters } from './legacy_imports';
-import { SearchStrategyProvider } from '../../../../../src/plugins/data/public';
 import { ManagementSetup as ManagementSetupLegacy } from '../../../../../src/legacy/core_plugins/management/public/np_ready';
 import { rollupBadgeExtension, rollupToggleExtension } from './extend_index_management';
 // @ts-ignore
 import { RollupIndexPatternCreationConfig } from './index_pattern_creation/rollup_index_pattern_creation_config';
 // @ts-ignore
 import { RollupIndexPatternListConfig } from './index_pattern_list/rollup_index_pattern_list_config';
-import { getRollupSearchStrategy } from './search/rollup_search_strategy';
 // @ts-ignore
 import { initAggTypeFilter } from './visualize/agg_type_filter';
 // @ts-ignore

From db427e76ab71b62af399976f7f0ccaa665e8de75 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Sun, 8 Mar 2020 23:16:15 +0200
Subject: [PATCH 05/18] fix jest tests

---
 .../public/search/fetch/call_client.test.ts   | 89 ++++++++-----------
 1 file changed, 37 insertions(+), 52 deletions(-)

diff --git a/src/plugins/data/public/search/fetch/call_client.test.ts b/src/plugins/data/public/search/fetch/call_client.test.ts
index 6b43157aab83b..22d05a7d4d8a9 100644
--- a/src/plugins/data/public/search/fetch/call_client.test.ts
+++ b/src/plugins/data/public/search/fetch/call_client.test.ts
@@ -20,60 +20,37 @@
 import { callClient } from './call_client';
 import { handleResponse } from './handle_response';
 import { FetchHandlers } from './types';
-import { SearchRequest } from '../..';
-import { SearchStrategySearchParams } from '../search_strategy';
-
-const mockResponses = [{}, {}];
-const mockAbortFns = [jest.fn(), jest.fn()];
-const mockSearchFns = [
-  jest.fn(({ searchRequests }: SearchStrategySearchParams) => ({
-    searching: Promise.resolve(Array(searchRequests.length).fill(mockResponses[0])),
-    abort: mockAbortFns[0],
-  })),
-  jest.fn(({ searchRequests }: SearchStrategySearchParams) => ({
-    searching: Promise.resolve(Array(searchRequests.length).fill(mockResponses[1])),
-    abort: mockAbortFns[1],
-  })),
-];
-const mockSearchStrategies = mockSearchFns.map((search, i) => ({ search, id: i }));
+import { SearchStrategySearchParams, defaultSearchStrategy } from '../search_strategy';
 
+const mockAbortFn = jest.fn();
 jest.mock('./handle_response', () => ({
   handleResponse: jest.fn((request, response) => response),
 }));
 
-jest.mock('../search_strategy', () => ({
-  getSearchStrategyForSearchRequest: (request: SearchRequest) =>
-    mockSearchStrategies[request._searchStrategyId],
-  getSearchStrategyById: (id: number) => mockSearchStrategies[id],
-}));
+jest.mock('../search_strategy', () => {
+  return {
+    defaultSearchStrategy: {
+      search: jest.fn(({ searchRequests }: SearchStrategySearchParams) => {
+        return {
+          searching: Promise.resolve(
+            searchRequests.map(req => {
+              return {
+                id: req._searchStrategyId,
+              };
+            })
+          ),
+          abort: mockAbortFn,
+        };
+      }),
+    },
+  };
+});
 
 describe('callClient', () => {
   beforeEach(() => {
     (handleResponse as jest.Mock).mockClear();
-    mockAbortFns.forEach(fn => fn.mockClear());
-    mockSearchFns.forEach(fn => fn.mockClear());
-  });
-
-  test('Executes each search strategy with its group of matching requests', () => {
-    const searchRequests = [
-      { _searchStrategyId: 0 },
-      { _searchStrategyId: 1 },
-      { _searchStrategyId: 0 },
-      { _searchStrategyId: 1 },
-    ];
-
-    callClient(searchRequests, [], {} as FetchHandlers);
-
-    expect(mockSearchFns[0]).toBeCalled();
-    expect(mockSearchFns[0].mock.calls[0][0].searchRequests).toEqual([
-      searchRequests[0],
-      searchRequests[2],
-    ]);
-    expect(mockSearchFns[1]).toBeCalled();
-    expect(mockSearchFns[1].mock.calls[0][0].searchRequests).toEqual([
-      searchRequests[1],
-      searchRequests[3],
-    ]);
+    // mockSearchFn.mockClear();
+    // mockAbortFn.mockClear();
   });
 
   test('Passes the additional arguments it is given to the search strategy', () => {
@@ -82,8 +59,11 @@ describe('callClient', () => {
 
     callClient(searchRequests, [], args);
 
-    expect(mockSearchFns[0]).toBeCalled();
-    expect(mockSearchFns[0].mock.calls[0][0]).toEqual({ searchRequests, ...args });
+    expect(defaultSearchStrategy.search).toBeCalled();
+    expect((defaultSearchStrategy.search as any).mock.calls[0][0]).toEqual({
+      searchRequests,
+      ...args,
+    });
   });
 
   test('Returns the responses in the original order', async () => {
@@ -91,7 +71,8 @@ describe('callClient', () => {
 
     const responses = await Promise.all(callClient(searchRequests, [], {} as FetchHandlers));
 
-    expect(responses).toEqual([mockResponses[1], mockResponses[0]]);
+    expect(responses[0]).toEqual({ id: searchRequests[0]._searchStrategyId });
+    expect(responses[1]).toEqual({ id: searchRequests[1]._searchStrategyId });
   });
 
   test('Calls handleResponse with each request and response', async () => {
@@ -101,8 +82,12 @@ describe('callClient', () => {
     await Promise.all(responses);
 
     expect(handleResponse).toBeCalledTimes(2);
-    expect(handleResponse).toBeCalledWith(searchRequests[0], mockResponses[0]);
-    expect(handleResponse).toBeCalledWith(searchRequests[1], mockResponses[1]);
+    expect(handleResponse).toBeCalledWith(searchRequests[0], {
+      id: searchRequests[0]._searchStrategyId,
+    });
+    expect(handleResponse).toBeCalledWith(searchRequests[1], {
+      id: searchRequests[1]._searchStrategyId,
+    });
   });
 
   test('If passed an abortSignal, calls abort on the strategy if the signal is aborted', () => {
@@ -117,7 +102,7 @@ describe('callClient', () => {
     callClient(searchRequests, requestOptions, {} as FetchHandlers);
     abortController.abort();
 
-    expect(mockAbortFns[0]).toBeCalled();
-    expect(mockAbortFns[1]).not.toBeCalled();
+    expect(mockAbortFn).toBeCalled();
+    // expect(mockAbortFns[1]).not.toBeCalled();
   });
 });

From 417623b221f0fb74a05b701d4a293ceadd6d1dcf Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Mon, 9 Mar 2020 14:28:04 +0200
Subject: [PATCH 06/18] cleanup exports

---
 src/legacy/core_plugins/data/public/index.ts                | 6 +-----
 .../public/control/create_search_source.ts                  | 4 ++--
 .../public/control/list_control_factory.ts                  | 4 ++--
 .../public/control/range_control_factory.ts                 | 4 ++--
 src/plugins/data/public/index.ts                            | 6 ------
 .../plugins/ml/public/application/util/dependency_cache.ts  | 4 ++--
 6 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts
index 424e5ab0bf4d5..dcaaf3ca511cc 100644
--- a/src/legacy/core_plugins/data/public/index.ts
+++ b/src/legacy/core_plugins/data/public/index.ts
@@ -28,11 +28,7 @@ export function plugin() {
 
 /** @public types */
 export { DataSetup, DataStart } from './plugin';
-export {
-  SavedQueryAttributes,
-  SavedQuery,
-  SavedQueryTimeFilter,
-} from '../../../../plugins/data/public';
+export { SavedQuery, SavedQueryTimeFilter } from '../../../../plugins/data/public';
 export {
   // agg_types
   AggParam, // only the type is used externally, only in vis editor
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts b/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts
index f792796230757..f238a2287ecdb 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts
+++ b/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PhraseFilter, IndexPattern, TimefilterSetup } from '../../../../../plugins/data/public';
+import { PhraseFilter, IndexPattern, TimefilterContract } from '../../../../../plugins/data/public';
 import { SearchSource as SearchSourceClass, SearchSourceFields } from '../legacy_imports';
 
 export function createSearchSource(
@@ -27,7 +27,7 @@ export function createSearchSource(
   aggs: any,
   useTimeFilter: boolean,
   filters: PhraseFilter[] = [],
-  timefilter: TimefilterSetup['timefilter']
+  timefilter: TimefilterContract
 ) {
   const searchSource = initialState ? new SearchSource(initialState) : new SearchSource();
   // Do not not inherit from rootSearchSource to avoid picking up time and globals
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts
index 56b42f295ce15..8364c82efecdb 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts
+++ b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts
@@ -26,7 +26,7 @@ import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
 import { createSearchSource } from './create_search_source';
 import { ControlParams } from '../editor_utils';
 import { InputControlVisDependencies } from '../plugin';
-import { IFieldType, TimefilterSetup } from '../../../../../plugins/data/public';
+import { IFieldType, TimefilterContract } from '../../../../../plugins/data/public';
 
 function getEscapedQuery(query = '') {
   // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html#_standard_operators
@@ -74,7 +74,7 @@ const termsAgg = ({ field, size, direction, query }: TermsAggArgs) => {
 
 export class ListControl extends Control<PhraseFilterManager> {
   private getInjectedVar: InputControlVisDependencies['core']['injectedMetadata']['getInjectedVar'];
-  private timefilter: TimefilterSetup['timefilter'];
+  private timefilter: TimefilterContract;
 
   abortController?: AbortController;
   lastAncestorValues: any;
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts
index b9191436b5968..d9b43c9dff201 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts
+++ b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts
@@ -26,7 +26,7 @@ import { RangeFilterManager } from './filter_manager/range_filter_manager';
 import { createSearchSource } from './create_search_source';
 import { ControlParams } from '../editor_utils';
 import { InputControlVisDependencies } from '../plugin';
-import { IFieldType, TimefilterSetup } from '../.../../../../../../plugins/data/public';
+import { IFieldType, TimefilterContract } from '../.../../../../../../plugins/data/public';
 
 const minMaxAgg = (field?: IFieldType) => {
   const aggBody: any = {};
@@ -52,7 +52,7 @@ const minMaxAgg = (field?: IFieldType) => {
 };
 
 export class RangeControl extends Control<RangeFilterManager> {
-  timefilter: TimefilterSetup['timefilter'];
+  timefilter: TimefilterContract;
   abortController: any;
   min: any;
   max: any;
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 86cc0cca85e0b..d1f177333a82d 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -286,11 +286,7 @@ export {
 export {
   ES_SEARCH_STRATEGY,
   SYNC_SEARCH_STRATEGY,
-  defaultSearchStrategy,
-  esSearchStrategyProvider,
   getEsPreference,
-  addSearchStrategy,
-  hasSearchStategyForIndexPattern,
   getSearchErrorType,
   ISearchContext,
   TSearchStrategyProvider,
@@ -347,9 +343,7 @@ export {
   SavedQuery,
   SavedQueryService,
   SavedQueryTimeFilter,
-  SavedQueryAttributes,
   InputTimeRange,
-  TimefilterSetup,
   TimeHistory,
   TimefilterContract,
   TimeHistoryContract,
diff --git a/x-pack/legacy/plugins/ml/public/application/util/dependency_cache.ts b/x-pack/legacy/plugins/ml/public/application/util/dependency_cache.ts
index 2a1ffe79d033c..679166c8d2cf0 100644
--- a/x-pack/legacy/plugins/ml/public/application/util/dependency_cache.ts
+++ b/x-pack/legacy/plugins/ml/public/application/util/dependency_cache.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { TimefilterSetup } from 'src/plugins/data/public';
+import { DataPublicPluginSetup } from 'src/plugins/data/public';
 import {
   IUiSettingsClient,
   ChromeStart,
@@ -23,7 +23,7 @@ import {
 import { SecurityPluginSetup } from '../../../../../../plugins/security/public';
 
 export interface DependencyCache {
-  timefilter: TimefilterSetup | null;
+  timefilter: DataPublicPluginSetup['timefilter'] | null;
   config: IUiSettingsClient | null;
   indexPatterns: IndexPatternsContract | null;
   chrome: ChromeStart | null;

From 1c6b42ccb2cfb99a543f97640639d112854b7cc3 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Mon, 9 Mar 2020 19:45:03 +0200
Subject: [PATCH 07/18] pass index pattern type to server for rollups

---
 .../np_ready/angular/directives/index.js      |  5 --
 .../directives/unsupported_index_pattern.js   | 49 -------------------
 .../discover/np_ready/angular/discover.html   |  7 +--
 .../discover/np_ready/angular/discover.js     | 11 -----
 .../data/public/index_patterns/index.ts       |  1 +
 .../lib/get_index_pattern_type.ts             | 24 +++++++++
 .../data/public/index_patterns/lib/index.ts   |  1 +
 .../search/search_source/search_source.ts     | 10 ++++
 .../default_search_strategy.ts                |  3 +-
 .../search/es_search/es_search_strategy.ts    | 10 +++-
 .../application/util/dependency_cache.ts      |  2 +-
 .../server/search/es_search_strategy.ts       |  5 +-
 12 files changed, 52 insertions(+), 76 deletions(-)
 delete mode 100644 src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/unsupported_index_pattern.js
 create mode 100644 src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.js
index 1a3922dfc2008..5482258e06564 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.js
@@ -19,7 +19,6 @@
 
 import { DiscoverNoResults } from './no_results';
 import { DiscoverUninitialized } from './uninitialized';
-import { DiscoverUnsupportedIndexPattern } from './unsupported_index_pattern';
 import { DiscoverHistogram } from './histogram';
 import { getAngularModule, wrapInI18nContext } from '../../../kibana_services';
 
@@ -33,8 +32,4 @@ app.directive('discoverUninitialized', reactDirective =>
   reactDirective(wrapInI18nContext(DiscoverUninitialized))
 );
 
-app.directive('discoverUnsupportedIndexPattern', reactDirective =>
-  reactDirective(wrapInI18nContext(DiscoverUnsupportedIndexPattern), ['unsupportedType'])
-);
-
 app.directive('discoverHistogram', reactDirective => reactDirective(DiscoverHistogram));
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/unsupported_index_pattern.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/unsupported_index_pattern.js
deleted file mode 100644
index 7cf4fd1d14181..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/unsupported_index_pattern.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React, { Fragment } from 'react';
-import { EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-export const DiscoverUnsupportedIndexPattern = ({ unsupportedType }) => {
-  // This message makes the assumption that X-Pack will support this type, as is the case with
-  // rollup index patterns.
-  const message = (
-    <FormattedMessage
-      id="kbn.discover.noResults.requiredPluginIsNotInstalledOrDisabledTitle"
-      defaultMessage="Index patterns based on {unsupportedType} indices
-      require the {unsupportedType} plugin from X-Pack, which is not installed or disabled"
-      values={{
-        unsupportedType,
-      }}
-    />
-  );
-
-  return (
-    <Fragment>
-      <EuiSpacer size="xl" />
-
-      <EuiFlexGroup justifyContent="center">
-        <EuiFlexItem grow={false} className="dscNoResults">
-          <EuiCallOut title={message} color="danger" iconType="alert" />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </Fragment>
-  );
-};
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
index 18254aeca5094..4b73e6b006ea8 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
@@ -12,7 +12,7 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
 
     query="state.query"
     on-query-submit="updateQuery"
-	
+
     show-save-query="showSaveQuery"
     saved-query-id="state.savedQuery"
     on-saved-query-id-change="updateSavedQueryId"
@@ -41,11 +41,6 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
       </div>
 
       <div class="dscWrapper col-md-10">
-        <discover-unsupported-index-pattern
-          ng-if="isUnsupportedIndexPattern"
-          unsupported-type="unsupportedIndexPatternType"
-        ></discover-unsupported-index-pattern>
-
         <discover-no-results
           ng-show="resultState === 'none'"
           shard-failures="failures"
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 7f06836a54f59..e1e094790e7f7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -1062,17 +1062,6 @@ function discoverController(
     return loadedIndexPattern;
   }
 
-  // Block the UI from loading if the user has loaded a rollup index pattern but it isn't
-  // supported.
-  $scope.isUnsupportedIndexPattern = !indexPatternsUtils.isDefault(
-    $route.current.locals.savedObjects.ip.loaded
-  );
-
-  if ($scope.isUnsupportedIndexPattern) {
-    $scope.unsupportedIndexPatternType = $route.current.locals.savedObjects.ip.loaded.type;
-    return;
-  }
-
   addHelpMenuToAppChrome(chrome);
 
   init();
diff --git a/src/plugins/data/public/index_patterns/index.ts b/src/plugins/data/public/index_patterns/index.ts
index dcf799184b01c..8965378866d5f 100644
--- a/src/plugins/data/public/index_patterns/index.ts
+++ b/src/plugins/data/public/index_patterns/index.ts
@@ -25,6 +25,7 @@ export {
   validateIndexPattern,
   getFromSavedObject,
   isDefault,
+  getIndexPatternType,
 } from './lib';
 export { getRoutes } from './utils';
 export { flattenHitWrapper, formatHitProvider } from './index_patterns';
diff --git a/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts b/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts
new file mode 100644
index 0000000000000..526aa752bc84b
--- /dev/null
+++ b/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IIndexPattern } from '../../../common/index_patterns';
+
+export function getIndexPatternType(indexPattern: IIndexPattern) {
+  return indexPattern.type || (indexPattern.get && indexPattern.get('type'));
+}
diff --git a/src/plugins/data/public/index_patterns/lib/index.ts b/src/plugins/data/public/index_patterns/lib/index.ts
index 2893096c4af9d..0162bc8ae811d 100644
--- a/src/plugins/data/public/index_patterns/lib/index.ts
+++ b/src/plugins/data/public/index_patterns/lib/index.ts
@@ -23,3 +23,4 @@ export { validateIndexPattern } from './validate_index_pattern';
 export { IndexPatternMissingIndices } from './errors';
 export { getFromSavedObject } from './get_from_saved_object';
 export { isDefault } from './is_default';
+export { getIndexPatternType } from './is_rollup';
diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
index 21e5ded6983ac..be34f601dcc5d 100644
--- a/src/plugins/data/public/search/search_source/search_source.ts
+++ b/src/plugins/data/public/search/search_source/search_source.ts
@@ -80,6 +80,7 @@ import { fetchSoon, FetchOptions, RequestFailure } from '../fetch';
 import { getSearchService, getUiSettings, getInjectedMetadata } from '../../services';
 import { getEsQueryConfig, buildEsQuery, Filter } from '../../../common';
 import { getHighlightRequest } from '../../../common/field_formats';
+import { getIndexPatternType } from '../../index_patterns';
 
 export type ISearchSource = Pick<SearchSource, keyof SearchSource>;
 
@@ -339,11 +340,20 @@ export class SearchSource {
     return searchRequest;
   }
 
+  private getIndexType(index: IIndexPattern) {
+    if (this.searchStrategyId) {
+      return this.searchStrategyId === 'default' ? undefined : this.searchStrategyId;
+    } else {
+      return getIndexPatternType(index);
+    }
+  }
+
   private flatten() {
     const searchRequest = this.mergeProps();
 
     searchRequest.body = searchRequest.body || {};
     const { body, index, fields, query, filters, highlightAll } = searchRequest;
+    searchRequest.indexType = this.getIndexType(index);
 
     const computedFields = index ? index.getComputedFields() : {};
 
diff --git a/src/plugins/data/public/search/search_strategy/default_search_strategy.ts b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
index 6fcb1e6b3e8d2..77cb8b2595dc4 100644
--- a/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
+++ b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
@@ -74,9 +74,10 @@ function search({
 }: SearchStrategySearchParams) {
   const abortController = new AbortController();
   const searchParams = getSearchParams(config, esShardTimeout);
-  const promises = searchRequests.map(({ index, body }) => {
+  const promises = searchRequests.map(({ index, indexType, body }) => {
     const params = {
       index: index.title || index,
+      indexType,
       body,
       ...searchParams,
     };
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
index 26055a3ae41f7..084832f666e79 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -31,9 +31,17 @@ export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_
     search: async (request, options) => {
       const config = await context.config$.pipe(first()).toPromise();
       const defaultParams = getDefaultSearchParams(config);
+      const { indexType, ...rest } = request.params;
+
+      // Only default index pattern type is supported here.
+      // See data_enhanced for other type support.
+      if (!indexType) {
+        throw new Error(`Unsupported index pattern type ${indexType}`);
+      }
+
       const params = {
         ...defaultParams,
-        ...request.params,
+        ...rest,
       };
       const rawResponse = (await caller('search', params, options)) as SearchResponse<any>;
 
diff --git a/x-pack/legacy/plugins/ml/public/application/util/dependency_cache.ts b/x-pack/legacy/plugins/ml/public/application/util/dependency_cache.ts
index 679166c8d2cf0..6982d3d2dba97 100644
--- a/x-pack/legacy/plugins/ml/public/application/util/dependency_cache.ts
+++ b/x-pack/legacy/plugins/ml/public/application/util/dependency_cache.ts
@@ -23,7 +23,7 @@ import {
 import { SecurityPluginSetup } from '../../../../../../plugins/security/public';
 
 export interface DependencyCache {
-  timefilter: DataPublicPluginSetup['timefilter'] | null;
+  timefilter: DataPublicPluginSetup['query']['timefilter'] | null;
   config: IUiSettingsClient | null;
   indexPatterns: IndexPatternsContract | null;
   chrome: ChromeStart | null;
diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
index 6e12ffb6404c6..e73cf648accc6 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
@@ -28,9 +28,10 @@ export const enhancedEsSearchStrategyProvider: TSearchStrategyProvider<typeof ES
   ) => {
     const config = await context.config$.pipe(first()).toPromise();
     const defaultParams = getDefaultSearchParams(config);
-    const params = { ...defaultParams, ...request.params };
+    const { indexType, ...rest } = request.params;
+    const params = { ...defaultParams, ...rest };
 
-    const rawResponse = (await (request.isRollup
+    const rawResponse = (await (indexType === 'rollup'
       ? rollupSearch(caller, { ...request, params }, options)
       : caller('search', params, options))) as SearchResponse<any>;
 

From 6099189e1d5037c41c334e326407c7eabb77a5c4 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Mon, 9 Mar 2020 20:01:46 +0200
Subject: [PATCH 08/18] merge fix

---
 .../kibana/public/discover/np_ready/angular/discover.html      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
index 630c390295f79..2334e33deadba 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
@@ -7,9 +7,6 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
     config="topNavMenu"
     index-patterns="[indexPattern]"
     on-query-submit="updateQuery"
-
-    show-save-query="showSaveQuery"
-    saved-query-id="state.savedQuery"
     on-saved-query-id-change="updateSavedQueryId"
     query="state.query"
     saved-query-id="state.savedQuery"

From 02a101ad841818546d115376bd292d0927cc6fe1 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Mon, 9 Mar 2020 23:12:41 +0200
Subject: [PATCH 09/18] Fix types

---
 src/plugins/data/public/index_patterns/lib/index.ts            | 2 +-
 src/plugins/data/public/search/search_source/search_source.ts  | 2 +-
 .../data/public/ui/saved_query_form/save_query_form.tsx        | 3 ++-
 src/plugins/data/server/search/es_search/es_search_strategy.ts | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/data/public/index_patterns/lib/index.ts b/src/plugins/data/public/index_patterns/lib/index.ts
index 0162bc8ae811d..8ae3050df6198 100644
--- a/src/plugins/data/public/index_patterns/lib/index.ts
+++ b/src/plugins/data/public/index_patterns/lib/index.ts
@@ -23,4 +23,4 @@ export { validateIndexPattern } from './validate_index_pattern';
 export { IndexPatternMissingIndices } from './errors';
 export { getFromSavedObject } from './get_from_saved_object';
 export { isDefault } from './is_default';
-export { getIndexPatternType } from './is_rollup';
+export { getIndexPatternType } from './get_index_pattern_type';
diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
index be34f601dcc5d..ba20611e2fcc8 100644
--- a/src/plugins/data/public/search/search_source/search_source.ts
+++ b/src/plugins/data/public/search/search_source/search_source.ts
@@ -73,7 +73,7 @@ import _ from 'lodash';
 import { normalizeSortRequest } from './normalize_sort_request';
 import { filterDocvalueFields } from './filter_docvalue_fields';
 import { fieldWildcardFilter } from '../../../../kibana_utils/public';
-import { SearchRequest } from '../..';
+import { IIndexPattern, SearchRequest } from '../..';
 import { SearchSourceOptions, SearchSourceFields } from './types';
 import { fetchSoon, FetchOptions, RequestFailure } from '../fetch';
 
diff --git a/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx b/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx
index f9a0ae4e803c4..a9dffa9305802 100644
--- a/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx
+++ b/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx
@@ -35,7 +35,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { sortBy, isEqual } from 'lodash';
-import { SavedQuery, SavedQueryAttributes, SavedQueryService } from '../..';
+import { SavedQuery, SavedQueryService } from '../..';
+import { SavedQueryAttributes } from '../../query';
 
 interface Props {
   savedQuery?: SavedQueryAttributes;
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
index 084832f666e79..ffb47b2e6c3ae 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -31,7 +31,8 @@ export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_
     search: async (request, options) => {
       const config = await context.config$.pipe(first()).toPromise();
       const defaultParams = getDefaultSearchParams(config);
-      const { indexType, ...rest } = request.params;
+      // fix me
+      const { indexType, ...rest } = request.params as any;
 
       // Only default index pattern type is supported here.
       // See data_enhanced for other type support.

From d5f9f8a2e2a9f5e0ae05a5f32a0dd291772e9f44 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Tue, 10 Mar 2020 10:32:20 +0200
Subject: [PATCH 10/18] ts fixes

---
 .../public/query/saved_query/saved_query_service.test.ts    | 2 +-
 .../data/public/search/search_source/search_source.ts       | 2 +-
 .../search/search_strategy/default_search_strategy.ts       | 4 ++--
 .../data/server/search/es_search/es_search_strategy.ts      | 6 +++---
 .../data_enhanced/server/search/es_search_strategy.ts       | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/data/public/query/saved_query/saved_query_service.test.ts b/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
index c983cc4ea8fc5..a86a5b4ed401e 100644
--- a/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
+++ b/src/plugins/data/public/query/saved_query/saved_query_service.test.ts
@@ -18,8 +18,8 @@
  */
 
 import { createSavedQueryService } from './saved_query_service';
-import { SavedQueryAttributes } from '../..';
 import { FilterStateStore } from '../../../common';
+import { SavedQueryAttributes } from './types';
 
 const savedQueryAttributes: SavedQueryAttributes = {
   title: 'foo',
diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
index ba20611e2fcc8..f7a437572ad47 100644
--- a/src/plugins/data/public/search/search_source/search_source.ts
+++ b/src/plugins/data/public/search/search_source/search_source.ts
@@ -353,7 +353,7 @@ export class SearchSource {
 
     searchRequest.body = searchRequest.body || {};
     const { body, index, fields, query, filters, highlightAll } = searchRequest;
-    searchRequest.indexType = this.getIndexType(index);
+    searchRequest.type = this.getIndexType(index);
 
     const computedFields = index ? index.getComputedFields() : {};
 
diff --git a/src/plugins/data/public/search/search_strategy/default_search_strategy.ts b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
index 77cb8b2595dc4..9990338e960f0 100644
--- a/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
+++ b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
@@ -74,10 +74,10 @@ function search({
 }: SearchStrategySearchParams) {
   const abortController = new AbortController();
   const searchParams = getSearchParams(config, esShardTimeout);
-  const promises = searchRequests.map(({ index, indexType, body }) => {
+  const promises = searchRequests.map(({ index, type, body }) => {
     const params = {
       index: index.title || index,
-      indexType,
+      type,
       body,
       ...searchParams,
     };
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
index ffb47b2e6c3ae..610bf62da17d3 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -32,12 +32,12 @@ export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_
       const config = await context.config$.pipe(first()).toPromise();
       const defaultParams = getDefaultSearchParams(config);
       // fix me
-      const { indexType, ...rest } = request.params as any;
+      const { type, ...rest } = request.params;
 
       // Only default index pattern type is supported here.
       // See data_enhanced for other type support.
-      if (!indexType) {
-        throw new Error(`Unsupported index pattern type ${indexType}`);
+      if (!type) {
+        throw new Error(`Unsupported index pattern type ${type}`);
       }
 
       const params = {
diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
index e73cf648accc6..e444154c51e9d 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
@@ -28,10 +28,10 @@ export const enhancedEsSearchStrategyProvider: TSearchStrategyProvider<typeof ES
   ) => {
     const config = await context.config$.pipe(first()).toPromise();
     const defaultParams = getDefaultSearchParams(config);
-    const { indexType, ...rest } = request.params;
+    const { type, ...rest } = request.params;
     const params = { ...defaultParams, ...rest };
 
-    const rawResponse = (await (indexType === 'rollup'
+    const rawResponse = (await (type === 'rollup'
       ? rollupSearch(caller, { ...request, params }, options)
       : caller('search', params, options))) as SearchResponse<any>;
 

From 241c247cfc20b3e6e1fc55dc54341fe2a6b7d795 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Tue, 10 Mar 2020 11:33:09 +0200
Subject: [PATCH 11/18] oss strategy error handling

---
 .../kibana/public/discover/np_ready/angular/discover.js       | 2 +-
 .../data/server/search/es_search/es_search_strategy.ts        | 2 +-
 src/plugins/data/server/search/routes.ts                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 22218282902d4..5ccee2b92ce33 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -804,7 +804,7 @@ function discoverController(
             title: i18n.translate('kbn.discover.errorLoadingData', {
               defaultMessage: 'Error loading data',
             }),
-            toastMessage: error.shortMessage,
+            toastMessage: error.shortMessage || error.body?.message,
           });
         }
       });
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
index 610bf62da17d3..326685eb3883b 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -36,7 +36,7 @@ export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_
 
       // Only default index pattern type is supported here.
       // See data_enhanced for other type support.
-      if (!type) {
+      if (!!type) {
         throw new Error(`Unsupported index pattern type ${type}`);
       }
 
diff --git a/src/plugins/data/server/search/routes.ts b/src/plugins/data/server/search/routes.ts
index 2b8c4b95ee022..e618f99084aed 100644
--- a/src/plugins/data/server/search/routes.ts
+++ b/src/plugins/data/server/search/routes.ts
@@ -43,11 +43,11 @@ export function registerSearchRoute(router: IRouter): void {
         return res.ok({ body: response });
       } catch (err) {
         return res.customError({
-          statusCode: err.statusCode,
+          statusCode: err.statusCode || 500,
           body: {
             message: err.message,
             attributes: {
-              error: err.body.error,
+              error: err.body?.error || err.message,
             },
           },
         });

From 3a5fcc22b958a44ecb34592adaf1d3a439a2a750 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Tue, 10 Mar 2020 13:20:45 +0200
Subject: [PATCH 12/18] update translations

---
 x-pack/plugins/translations/translations/ja-JP.json | 1 -
 x-pack/plugins/translations/translations/zh-CN.json | 1 -
 2 files changed, 2 deletions(-)

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 5635bb19b7e83..db6e5740767df 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1116,7 +1116,6 @@
     "kbn.discover.noResults.indexFailureIndexText": "インデックス {failureIndex}",
     "kbn.discover.noResults.indexFailureShardText": "{index}、シャード {failureShard}",
     "kbn.discover.noResults.queryMayNotMatchTitle": "表示されているインデックスの 1 つまたは複数にデータフィールドが含まれています。クエリが現在の時間範囲のデータと一致しないか、現在選択された時間範囲にデータが全く存在しない可能性があります。データが存在する時間範囲に変えることができます。",
-    "kbn.discover.noResults.requiredPluginIsNotInstalledOrDisabledTitle": "{unsupportedType} インデックスに基づくインデックスパターンには X-Pack の {unsupportedType} プラグインが必要で、このプラグインは現在インストールされていないか無効になっています。",
     "kbn.discover.noResults.searchExamples.400to499StatusCodeExampleTitle": "400-499 のすべてのステータスコードを検索",
     "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpExtensionExampleTitle": "400-499 の php 拡張子のステータスコードを検索",
     "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpOrHtmlExtensionExampleTitle": "400-499 の php または html 拡張子のステータスコードを検索",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 0523021046167..881ae74e563b1 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1116,7 +1116,6 @@
     "kbn.discover.noResults.indexFailureIndexText": "索引 {failureIndex}",
     "kbn.discover.noResults.indexFailureShardText": "{index}，分片 {failureShard}",
     "kbn.discover.noResults.queryMayNotMatchTitle": "您正在查看的一个或多个索引包含日期字段。您的查询在当前时间范围内可能不匹配任何数据，也可能在当前选定的时间范围内没有任何数据。您可以尝试将时间范围更改为包含数据的时间范围。",
-    "kbn.discover.noResults.requiredPluginIsNotInstalledOrDisabledTitle": "基于 {unsupportedType} 索引的索引模式需要 X-Pack 的 {unsupportedType} 插件，但其未安装或已禁用",
     "kbn.discover.noResults.searchExamples.400to499StatusCodeExampleTitle": "查找所有介于 400-499 之间的状态代码",
     "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpExtensionExampleTitle": "查找状态代码 400-499 以及扩展名 php",
     "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpOrHtmlExtensionExampleTitle": "查找状态代码 400-499 以及扩展名 php 或 html",

From 73eb852f7394eae0f4dd31e99aa04318855d2695 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Tue, 10 Mar 2020 15:09:49 +0200
Subject: [PATCH 13/18] jest test fix

---
 .../data/public/index_patterns/lib/get_index_pattern_type.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts b/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts
index 526aa752bc84b..2772b217d954b 100644
--- a/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts
+++ b/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts
@@ -19,6 +19,6 @@
 
 import { IIndexPattern } from '../../../common/index_patterns';
 
-export function getIndexPatternType(indexPattern: IIndexPattern) {
-  return indexPattern.type || (indexPattern.get && indexPattern.get('type'));
+export function getIndexPatternType(indexPattern?: IIndexPattern) {
+  return indexPattern?.type || (indexPattern?.get && indexPattern?.get('type'));
 }

From f80efb0826ec1d91abdec4fcab3f08b9b8d7329d Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Tue, 10 Mar 2020 17:44:53 +0200
Subject: [PATCH 14/18] Use indexType instead of index

---
 src/plugins/data/common/search/es_search/types.ts         | 1 +
 .../data/public/search/search_source/search_source.ts     | 2 +-
 .../search/search_strategy/default_search_strategy.ts     | 5 ++---
 .../data/server/search/es_search/es_search_strategy.ts    | 8 +++-----
 .../data_enhanced/server/search/es_search_strategy.ts     | 5 ++---
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/plugins/data/common/search/es_search/types.ts b/src/plugins/data/common/search/es_search/types.ts
index 1576a6e38e36d..550aac6819d0b 100644
--- a/src/plugins/data/common/search/es_search/types.ts
+++ b/src/plugins/data/common/search/es_search/types.ts
@@ -23,6 +23,7 @@ export const ES_SEARCH_STRATEGY = 'es';
 
 export interface IEsSearchRequest extends IKibanaSearchRequest {
   params: SearchParams;
+  indexType?: string;
 }
 
 export interface IEsSearchResponse<Hits = unknown> extends IKibanaSearchResponse {
diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
index f7a437572ad47..ba20611e2fcc8 100644
--- a/src/plugins/data/public/search/search_source/search_source.ts
+++ b/src/plugins/data/public/search/search_source/search_source.ts
@@ -353,7 +353,7 @@ export class SearchSource {
 
     searchRequest.body = searchRequest.body || {};
     const { body, index, fields, query, filters, highlightAll } = searchRequest;
-    searchRequest.type = this.getIndexType(index);
+    searchRequest.indexType = this.getIndexType(index);
 
     const computedFields = index ? index.getComputedFields() : {};
 
diff --git a/src/plugins/data/public/search/search_strategy/default_search_strategy.ts b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
index 9990338e960f0..2bd88f51587a8 100644
--- a/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
+++ b/src/plugins/data/public/search/search_strategy/default_search_strategy.ts
@@ -74,16 +74,15 @@ function search({
 }: SearchStrategySearchParams) {
   const abortController = new AbortController();
   const searchParams = getSearchParams(config, esShardTimeout);
-  const promises = searchRequests.map(({ index, type, body }) => {
+  const promises = searchRequests.map(({ index, indexType, body }) => {
     const params = {
       index: index.title || index,
-      type,
       body,
       ...searchParams,
     };
     const { signal } = abortController;
     return searchService
-      .search({ params }, { signal })
+      .search({ params, indexType }, { signal })
       .toPromise()
       .then(({ rawResponse }) => rawResponse);
   });
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
index 326685eb3883b..b4ee02eefaf84 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -31,18 +31,16 @@ export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_
     search: async (request, options) => {
       const config = await context.config$.pipe(first()).toPromise();
       const defaultParams = getDefaultSearchParams(config);
-      // fix me
-      const { type, ...rest } = request.params;
 
       // Only default index pattern type is supported here.
       // See data_enhanced for other type support.
-      if (!!type) {
-        throw new Error(`Unsupported index pattern type ${type}`);
+      if (!!request.indexType) {
+        throw new Error(`Unsupported index pattern type ${request.indexType}`);
       }
 
       const params = {
         ...defaultParams,
-        ...rest,
+        ...request.params,
       };
       const rawResponse = (await caller('search', params, options)) as SearchResponse<any>;
 
diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
index e444154c51e9d..69b357196dc32 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
@@ -28,10 +28,9 @@ export const enhancedEsSearchStrategyProvider: TSearchStrategyProvider<typeof ES
   ) => {
     const config = await context.config$.pipe(first()).toPromise();
     const defaultParams = getDefaultSearchParams(config);
-    const { type, ...rest } = request.params;
-    const params = { ...defaultParams, ...rest };
+    const params = { ...defaultParams, ...request.params };
 
-    const rawResponse = (await (type === 'rollup'
+    const rawResponse = (await (request.indexType === 'rollup'
       ? rollupSearch(caller, { ...request, params }, options)
       : caller('search', params, options))) as SearchResponse<any>;
 

From 8c36948f86895dcfb4c7dccd6c42ba743a060e81 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Wed, 11 Mar 2020 10:56:03 +0200
Subject: [PATCH 15/18] code review 1

---
 .../data/public/index_patterns/index.ts       |  1 -
 .../lib/get_index_pattern_type.ts             | 24 -------------------
 .../data/public/index_patterns/lib/index.ts   |  1 -
 .../public/search/fetch/call_client.test.ts   |  2 --
 .../search/search_source/search_source.ts     |  3 +--
 5 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts

diff --git a/src/plugins/data/public/index_patterns/index.ts b/src/plugins/data/public/index_patterns/index.ts
index 8965378866d5f..dcf799184b01c 100644
--- a/src/plugins/data/public/index_patterns/index.ts
+++ b/src/plugins/data/public/index_patterns/index.ts
@@ -25,7 +25,6 @@ export {
   validateIndexPattern,
   getFromSavedObject,
   isDefault,
-  getIndexPatternType,
 } from './lib';
 export { getRoutes } from './utils';
 export { flattenHitWrapper, formatHitProvider } from './index_patterns';
diff --git a/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts b/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts
deleted file mode 100644
index 2772b217d954b..0000000000000
--- a/src/plugins/data/public/index_patterns/lib/get_index_pattern_type.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { IIndexPattern } from '../../../common/index_patterns';
-
-export function getIndexPatternType(indexPattern?: IIndexPattern) {
-  return indexPattern?.type || (indexPattern?.get && indexPattern?.get('type'));
-}
diff --git a/src/plugins/data/public/index_patterns/lib/index.ts b/src/plugins/data/public/index_patterns/lib/index.ts
index 8ae3050df6198..2893096c4af9d 100644
--- a/src/plugins/data/public/index_patterns/lib/index.ts
+++ b/src/plugins/data/public/index_patterns/lib/index.ts
@@ -23,4 +23,3 @@ export { validateIndexPattern } from './validate_index_pattern';
 export { IndexPatternMissingIndices } from './errors';
 export { getFromSavedObject } from './get_from_saved_object';
 export { isDefault } from './is_default';
-export { getIndexPatternType } from './get_index_pattern_type';
diff --git a/src/plugins/data/public/search/fetch/call_client.test.ts b/src/plugins/data/public/search/fetch/call_client.test.ts
index 22d05a7d4d8a9..7a99b7c064515 100644
--- a/src/plugins/data/public/search/fetch/call_client.test.ts
+++ b/src/plugins/data/public/search/fetch/call_client.test.ts
@@ -49,8 +49,6 @@ jest.mock('../search_strategy', () => {
 describe('callClient', () => {
   beforeEach(() => {
     (handleResponse as jest.Mock).mockClear();
-    // mockSearchFn.mockClear();
-    // mockAbortFn.mockClear();
   });
 
   test('Passes the additional arguments it is given to the search strategy', () => {
diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
index ba20611e2fcc8..79d96db388b5a 100644
--- a/src/plugins/data/public/search/search_source/search_source.ts
+++ b/src/plugins/data/public/search/search_source/search_source.ts
@@ -80,7 +80,6 @@ import { fetchSoon, FetchOptions, RequestFailure } from '../fetch';
 import { getSearchService, getUiSettings, getInjectedMetadata } from '../../services';
 import { getEsQueryConfig, buildEsQuery, Filter } from '../../../common';
 import { getHighlightRequest } from '../../../common/field_formats';
-import { getIndexPatternType } from '../../index_patterns';
 
 export type ISearchSource = Pick<SearchSource, keyof SearchSource>;
 
@@ -344,7 +343,7 @@ export class SearchSource {
     if (this.searchStrategyId) {
       return this.searchStrategyId === 'default' ? undefined : this.searchStrategyId;
     } else {
-      return getIndexPatternType(index);
+      return index.type;
     }
   }
 

From 90f05ec2e60428a42dc0db048891eee563e44cd2 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Wed, 11 Mar 2020 11:37:50 +0200
Subject: [PATCH 16/18] updated docs

---
 ...n-plugins-data-public.addsearchstrategy.md | 11 -----
 ...ugins-data-public.defaultsearchstrategy.md | 11 -----
 ...ns-data-public.essearchstrategyprovider.md | 11 -----
 ...gin-plugins-data-public.getdefaultquery.md | 28 +++++++++++
 ...-public.hassearchstategyforindexpattern.md | 11 -----
 ...-data-public.iessearchrequest.indextype.md | 11 +++++
 ...in-plugins-data-public.iessearchrequest.md |  1 +
 .../kibana-plugin-plugins-data-public.md      |  6 ---
 ...public.savedqueryattributes.description.md | 11 -----
 ...ata-public.savedqueryattributes.filters.md | 11 -----
 ...lugins-data-public.savedqueryattributes.md | 22 ---------
 ...-data-public.savedqueryattributes.query.md | 11 -----
 ...-public.savedqueryattributes.timefilter.md | 11 -----
 ...-data-public.savedqueryattributes.title.md | 11 -----
 ...ins-data-public.timefiltersetup.history.md | 11 -----
 ...gin-plugins-data-public.timefiltersetup.md | 20 --------
 ...-data-public.timefiltersetup.timefilter.md | 11 -----
 src/plugins/data/public/public.api.md         | 48 ++-----------------
 18 files changed, 44 insertions(+), 213 deletions(-)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.addsearchstrategy.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.defaultsearchstrategy.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.essearchstrategyprovider.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getdefaultquery.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.hassearchstategyforindexpattern.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iessearchrequest.indextype.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.description.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.filters.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.query.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.timefilter.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.title.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.history.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.timefilter.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.addsearchstrategy.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.addsearchstrategy.md
deleted file mode 100644
index 119e7fbe62536..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.addsearchstrategy.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [addSearchStrategy](./kibana-plugin-plugins-data-public.addsearchstrategy.md)
-
-## addSearchStrategy variable
-
-<b>Signature:</b>
-
-```typescript
-addSearchStrategy: (searchStrategy: SearchStrategyProvider) => void
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.defaultsearchstrategy.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.defaultsearchstrategy.md
deleted file mode 100644
index d6a71cf561bc2..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.defaultsearchstrategy.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [defaultSearchStrategy](./kibana-plugin-plugins-data-public.defaultsearchstrategy.md)
-
-## defaultSearchStrategy variable
-
-<b>Signature:</b>
-
-```typescript
-defaultSearchStrategy: SearchStrategyProvider
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.essearchstrategyprovider.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.essearchstrategyprovider.md
deleted file mode 100644
index 1394c6b868546..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.essearchstrategyprovider.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [esSearchStrategyProvider](./kibana-plugin-plugins-data-public.essearchstrategyprovider.md)
-
-## esSearchStrategyProvider variable
-
-<b>Signature:</b>
-
-```typescript
-esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_STRATEGY>
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getdefaultquery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getdefaultquery.md
new file mode 100644
index 0000000000000..5e6627880333e
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getdefaultquery.md
@@ -0,0 +1,28 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [getDefaultQuery](./kibana-plugin-plugins-data-public.getdefaultquery.md)
+
+## getDefaultQuery() function
+
+<b>Signature:</b>
+
+```typescript
+export declare function getDefaultQuery(language?: QueryLanguage): {
+    query: string;
+    language: QueryLanguage;
+};
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  language | <code>QueryLanguage</code> |  |
+
+<b>Returns:</b>
+
+`{
+    query: string;
+    language: QueryLanguage;
+}`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.hassearchstategyforindexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.hassearchstategyforindexpattern.md
deleted file mode 100644
index 94608e7a86820..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.hassearchstategyforindexpattern.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [hasSearchStategyForIndexPattern](./kibana-plugin-plugins-data-public.hassearchstategyforindexpattern.md)
-
-## hasSearchStategyForIndexPattern variable
-
-<b>Signature:</b>
-
-```typescript
-hasSearchStategyForIndexPattern: (indexPattern: IndexPattern) => boolean
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iessearchrequest.indextype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iessearchrequest.indextype.md
new file mode 100644
index 0000000000000..55b43efc52305
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iessearchrequest.indextype.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IEsSearchRequest](./kibana-plugin-plugins-data-public.iessearchrequest.md) &gt; [indexType](./kibana-plugin-plugins-data-public.iessearchrequest.indextype.md)
+
+## IEsSearchRequest.indexType property
+
+<b>Signature:</b>
+
+```typescript
+indexType?: string;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iessearchrequest.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iessearchrequest.md
index 7a40725a67e5f..ed24ca613cdf6 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iessearchrequest.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iessearchrequest.md
@@ -14,5 +14,6 @@ export interface IEsSearchRequest extends IKibanaSearchRequest
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [indexType](./kibana-plugin-plugins-data-public.iessearchrequest.indextype.md) | <code>string</code> |  |
 |  [params](./kibana-plugin-plugins-data-public.iessearchrequest.params.md) | <code>SearchParams</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index 4b85461e64097..ce1375d277b75 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -74,32 +74,26 @@
 |  [RangeFilterParams](./kibana-plugin-plugins-data-public.rangefilterparams.md) |  |
 |  [RefreshInterval](./kibana-plugin-plugins-data-public.refreshinterval.md) |  |
 |  [SavedQuery](./kibana-plugin-plugins-data-public.savedquery.md) |  |
-|  [SavedQueryAttributes](./kibana-plugin-plugins-data-public.savedqueryattributes.md) |  |
 |  [SavedQueryService](./kibana-plugin-plugins-data-public.savedqueryservice.md) |  |
 |  [SearchSourceFields](./kibana-plugin-plugins-data-public.searchsourcefields.md) |  |
 |  [SearchStrategyProvider](./kibana-plugin-plugins-data-public.searchstrategyprovider.md) |  |
-|  [TimefilterSetup](./kibana-plugin-plugins-data-public.timefiltersetup.md) |  |
 |  [TimeRange](./kibana-plugin-plugins-data-public.timerange.md) |  |
 
 ## Variables
 
 |  Variable | Description |
 |  --- | --- |
-|  [addSearchStrategy](./kibana-plugin-plugins-data-public.addsearchstrategy.md) |  |
 |  [baseFormattersPublic](./kibana-plugin-plugins-data-public.baseformatterspublic.md) |  |
 |  [castEsToKbnFieldTypeName](./kibana-plugin-plugins-data-public.castestokbnfieldtypename.md) | Get the KbnFieldType name for an esType string |
 |  [connectToQueryState](./kibana-plugin-plugins-data-public.connecttoquerystate.md) | Helper to setup two-way syncing of global data and a state container |
 |  [createSavedQueryService](./kibana-plugin-plugins-data-public.createsavedqueryservice.md) |  |
-|  [defaultSearchStrategy](./kibana-plugin-plugins-data-public.defaultsearchstrategy.md) |  |
 |  [ES\_SEARCH\_STRATEGY](./kibana-plugin-plugins-data-public.es_search_strategy.md) |  |
 |  [esFilters](./kibana-plugin-plugins-data-public.esfilters.md) |  |
 |  [esKuery](./kibana-plugin-plugins-data-public.eskuery.md) |  |
 |  [esQuery](./kibana-plugin-plugins-data-public.esquery.md) |  |
-|  [esSearchStrategyProvider](./kibana-plugin-plugins-data-public.essearchstrategyprovider.md) |  |
 |  [fieldFormats](./kibana-plugin-plugins-data-public.fieldformats.md) |  |
 |  [FilterBar](./kibana-plugin-plugins-data-public.filterbar.md) |  |
 |  [getKbnTypeNames](./kibana-plugin-plugins-data-public.getkbntypenames.md) | Get the esTypes known by all kbnFieldTypes {<!-- -->Array<string>} |
-|  [hasSearchStategyForIndexPattern](./kibana-plugin-plugins-data-public.hassearchstategyforindexpattern.md) |  |
 |  [indexPatterns](./kibana-plugin-plugins-data-public.indexpatterns.md) |  |
 |  [QueryStringInput](./kibana-plugin-plugins-data-public.querystringinput.md) |  |
 |  [SearchBar](./kibana-plugin-plugins-data-public.searchbar.md) |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.description.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.description.md
deleted file mode 100644
index 859935480357c..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.description.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SavedQueryAttributes](./kibana-plugin-plugins-data-public.savedqueryattributes.md) &gt; [description](./kibana-plugin-plugins-data-public.savedqueryattributes.description.md)
-
-## SavedQueryAttributes.description property
-
-<b>Signature:</b>
-
-```typescript
-description: string;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.filters.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.filters.md
deleted file mode 100644
index c2c1ac681802b..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.filters.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SavedQueryAttributes](./kibana-plugin-plugins-data-public.savedqueryattributes.md) &gt; [filters](./kibana-plugin-plugins-data-public.savedqueryattributes.filters.md)
-
-## SavedQueryAttributes.filters property
-
-<b>Signature:</b>
-
-```typescript
-filters?: Filter[];
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.md
deleted file mode 100644
index 612be6a1dabc6..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SavedQueryAttributes](./kibana-plugin-plugins-data-public.savedqueryattributes.md)
-
-## SavedQueryAttributes interface
-
-<b>Signature:</b>
-
-```typescript
-export interface SavedQueryAttributes 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [description](./kibana-plugin-plugins-data-public.savedqueryattributes.description.md) | <code>string</code> |  |
-|  [filters](./kibana-plugin-plugins-data-public.savedqueryattributes.filters.md) | <code>Filter[]</code> |  |
-|  [query](./kibana-plugin-plugins-data-public.savedqueryattributes.query.md) | <code>Query</code> |  |
-|  [timefilter](./kibana-plugin-plugins-data-public.savedqueryattributes.timefilter.md) | <code>SavedQueryTimeFilter</code> |  |
-|  [title](./kibana-plugin-plugins-data-public.savedqueryattributes.title.md) | <code>string</code> |  |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.query.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.query.md
deleted file mode 100644
index 96673fc3a8fde..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.query.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SavedQueryAttributes](./kibana-plugin-plugins-data-public.savedqueryattributes.md) &gt; [query](./kibana-plugin-plugins-data-public.savedqueryattributes.query.md)
-
-## SavedQueryAttributes.query property
-
-<b>Signature:</b>
-
-```typescript
-query: Query;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.timefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.timefilter.md
deleted file mode 100644
index b4edb059a3dfd..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.timefilter.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SavedQueryAttributes](./kibana-plugin-plugins-data-public.savedqueryattributes.md) &gt; [timefilter](./kibana-plugin-plugins-data-public.savedqueryattributes.timefilter.md)
-
-## SavedQueryAttributes.timefilter property
-
-<b>Signature:</b>
-
-```typescript
-timefilter?: SavedQueryTimeFilter;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.title.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.title.md
deleted file mode 100644
index 99ae1b83e8834..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.savedqueryattributes.title.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SavedQueryAttributes](./kibana-plugin-plugins-data-public.savedqueryattributes.md) &gt; [title](./kibana-plugin-plugins-data-public.savedqueryattributes.title.md)
-
-## SavedQueryAttributes.title property
-
-<b>Signature:</b>
-
-```typescript
-title: string;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.history.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.history.md
deleted file mode 100644
index b2ef4a92c5fef..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.history.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [TimefilterSetup](./kibana-plugin-plugins-data-public.timefiltersetup.md) &gt; [history](./kibana-plugin-plugins-data-public.timefiltersetup.history.md)
-
-## TimefilterSetup.history property
-
-<b>Signature:</b>
-
-```typescript
-history: TimeHistoryContract;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.md
deleted file mode 100644
index 3375b415e923b..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.md
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [TimefilterSetup](./kibana-plugin-plugins-data-public.timefiltersetup.md)
-
-## TimefilterSetup interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface TimefilterSetup 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [history](./kibana-plugin-plugins-data-public.timefiltersetup.history.md) | <code>TimeHistoryContract</code> |  |
-|  [timefilter](./kibana-plugin-plugins-data-public.timefiltersetup.timefilter.md) | <code>TimefilterContract</code> |  |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.timefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.timefilter.md
deleted file mode 100644
index 897ace53a282d..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.timefiltersetup.timefilter.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [TimefilterSetup](./kibana-plugin-plugins-data-public.timefiltersetup.md) &gt; [timefilter](./kibana-plugin-plugins-data-public.timefiltersetup.timefilter.md)
-
-## TimefilterSetup.timefilter property
-
-<b>Signature:</b>
-
-```typescript
-timefilter: TimefilterContract;
-```
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index c41a4ef531443..48125254ff749 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -49,11 +49,6 @@ import { UiSettingsParams } from 'src/core/server/types';
 import { UnregisterCallback } from 'history';
 import { UserProvidedValues } from 'src/core/server/types';
 
-// Warning: (ae-missing-release-tag) "addSearchStrategy" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const addSearchStrategy: (searchStrategy: SearchStrategyProvider) => void;
-
 // Warning: (ae-forgotten-export) The symbol "DateFormat" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "baseFormattersPublic" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -153,11 +148,6 @@ export interface DataPublicPluginStart {
     };
 }
 
-// Warning: (ae-missing-release-tag) "defaultSearchStrategy" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const defaultSearchStrategy: SearchStrategyProvider;
-
 // @public (undocumented)
 export enum ES_FIELD_TYPES {
     // (undocumented)
@@ -313,11 +303,6 @@ export interface EsQueryConfig {
 // @public (undocumented)
 export type EsQuerySortValue = Record<string, SortDirection | SortDirectionNumeric>;
 
-// Warning: (ae-missing-release-tag) "esSearchStrategyProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_STRATEGY>;
-
 // Warning: (ae-missing-release-tag) "ExistsFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -488,11 +473,6 @@ export function getSearchErrorType({ message }: Pick<SearchError, 'message'>): "
 // @public (undocumented)
 export function getTime(indexPattern: IIndexPattern | undefined, timeRange: TimeRange, forceNow?: Date): import("../..").RangeFilter | undefined;
 
-// Warning: (ae-missing-release-tag) "hasSearchStategyForIndexPattern" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const hasSearchStategyForIndexPattern: (indexPattern: IndexPattern) => boolean;
-
 // Warning: (ae-missing-release-tag) "IDataPluginServices" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -517,6 +497,8 @@ export interface IDataPluginServices extends Partial<CoreStart_2> {
 //
 // @public (undocumented)
 export interface IEsSearchRequest extends IKibanaSearchRequest {
+    // (undocumented)
+    indexType?: string;
     // (undocumented)
     params: SearchParams;
 }
@@ -1227,28 +1209,14 @@ export interface RefreshInterval {
 //
 // @public (undocumented)
 export interface SavedQuery {
+    // Warning: (ae-forgotten-export) The symbol "SavedQueryAttributes" needs to be exported by the entry point index.d.ts
+    //
     // (undocumented)
     attributes: SavedQueryAttributes;
     // (undocumented)
     id: string;
 }
 
-// Warning: (ae-missing-release-tag) "SavedQueryAttributes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export interface SavedQueryAttributes {
-    // (undocumented)
-    description: string;
-    // (undocumented)
-    filters?: Filter[];
-    // (undocumented)
-    query: Query;
-    // (undocumented)
-    timefilter?: SavedQueryTimeFilter;
-    // (undocumented)
-    title: string;
-}
-
 // Warning: (ae-missing-release-tag) "SavedQueryService" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1484,14 +1452,6 @@ export const syncQueryStateWithUrl: (query: Pick<{
 // @public (undocumented)
 export type TimefilterContract = PublicMethodsOf<Timefilter>;
 
-// @public (undocumented)
-export interface TimefilterSetup {
-    // (undocumented)
-    history: TimeHistoryContract;
-    // (undocumented)
-    timefilter: TimefilterContract;
-}
-
 // Warning: (ae-missing-release-tag) "TimeHistory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)

From 73b73d848aa0e2ce43d5dc5612aba2d34223d0ea Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Wed, 11 Mar 2020 13:06:28 +0200
Subject: [PATCH 17/18] jest test

---
 src/plugins/data/public/search/search_source/search_source.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
index 79d96db388b5a..0c3321f03dabc 100644
--- a/src/plugins/data/public/search/search_source/search_source.ts
+++ b/src/plugins/data/public/search/search_source/search_source.ts
@@ -343,7 +343,7 @@ export class SearchSource {
     if (this.searchStrategyId) {
       return this.searchStrategyId === 'default' ? undefined : this.searchStrategyId;
     } else {
-      return index.type;
+      return index?.type;
     }
   }
 

From ca433142bc9bfad215b8c412dcb76062cba4ee5a Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Wed, 11 Mar 2020 15:53:49 +0200
Subject: [PATCH 18/18] jest snapshot

---
 .../transform_list.test.tsx.snap              | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap
index e7a5e027e6f8d..e2de4c0ea1f6c 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/transform_list.test.tsx.snap
@@ -1,28 +1,23 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Transform: Transform List <TransformList /> Minimal initialization 1`] = `
-<Fragment>
-  <ProgressBar
-    isLoading={false}
-  />
-  <EuiEmptyPrompt
-    actions={
-      Array [
-        <EuiButtonEmpty
-          data-test-subj="transformCreateFirstButton"
-          isDisabled={true}
-          onClick={[MockFunction]}
-        >
-          Create your first transform
-        </EuiButtonEmpty>,
-      ]
-    }
-    data-test-subj="transformNoTransformsFound"
-    title={
-      <h2>
-        No transforms found
-      </h2>
-    }
-  />
-</Fragment>
+<EuiEmptyPrompt
+  actions={
+    Array [
+      <EuiButtonEmpty
+        data-test-subj="transformCreateFirstButton"
+        isDisabled={true}
+        onClick={[MockFunction]}
+      >
+        Create your first transform
+      </EuiButtonEmpty>,
+    ]
+  }
+  data-test-subj="transformNoTransformsFound"
+  title={
+    <h2>
+      No transforms found
+    </h2>
+  }
+/>
 `;