[data / data views] Disable rollup functionality when rollup plugin is disabled

src/plugins/data/kibana.jsonc

@@ -28,7 +28,6 @@
     ],
     "optionalPlugins": [
       "usageCollection",
-      "taskManager",
       "security"
     ],
     "requiredBundles": [

src/plugins/data/server/plugin.ts

@@ -12,10 +12,6 @@ import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
-import type {
-  TaskManagerSetupContract,
-  TaskManagerStartContract,
-} from '@kbn/task-manager-plugin/server';
 import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { ConfigSchema } from '../config';
 import type { ISearchSetup, ISearchStart } from './search';
@@ -55,15 +51,13 @@ export interface DataPluginSetupDependencies {
   expressions: ExpressionsServerSetup;
   usageCollection?: UsageCollectionSetup;
   fieldFormats: FieldFormatsSetup;
-  taskManager?: TaskManagerSetupContract;
   security?: SecurityPluginSetup;
 }
 
 export interface DataPluginStartDependencies {
   fieldFormats: FieldFormatsStart;
   logger: Logger;
   dataViews: DataViewsServerPluginStart;
-  taskManager?: TaskManagerStartContract;
 }
 
 export class DataServerPlugin
@@ -90,14 +84,7 @@ export class DataServerPlugin
 
   public setup(
     core: CoreSetup<DataPluginStartDependencies, DataPluginStart>,
-    {
-      bfetch,
-      expressions,
-      usageCollection,
-      fieldFormats,
-      taskManager,
-      security,
-    }: DataPluginSetupDependencies
+    { bfetch, expressions, usageCollection, fieldFormats, security }: DataPluginSetupDependencies
   ) {
     this.scriptsService.setup(core);
     const querySetup = this.queryService.setup(core);
@@ -110,7 +97,6 @@ export class DataServerPlugin
       expressions,
       usageCollection,
       security,
-      taskManager,
     });
 
     return {
@@ -120,14 +106,10 @@ export class DataServerPlugin
     };
   }
 
-  public start(
-    core: CoreStart,
-    { fieldFormats, dataViews, taskManager }: DataPluginStartDependencies
-  ) {
+  public start(core: CoreStart, { fieldFormats, dataViews }: DataPluginStartDependencies) {
     const search = this.searchService.start(core, {
       fieldFormats,
       indexPatterns: dataViews,
-      taskManager,
     });
     const datatableUtilities = new DatatableUtilitiesService(
       search.aggs,

src/plugins/data/server/search/mocks.ts

@@ -17,6 +17,7 @@ export function createSearchSetupMock(): jest.Mocked<ISearchSetup> {
     aggs: searchAggsSetupMock(),
     registerSearchStrategy: jest.fn(),
     searchSource: searchSourceMock.createSetupContract(),
+    enableRollups: jest.fn(),
   };
 }
 

src/plugins/data/server/search/search_service.ts

@@ -25,10 +25,6 @@ import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
-import type {
-  TaskManagerSetupContract,
-  TaskManagerStartContract,
-} from '@kbn/task-manager-plugin/server';
 import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import type { DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import type {
@@ -107,15 +103,13 @@ export interface SearchServiceSetupDependencies {
   bfetch: BfetchServerSetup;
   expressions: ExpressionsServerSetup;
   usageCollection?: UsageCollectionSetup;
-  taskManager?: TaskManagerSetupContract;
   security?: SecurityPluginSetup;
 }
 
 /** @internal */
 export interface SearchServiceStartDependencies {
   fieldFormats: FieldFormatsStart;
   indexPatterns: DataViewsServerPluginStart;
-  taskManager?: TaskManagerStartContract;
 }
 
 /** @internal */
@@ -131,6 +125,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
   private sessionService: SearchSessionService;
   private asScoped!: ISearchStart['asScoped'];
   private searchAsInternalUser!: ISearchStrategy;
+  private rollupsEnabled: boolean = false;
 
   constructor(
     private initializerContext: PluginInitializerContext<ConfigSchema>,
@@ -145,7 +140,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
 
   public setup(
     core: CoreSetup<DataPluginStartDependencies, DataPluginStart>,
-    { bfetch, expressions, usageCollection, taskManager, security }: SearchServiceSetupDependencies
+    { bfetch, expressions, usageCollection, security }: SearchServiceSetupDependencies
   ): ISearchSetup {
     core.savedObjects.registerType(searchSessionSavedObjectType);
     const usage = usageCollection ? usageProvider(core) : undefined;
@@ -261,12 +256,13 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
       registerSearchStrategy: this.registerSearchStrategy,
       usage,
       searchSource: this.searchSourceService.setup(),
+      enableRollups: () => (this.rollupsEnabled = true),
     };
   }
 
   public start(
     core: CoreStart,
-    { fieldFormats, indexPatterns, taskManager }: SearchServiceStartDependencies
+    { fieldFormats, indexPatterns }: SearchServiceStartDependencies
   ): ISearchStart {
     const { elasticsearch, savedObjects, uiSettings } = core;
 
@@ -278,7 +274,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
       indexPatterns,
     });
 
-    this.asScoped = this.asScopedProvider(core);
+    this.asScoped = this.asScopedProvider(core, this.rollupsEnabled);
     return {
       aggs,
       searchAsInternalUser: this.searchAsInternalUser,
@@ -516,7 +512,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
     return deps.searchSessionsClient.extend(sessionId, expires);
   };
 
-  private asScopedProvider = (core: CoreStart) => {
+  private asScopedProvider = (core: CoreStart, rollupsEnabled: boolean = false) => {
     const { elasticsearch, savedObjects, uiSettings } = core;
     const getSessionAsScoped = this.sessionService.asScopedProvider(core);
     return (request: KibanaRequest): IScopedSearchClient => {
@@ -530,6 +526,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
           uiSettings.asScopedToClient(savedObjectsClient)
         ),
         request,
+        rollupsEnabled,
       };
       return {
         search: <

src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.test.ts

@@ -64,6 +64,7 @@ describe('ES search strategy', () => {
       },
     },
     searchSessionsClient: createSearchSessionsClientMock(),
+    rollupsEnabled: true,
   } as unknown as SearchStrategyDependencies;
   const mockLegacyConfig$ = new BehaviorSubject<any>({
     elasticsearch: {
@@ -233,6 +234,31 @@ describe('ES search strategy', () => {
         expect(method).toBe('POST');
         expect(path).toBe('/foo-%E7%A8%8B/_rollup_search');
       });
+
+      it("doesn't call the rollup API if the index is a rollup type BUT rollups are disabled", async () => {
+        mockApiCaller.mockResolvedValueOnce(mockRollupResponse);
+        mockSubmitCaller.mockResolvedValueOnce(mockAsyncResponse);
+
+        const params = { index: 'foo-程', body: { query: {} } };
+        const esSearch = await enhancedEsSearchStrategyProvider(
+          mockLegacyConfig$,
+          mockSearchConfig,
+          mockLogger
+        );
+
+        await esSearch
+          .search(
+            {
+              indexType: 'rollup',
+              params,
+            },
+            {},
+            { ...mockDeps, rollupsEnabled: false }
+          )
+          .toPromise();
+
+        expect(mockApiCaller).toBeCalledTimes(0);
+      });
     });
 
     describe('with sessionId', () => {

src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts

@@ -154,7 +154,7 @@ export const enhancedEsSearchStrategyProvider = (
         throw new KbnServerError('Unknown indexType', 400);
       }
 
-      if (request.indexType === undefined) {
+      if (request.indexType === undefined || !deps.rollupsEnabled) {
         return asyncSearch(request, options, deps);
       } else {
         return from(rollupSearch(request, options, deps));

src/plugins/data/server/search/types.ts

@@ -35,6 +35,7 @@ export interface SearchStrategyDependencies {
   uiSettingsClient: Pick<IUiSettingsClient, 'get'>;
   searchSessionsClient: IScopedSearchSessionsClient;
   request: KibanaRequest;
+  rollupsEnabled?: boolean;
 }
 
 export interface ISearchSetup {
@@ -55,7 +56,7 @@ export interface ISearchSetup {
    * Used internally for telemetry
    */
   usage?: SearchUsage;
-
+  enableRollups: () => void;
   searchSource: ReturnType<SearchSourceService['setup']>;
 }
 

src/plugins/data/tsconfig.json

@@ -25,7 +25,6 @@
     "@kbn/field-formats-plugin",
     "@kbn/data-views-plugin",
     "@kbn/screenshot-mode-plugin",
-    "@kbn/task-manager-plugin",
     "@kbn/security-plugin",
     "@kbn/expressions-plugin",
     "@kbn/field-types",

src/plugins/data_views/server/data_views_service_factory.ts

@@ -25,6 +25,7 @@ interface DataViewsServiceFactoryDeps {
   uiSettings: UiSettingsServiceStart;
   fieldFormats: FieldFormatsStart;
   capabilities: CoreStart['capabilities'];
+  rollupsEnabled: boolean;
 }
 
 /**
@@ -38,14 +39,18 @@ export const dataViewsServiceFactory = (deps: DataViewsServiceFactoryDeps) =>
     request?: KibanaRequest,
     byPassCapabilities?: boolean
   ) {
-    const { logger, uiSettings, fieldFormats, capabilities } = deps;
+    const { logger, uiSettings, fieldFormats, capabilities, rollupsEnabled } = deps;
     const uiSettingsClient = uiSettings.asScopedToClient(savedObjectsClient);
     const formats = await fieldFormats.fieldFormatServiceFactory(uiSettingsClient);
 
     return new DataViewsService({
       uiSettings: new UiSettingsServerToCommon(uiSettingsClient),
       savedObjectsClient: new SavedObjectsClientWrapper(savedObjectsClient),
-      apiClient: new IndexPatternsApiServer(elasticsearchClient, savedObjectsClient),
+      apiClient: new IndexPatternsApiServer(
+        elasticsearchClient,
+        savedObjectsClient,
+        rollupsEnabled
+      ),
       fieldFormats: formats,
       onError: (error) => {
         logger.error(error);

src/plugins/data_views/server/fetcher/index_patterns_fetcher.test.ts

@@ -10,6 +10,19 @@ import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { IndexPatternsFetcher } from '.';
 import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 
+const rollupResponse = {
+  foo: {
+    rollup_jobs: [
+      {
+        index_pattern: 'foo',
+        job_id: '123',
+        rollup_index: 'foo',
+        fields: [],
+      },
+    ],
+  },
+};
+
 describe('Index Pattern Fetcher - server', () => {
   let indexPatterns: IndexPatternsFetcher;
   let esClient: ReturnType<typeof elasticsearchServiceMock.createElasticsearchClient>;
@@ -21,12 +34,40 @@ describe('Index Pattern Fetcher - server', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     esClient = elasticsearchServiceMock.createElasticsearchClient();
-    indexPatterns = new IndexPatternsFetcher(esClient);
+    indexPatterns = new IndexPatternsFetcher(esClient, false, true);
   });
   it('calls fieldcaps once', async () => {
     esClient.fieldCaps.mockResponse(response as unknown as estypes.FieldCapsResponse);
-    indexPatterns = new IndexPatternsFetcher(esClient, true);
+    indexPatterns = new IndexPatternsFetcher(esClient, true, true);
     await indexPatterns.getFieldsForWildcard({ pattern: patternList });
     expect(esClient.fieldCaps).toHaveBeenCalledTimes(1);
   });
+
+  it('calls rollup api when given rollup data view', async () => {
+    esClient.fieldCaps.mockResponse(response as unknown as estypes.FieldCapsResponse);
+    esClient.rollup.getRollupIndexCaps.mockResponse(
+      rollupResponse as unknown as estypes.RollupGetRollupIndexCapsResponse
+    );
+    indexPatterns = new IndexPatternsFetcher(esClient, true, true);
+    await indexPatterns.getFieldsForWildcard({
+      pattern: patternList,
+      type: 'rollup',
+      rollupIndex: 'foo',
+    });
+    expect(esClient.rollup.getRollupIndexCaps).toHaveBeenCalledTimes(1);
+  });
+
+  it("doesn't call rollup api when given rollup data view and rollups are disabled", async () => {
+    esClient.fieldCaps.mockResponse(response as unknown as estypes.FieldCapsResponse);
+    esClient.rollup.getRollupIndexCaps.mockResponse(
+      rollupResponse as unknown as estypes.RollupGetRollupIndexCapsResponse
+    );
+    indexPatterns = new IndexPatternsFetcher(esClient, true, false);
+    await indexPatterns.getFieldsForWildcard({
+      pattern: patternList,
+      type: 'rollup',
+      rollupIndex: 'foo',
+    });
+    expect(esClient.rollup.getRollupIndexCaps).toHaveBeenCalledTimes(0);
+  });
 });

src/plugins/data_views/server/fetcher/index_patterns_fetcher.ts

@@ -40,10 +40,16 @@ interface FieldSubType {
 export class IndexPatternsFetcher {
   private elasticsearchClient: ElasticsearchClient;
   private allowNoIndices: boolean;
+  private rollupsEnabled: boolean;
 
-  constructor(elasticsearchClient: ElasticsearchClient, allowNoIndices: boolean = false) {
+  constructor(
+    elasticsearchClient: ElasticsearchClient,
+    allowNoIndices: boolean = false,
+    rollupsEnabled: boolean = false
+  ) {
     this.elasticsearchClient = elasticsearchClient;
     this.allowNoIndices = allowNoIndices;
+    this.rollupsEnabled = rollupsEnabled;
   }
 
   /**
@@ -81,7 +87,7 @@ export class IndexPatternsFetcher {
       fields: options.fields || ['*'],
     });
 
-    if (type === 'rollup' && rollupIndex) {
+    if (this.rollupsEnabled && type === 'rollup' && rollupIndex) {
       const rollupFields: FieldDescriptor[] = [];
       const capabilityCheck = getCapabilitiesForRollupIndices(
         await this.elasticsearchClient.rollup.getRollupIndexCaps({

src/plugins/data_views/server/index.ts

@@ -10,6 +10,7 @@ export { getFieldByName, findIndexPatternById } from './utils';
 export type { FieldDescriptor, RollupIndexCapability } from './fetcher';
 export { IndexPatternsFetcher, getCapabilitiesForRollupIndices } from './fetcher';
 export type {
+  DataViewsServerPluginSetup,
   DataViewsServerPluginStart,
   DataViewsServerPluginSetupDependencies,
   DataViewsServerPluginStartDependencies,

src/plugins/data_views/server/index_patterns_api_client.ts

@@ -16,7 +16,8 @@ export class IndexPatternsApiServer implements IDataViewsApiClient {
   esClient: ElasticsearchClient;
   constructor(
     elasticsearchClient: ElasticsearchClient,
-    private readonly savedObjectsClient: SavedObjectsClientContract
+    private readonly savedObjectsClient: SavedObjectsClientContract,
+    private readonly rollupsEnabled: boolean
   ) {
     this.esClient = elasticsearchClient;
   }
@@ -29,7 +30,11 @@ export class IndexPatternsApiServer implements IDataViewsApiClient {
     indexFilter,
     fields,
   }: GetFieldsOptions) {
-    const indexPatterns = new IndexPatternsFetcher(this.esClient, allowNoIndex);
+    const indexPatterns = new IndexPatternsFetcher(
+      this.esClient,
+      allowNoIndex,
+      this.rollupsEnabled
+    );
     return await indexPatterns
       .getFieldsForWildcard({
         pattern,