[Index Patterns] Move rollup config to index pattern management (#102145)

* move rollup config to index pattern management
2021-06-15 05:12:43 -05:00 · 2021-06-15 05:12:43 -05:00 · f1b6fe04ed
parent 2ef66c139a
commit f1b6fe04ed
15 changed files with 80 additions and 73 deletions
--- a/src/plugins/index_pattern_management/public/constants.ts
+++ b/src/plugins/index_pattern_management/public/constants.ts
@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export const CONFIG_ROLLUPS = 'rollups:enableIndexPatterns';
--- a/src/plugins/index_pattern_management/public/mocks.ts
+++ b/src/plugins/index_pattern_management/public/mocks.ts
@ -19,14 +19,7 @@ import {
 } from './plugin';
 import { IndexPatternManagmentContext } from './types';

-const createSetupContract = (): IndexPatternManagementSetup => ({
-  creation: {
-    addCreationConfig: jest.fn(),
-  } as any,
-  list: {
-    addListConfig: jest.fn(),
-  } as any,
-});
+const createSetupContract = (): IndexPatternManagementSetup => {};

 const createStartContract = (): IndexPatternManagementStart => ({
  creation: {
--- a/src/plugins/index_pattern_management/public/plugin.ts
+++ b/src/plugins/index_pattern_management/public/plugin.ts
@ -81,7 +81,10 @@ export class IndexPatternManagementPlugin
      },
    });

-    return this.indexPatternManagementService.setup({ httpClient: core.http });
+    return this.indexPatternManagementService.setup({
+      httpClient: core.http,
+      uiSettings: core.uiSettings,
+    });
  }

  public start(core: CoreStart, plugins: IndexPatternManagementStartDependencies) {
--- a/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts
+++ b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts
@ -1,8 +1,9 @@
 /*
 * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
 */

 export { RollupPrompt } from './rollup_prompt';
--- a/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx
+++ b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx
@ -1,8 +1,9 @@
 /*
 * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
 */

 import React from 'react';
@ -14,7 +15,7 @@ export const RollupPrompt = () => (
  <EuiCallOut color="warning" iconType="help" title="Beta feature">
    <p>
      {i18n.translate(
-        'xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text',
+        'indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text',
        {
          defaultMessage:
            "Kibana's support for rollup index patterns is in beta. You might encounter issues using " +
@ -25,7 +26,7 @@ export const RollupPrompt = () => (
    </p>
    <p>
      {i18n.translate(
-        'xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text',
+        'indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text',
        {
          defaultMessage:
            'You can match a rollup index pattern against one rollup index and zero or more regular ' +
--- a/src/plugins/index_pattern_management/public/service/creation/index.ts
+++ b/src/plugins/index_pattern_management/public/service/creation/index.ts
@ -8,3 +8,5 @@

 export { IndexPatternCreationConfig, IndexPatternCreationOption } from './config';
 export { IndexPatternCreationManager } from './manager';
+// @ts-ignore
+export { RollupIndexPatternCreationConfig } from './rollup_creation_config';
--- a/x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js
+++ b/x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js
@ -1,43 +1,44 @@
 /*
 * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
 */

 import React from 'react';
 import { i18n } from '@kbn/i18n';

 import { RollupPrompt } from './components/rollup_prompt';
-import { IndexPatternCreationConfig } from '../../../../../src/plugins/index_pattern_management/public';
+import { IndexPatternCreationConfig } from '.';

 const rollupIndexPatternTypeName = i18n.translate(
-  'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName',
+  'indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName',
  { defaultMessage: 'rollup index pattern' }
 );

 const rollupIndexPatternButtonText = i18n.translate(
-  'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonText',
+  'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText',
  { defaultMessage: 'Rollup index pattern' }
 );

 const rollupIndexPatternButtonDescription = i18n.translate(
-  'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonDescription',
+  'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription',
  { defaultMessage: 'Perform limited aggregations against summarized data' }
 );

 const rollupIndexPatternNoMatchError = i18n.translate(
-  'xpack.rollupJobs.editRollupIndexPattern.createIndex.noMatchError',
+  'indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError',
  { defaultMessage: 'Rollup index pattern error: must match one rollup index' }
 );

 const rollupIndexPatternTooManyMatchesError = i18n.translate(
-  'xpack.rollupJobs.editRollupIndexPattern.createIndex.tooManyMatchesError',
+  'indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError',
  { defaultMessage: 'Rollup index pattern error: can only match one rollup index' }
 );

 const rollupIndexPatternIndexLabel = i18n.translate(
-  'xpack.rollupJobs.editRollupIndexPattern.createIndex.indexLabel',
+  'indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel',
  { defaultMessage: 'Rollup' }
 );

@ -127,7 +128,7 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig

    if (error) {
      const errorMessage = i18n.translate(
-        'xpack.rollupJobs.editRollupIndexPattern.createIndex.uncaughtError',
+        'indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError',
        {
          defaultMessage: 'Rollup index pattern error: {error}',
          values: {
--- a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts
+++ b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts
@ -6,11 +6,22 @@
 * Side Public License, v 1.
 */

-import { HttpSetup } from '../../../../core/public';
-import { IndexPatternCreationManager, IndexPatternCreationConfig } from './creation';
-import { IndexPatternListManager, IndexPatternListConfig } from './list';
+import { HttpSetup, CoreSetup } from '../../../../core/public';
+import {
+  IndexPatternCreationManager,
+  IndexPatternCreationConfig,
+  RollupIndexPatternCreationConfig,
+} from './creation';
+import {
+  IndexPatternListManager,
+  IndexPatternListConfig,
+  RollupIndexPatternListConfig,
+} from './list';
+
+import { CONFIG_ROLLUPS } from '../constants';
 interface SetupDependencies {
  httpClient: HttpSetup;
+  uiSettings: CoreSetup['uiSettings'];
 }

 /**
@ -27,17 +38,17 @@ export class IndexPatternManagementService {
    this.indexPatternListConfig = new IndexPatternListManager();
  }

-  public setup({ httpClient }: SetupDependencies) {
+  public setup({ httpClient, uiSettings }: SetupDependencies) {
    const creationManagerSetup = this.indexPatternCreationManager.setup(httpClient);
    creationManagerSetup.addCreationConfig(IndexPatternCreationConfig);

    const indexPatternListConfigSetup = this.indexPatternListConfig.setup();
    indexPatternListConfigSetup.addListConfig(IndexPatternListConfig);

-    return {
-      creation: creationManagerSetup,
-      list: indexPatternListConfigSetup,
-    };
+    if (uiSettings.get(CONFIG_ROLLUPS)) {
+      creationManagerSetup.addCreationConfig(RollupIndexPatternCreationConfig);
+      indexPatternListConfigSetup.addListConfig(RollupIndexPatternListConfig);
+    }
  }

  public start() {
--- a/src/plugins/index_pattern_management/public/service/list/index.ts
+++ b/src/plugins/index_pattern_management/public/service/list/index.ts
@ -8,3 +8,5 @@

 export { IndexPatternListConfig } from './config';
 export { IndexPatternListManager } from './manager';
+// @ts-ignore
+export { RollupIndexPatternListConfig } from './rollup_list_config';
--- a/x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js
+++ b/x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js
@ -1,11 +1,12 @@
 /*
 * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
 */

-import { IndexPatternListConfig } from '../../../../../src/plugins/index_pattern_management/public';
+import { IndexPatternListConfig } from '.';

 function isRollup(indexPattern) {
  return (
--- a/x-pack/plugins/rollup/kibana.json
+++ b/x-pack/plugins/rollup/kibana.json
@ -5,7 +5,6 @@
  "server": true,
  "ui": true,
  "requiredPlugins": [
-    "indexPatternManagement",
    "management",
    "licensing",
    "features"
--- a/x-pack/plugins/rollup/public/plugin.ts
+++ b/x-pack/plugins/rollup/public/plugin.ts
@ -12,14 +12,13 @@ import { rollupBadgeExtension, rollupToggleExtension } from './extend_index_mana
 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 { CONFIG_ROLLUPS, UIM_APP_NAME } from '../common';
+import { UIM_APP_NAME } from '../common';
 import {
  FeatureCatalogueCategory,
  HomePublicPluginSetup,
 } from '../../../../src/plugins/home/public';
 import { ManagementSetup } from '../../../../src/plugins/management/public';
 import { IndexManagementPluginSetup } from '../../index_management/public';
-import { IndexPatternManagementSetup } from '../../../../src/plugins/index_pattern_management/public';
 // @ts-ignore
 import { setHttp, init as initDocumentation } from './crud_app/services/index';
 import { setNotifications, setFatalErrors, setUiStatsReporter } from './kibana_services';
@ -29,20 +28,13 @@ export interface RollupPluginSetupDependencies {
  home?: HomePublicPluginSetup;
  management: ManagementSetup;
  indexManagement?: IndexManagementPluginSetup;
-  indexPatternManagement: IndexPatternManagementSetup;
  usageCollection?: UsageCollectionSetup;
 }

 export class RollupPlugin implements Plugin {
  setup(
    core: CoreSetup,
-    {
-      home,
-      management,
-      indexManagement,
-      indexPatternManagement,
-      usageCollection,
-    }: RollupPluginSetupDependencies
+    { home, management, indexManagement, usageCollection }: RollupPluginSetupDependencies
  ) {
    setFatalErrors(core.fatalErrors);
    if (usageCollection) {
@ -54,13 +46,6 @@ export class RollupPlugin implements Plugin {
      indexManagement.extensionsService.addToggle(rollupToggleExtension);
    }

-    const isRollupIndexPatternsEnabled = core.uiSettings.get(CONFIG_ROLLUPS);
-
-    if (isRollupIndexPatternsEnabled) {
-      indexPatternManagement.creation.addCreationConfig(RollupIndexPatternCreationConfig);
-      indexPatternManagement.list.addListConfig(RollupIndexPatternListConfig);
-    }
-
    if (home) {
      home.featureCatalogue.register({
        id: 'rollup_jobs',
--- a/x-pack/plugins/rollup/tsconfig.json
+++ b/x-pack/plugins/rollup/tsconfig.json
@ -16,7 +16,6 @@
  "references": [
    { "path": "../../../src/core/tsconfig.json" },
    // required plugins
-    { "path": "../../../src/plugins/index_pattern_management/tsconfig.json" },
    { "path": "../../../src/plugins/management/tsconfig.json" },
    { "path": "../licensing/tsconfig.json" },
    { "path": "../features/tsconfig.json" },
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@ -18030,15 +18030,15 @@
    "xpack.rollupJobs.detailPanel.jobActionMenu.buttonLabel": "管理",
    "xpack.rollupJobs.detailPanel.loadingLabel": "ロールアップジョブを読み込み中...",
    "xpack.rollupJobs.detailPanel.notFoundLabel": "ロールアップジョブが見つかりません",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonDescription": "要約データに制限された集約を実行します。",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonText": "ロールアップインデックスパターン",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName": "ロールアップインデックスパターン",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.indexLabel": "ロールアップ",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.noMatchError": "ロールアップインデックスパターンエラー：ロールアップインデックスの 1 つと一致している必要があります",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.tooManyMatchesError": "ロールアップインデックスパターンエラー：一致できるロールアップインデックスは 1 つだけです",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.uncaughtError": "ロールアップインデックスパターンエラー：{error}",
-    "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "ロールアップインデックスパターンのKibanaのサポートはベータ版です。保存された検索、可視化、ダッシュボードでこれらのパターンを使用すると問題が発生する場合があります。Timelionや機械学習などの一部の高度な機能ではサポートされていません。",
-    "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "ロールアップインデックスパターンは、1つのロールアップインデックスとゼロ以上の標準インデックスと一致させることができます。ロールアップインデックスパターンでは、メトリック、フィールド、間隔、アグリゲーションが制限されています。ロールアップインデックスは、1つのジョブ構成があるインデックス、または複数のジョブと互換する構成があるインデックスに制限されています。",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription": "要約データに制限された集約を実行します。",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText": "ロールアップインデックスパターン",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName": "ロールアップインデックスパターン",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel": "ロールアップ",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError": "ロールアップインデックスパターンエラー：ロールアップインデックスの 1 つと一致している必要があります",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError": "ロールアップインデックスパターンエラー：一致できるロールアップインデックスは 1 つだけです",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError": "ロールアップインデックスパターンエラー：{error}",
+    "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "ロールアップインデックスパターンのKibanaのサポートはベータ版です。保存された検索、可視化、ダッシュボードでこれらのパターンを使用すると問題が発生する場合があります。Timelionや機械学習などの一部の高度な機能ではサポートされていません。",
+    "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "ロールアップインデックスパターンは、1つのロールアップインデックスとゼロ以上の標準インデックスと一致させることができます。ロールアップインデックスパターンでは、メトリック、フィールド、間隔、アグリゲーションが制限されています。ロールアップインデックスは、1つのジョブ構成があるインデックス、または複数のジョブと互換する構成があるインデックスに制限されています。",
    "xpack.rollupJobs.featureCatalogueDescription": "今後の分析用に履歴データを小さなインデックスに要約して格納します。",
    "xpack.rollupJobs.indexMgmtBadge.rollupLabel": "ロールアップ",
    "xpack.rollupJobs.indexMgmtToggle.toggleLabel": "ロールアップインデックスを含める",
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@ -18270,15 +18270,15 @@
    "xpack.rollupJobs.detailPanel.jobActionMenu.buttonLabel": "管理",
    "xpack.rollupJobs.detailPanel.loadingLabel": "正在加载汇总/打包作业……",
    "xpack.rollupJobs.detailPanel.notFoundLabel": "未找到汇总/打包作业",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonDescription": "针对汇总数据执行有限聚合",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonText": "汇总/打包索引模式",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName": "汇总/打包索引模式",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.indexLabel": "汇总/打包",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.noMatchError": "汇总/打包索引模式错误：必须匹配一个汇总/打包索引",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.tooManyMatchesError": "汇总/打包索引模式错误：只能匹配一个汇总/打包索引",
-    "xpack.rollupJobs.editRollupIndexPattern.createIndex.uncaughtError": "汇总索引模式错误：{error}",
-    "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "Kibana 对汇总/打包索引模式的支持处于公测版状态。将这些模式用于已保存搜索、可视化以及仪表板可能会遇到问题。某些高级功能，如 Timelion 和 Machine Learning，不支持这些模式。",
-    "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "可以根据一个汇总/打包索引和零个或更多常规索引匹配汇总/打包索引模式。汇总/打包索引模式的指标、字段、时间间隔和聚合有限。汇总/打包索引仅限于具有一个作业配置或多个作业配置兼容的索引。",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription": "针对汇总数据执行有限聚合",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText": "汇总/打包索引模式",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName": "汇总/打包索引模式",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel": "汇总/打包",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError": "汇总/打包索引模式错误：必须匹配一个汇总/打包索引",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError": "汇总/打包索引模式错误：只能匹配一个汇总/打包索引",
+    "indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError": "汇总索引模式错误：{error}",
+    "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "Kibana 对汇总/打包索引模式的支持处于公测版状态。将这些模式用于已保存搜索、可视化以及仪表板可能会遇到问题。某些高级功能，如 Timelion 和 Machine Learning，不支持这些模式。",
+    "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "可以根据一个汇总/打包索引和零个或更多常规索引匹配汇总/打包索引模式。汇总/打包索引模式的指标、字段、时间间隔和聚合有限。汇总/打包索引仅限于具有一个作业配置或多个作业配置兼容的索引。",
    "xpack.rollupJobs.featureCatalogueDescription": "汇总历史数据并将其存储在较小的索引中以供将来分析。",
    "xpack.rollupJobs.indexMgmtBadge.rollupLabel": "汇总/打包",
    "xpack.rollupJobs.indexMgmtToggle.toggleLabel": "包括汇总索引",