Revert "Add essql search strategy and integrate in canvas (#94754)"

This reverts commit 2628cea.
elastic · Apr 29, 2021 · 0f15a12 · 0f15a12
1 parent 613267f
commit 0f15a12
Show file tree

Hide file tree

Showing 33 changed files with 18 additions and 603 deletions.
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -440,8 +440,4 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
   },
-  'labs:canvas:useDataService': {
-    type: 'boolean',
-    _meta: { description: 'Non-default value of setting.' },
-  },
 };
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
@@ -119,6 +119,5 @@ export interface UsageStats {
   'banners:textColor': string;
   'banners:backgroundColor': string;
   'labs:canvas:enable_ui': boolean;
-  'labs:canvas:useDataService': boolean;
   'labs:presentation:timeToPresent': boolean;
 }
diff --git a/src/plugins/presentation_util/common/labs.ts b/src/plugins/presentation_util/common/labs.ts
@@ -8,10 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const USE_DATA_SERVICE = 'labs:canvas:useDataService';
 export const TIME_TO_PRESENT = 'labs:presentation:timeToPresent';
 
-export const projectIDs = [TIME_TO_PRESENT, USE_DATA_SERVICE] as const;
+export const projectIDs = [TIME_TO_PRESENT] as const;
 export const environmentNames = ['kibana', 'browser', 'session'] as const;
 export const solutionNames = ['canvas', 'dashboard', 'presentation'] as const;
 
@@ -33,22 +32,6 @@ export const projects: { [ID in ProjectID]: ProjectConfig & { id: ID } } = {
     }),
     solutions: ['canvas'],
   },
-  [USE_DATA_SERVICE]: {
-    id: USE_DATA_SERVICE,
-    isActive: true,
-    isDisplayed: true,
-    environments: ['kibana', 'browser', 'session'],
-    name: i18n.translate('presentationUtil.experiments.enableUseDataServiceExperimentName', {
-      defaultMessage: 'Use data service',
-    }),
-    description: i18n.translate(
-      'presentationUtil.experiments.enableUseDataServiceExperimentDescription',
-      {
-        defaultMessage: 'An experiment of using the new data.search service for Canvas datasources',
-      }
-    ),
-    solutions: ['canvas'],
-  },
 };
 
 export type ProjectID = typeof projectIDs[number];

diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
@@ -8342,12 +8342,6 @@
           "_meta": {
             "description": "Non-default value of setting."
           }
-        },
-        "labs:canvas:useDataService": {
-          "type": "boolean",
-          "_meta": {
-            "description": "Non-default value of setting."
-          }
         }
       }
     },

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/escount.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/esdocs.ts