[7.x] ES UI new platform cleanup (#64332) (#64706)

2025-04-24 17:59:23 -04:00 · 2020-04-29 12:46:42 -07:00 · 2020-04-29 12:46:42 -07:00 · 61822d8327
commit 61822d8327
parent 1717736b54
15 changed files with 162 additions and 162 deletions
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
@ -19,5 +19,6 @@ export interface SavedObjectsCoreFieldMapping
 |  [enabled](./kibana-plugin-core-server.savedobjectscorefieldmapping.enabled.md) | <code>boolean</code> |  |
 |  [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code>        [subfield: string]: {</code><br/><code>            type: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
 |  [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md) | <code>boolean</code> |  |
+|  [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md) | <code>number &#124; boolean &#124; string</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md) | <code>string</code> |  |

--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md
@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) &gt; [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md)
+
+## SavedObjectsCoreFieldMapping.null\_value property
+
+<b>Signature:</b>
+
+```typescript
+null_value?: number | boolean | string;
+```
--- a/src/core/server/saved_objects/mappings/types.ts
+++ b/src/core/server/saved_objects/mappings/types.ts
@ -131,6 +131,7 @@ export interface IndexMappingMeta {
 */
 export interface SavedObjectsCoreFieldMapping {
  type: string;
+  null_value?: number | boolean | string;
  index?: boolean;
  enabled?: boolean;
  fields?: {
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@ -1840,6 +1840,8 @@ export interface SavedObjectsCoreFieldMapping {
    // (undocumented)
    index?: boolean;
    // (undocumented)
+    null_value?: number | boolean | string;
+    // (undocumented)
    type: string;
 }

--- a/x-pack/index.js
+++ b/x-pack/index.js
@ -12,13 +12,10 @@ import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
 import { apm } from './legacy/plugins/apm';
 import { maps } from './legacy/plugins/maps';
-import { indexManagement } from './legacy/plugins/index_management';
 import { spaces } from './legacy/plugins/spaces';
 import { canvas } from './legacy/plugins/canvas';
 import { infra } from './legacy/plugins/infra';
 import { taskManager } from './legacy/plugins/task_manager';
-import { remoteClusters } from './legacy/plugins/remote_clusters';
-import { upgradeAssistant } from './legacy/plugins/upgrade_assistant';
 import { uptime } from './legacy/plugins/uptime';
 import { encryptedSavedObjects } from './legacy/plugins/encrypted_saved_objects';
 import { actions } from './legacy/plugins/actions';
@ -38,11 +35,8 @@ module.exports = function(kibana) {
    apm(kibana),
    maps(kibana),
    canvas(kibana),
-    indexManagement(kibana),
    infra(kibana),
    taskManager(kibana),
-    remoteClusters(kibana),
-    upgradeAssistant(kibana),
    uptime(kibana),
    encryptedSavedObjects(kibana),
    actions(kibana),
--- a/x-pack/legacy/plugins/index_management/index.ts
+++ b/x-pack/legacy/plugins/index_management/index.ts
@ -1,13 +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.
- */
-
-// TODO: Remove this once CCR is migrated to the plugins directory.
-export function indexManagement(kibana: any) {
-  return new kibana.Plugin({
-    id: 'index_management',
-    configPrefix: 'xpack.index_management',
-  });
-}
--- a/x-pack/legacy/plugins/remote_clusters/index.ts
+++ b/x-pack/legacy/plugins/remote_clusters/index.ts
@ -1,40 +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 { resolve } from 'path';
-import { Legacy } from 'kibana';
-
-import { PLUGIN } from './common';
-
-export function remoteClusters(kibana: any) {
-  return new kibana.Plugin({
-    id: PLUGIN.ID,
-    configPrefix: 'xpack.remote_clusters',
-    publicDir: resolve(__dirname, 'public'),
-    require: ['kibana'],
-    uiExports: {
-      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-    },
-    // TODO: Remove once CCR has migrated to NP
-    config(Joi: any) {
-      return Joi.object({
-        // display menu item
-        ui: Joi.object({
-          enabled: Joi.boolean().default(true),
-        }).default(),
-
-        // enable plugin
-        enabled: Joi.boolean().default(true),
-      }).default();
-    },
-    isEnabled(config: Legacy.KibanaConfig) {
-      return (
-        config.get('xpack.remote_clusters.enabled') && config.get('xpack.index_management.enabled')
-      );
-    },
-    init() {},
-  });
-}
--- a/x-pack/legacy/plugins/upgrade_assistant/index.ts
+++ b/x-pack/legacy/plugins/upgrade_assistant/index.ts
@ -1,28 +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 { Legacy } from 'kibana';
-import mappings from './mappings.json';
-
-export function upgradeAssistant(kibana: any) {
-  const config: Legacy.PluginSpecOptions = {
-    id: 'upgrade_assistant',
-    uiExports: {
-      // @ts-ignore
-      savedObjectSchemas: {
-        'upgrade-assistant-reindex-operation': {
-          isNamespaceAgnostic: true,
-        },
-        'upgrade-assistant-telemetry': {
-          isNamespaceAgnostic: true,
-        },
-      },
-      mappings,
-    },
-
-    init() {},
-  };
-  return new kibana.Plugin(config);
-}
--- a/x-pack/legacy/plugins/upgrade_assistant/mappings.json
+++ b/x-pack/legacy/plugins/upgrade_assistant/mappings.json
@ -1,65 +0,0 @@
-{
-  "upgrade-assistant-reindex-operation": {
-    "dynamic": true,
-    "properties": {
-      "indexName": {
-        "type": "keyword"
-      },
-      "status": {
-        "type": "integer"
-      }
-    }
-  },
-  "upgrade-assistant-telemetry": {
-    "properties": {
-      "ui_open": {
-        "properties": {
-          "overview": {
-            "type": "long",
-            "null_value": 0
-          },
-          "cluster": {
-            "type": "long",
-            "null_value": 0
-          },
-          "indices": {
-            "type": "long",
-            "null_value": 0
-          }
-        }
-      },
-      "ui_reindex": {
-        "properties": {
-          "close": {
-            "type": "long",
-            "null_value": 0
-          },
-          "open": {
-            "type": "long",
-            "null_value": 0
-          },
-          "start": {
-            "type": "long",
-            "null_value": 0
-          },
-          "stop": {
-            "type": "long",
-            "null_value": 0
-          }
-        }
-      },
-      "features": {
-        "properties": {
-          "deprecation_logging": {
-            "properties": {
-              "enabled": {
-                "type": "boolean",
-                "null_value": true
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
--- a/x-pack/plugins/remote_clusters/public/application/_hacks.scss
+++ b/x-pack/plugins/remote_clusters/public/application/_hacks.scss
@ -1,7 +1,4 @@
-// Import the EUI global scope so we can use EUI constants
-@import 'src/legacy/ui/public/styles/_styling_constants';
-
-// Remote clusters plugin styles
+// Remote clusters plugin hacks

 // Prefix all styles with "remoteClusters" to avoid conflicts.
 // Examples
--- a/x-pack/plugins/remote_clusters/public/application/index.js
+++ b/x-pack/plugins/remote_clusters/public/application/index.js
@ -13,6 +13,8 @@ import { App } from './app';
 import { remoteClustersStore } from './store';
 import { AppContextProvider } from './app_context';

+import './_hacks.scss';
+
 export const renderApp = (elem, I18nContext, appDependencies) => {
  render(
    <I18nContext>
--- a/x-pack/plugins/upgrade_assistant/server/plugin.ts
+++ b/x-pack/plugins/upgrade_assistant/server/plugin.ts
@ -31,6 +31,8 @@ import { registerDeprecationLoggingRoutes } from './routes/deprecation_logging';
 import { registerQueryDefaultFieldRoutes } from './routes/query_default_field';
 import { registerReindexIndicesRoutes, createReindexWorker } from './routes/reindex_indices';
 import { registerTelemetryRoutes } from './routes/telemetry';
+import { telemetrySavedObjectType, reindexOperationSavedObjectType } from './saved_object_types';
+
 import { RouteDependencies } from './types';

 interface PluginsSetup {
@ -65,12 +67,15 @@ export class UpgradeAssistantServerPlugin implements Plugin {
  }

  setup(
-    { http, getStartServices, capabilities }: CoreSetup,
+    { http, getStartServices, capabilities, savedObjects }: CoreSetup,
    { usageCollection, cloud, licensing, apm_oss: apmOSS }: PluginsSetup
  ) {
    this.licensing = licensing;
    this.apmOSS = apmOSS;

+    savedObjects.registerType(reindexOperationSavedObjectType);
+    savedObjects.registerType(telemetrySavedObjectType);
+
    const router = http.createRouter();

    const dependencies: RouteDependencies = {
@ -96,8 +101,12 @@ export class UpgradeAssistantServerPlugin implements Plugin {
    registerQueryDefaultFieldRoutes(dependencies);

    if (usageCollection) {
-      getStartServices().then(([{ savedObjects, elasticsearch }]) => {
-        registerUpgradeAssistantUsageCollector({ elasticsearch, usageCollection, savedObjects });
+      getStartServices().then(([{ savedObjects: savedObjectsService, elasticsearch }]) => {
+        registerUpgradeAssistantUsageCollector({
+          elasticsearch,
+          usageCollection,
+          savedObjects: savedObjectsService,
+        });
      });
    }
  }
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/index.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/index.ts
@ -4,6 +4,5 @@
 * you may not use this file except in compliance with the Elastic License.
 */

-export const PLUGIN = {
-  ID: 'remoteClusters',
-};
+export { reindexOperationSavedObjectType } from './reindex_operation_saved_object_type';
+export { telemetrySavedObjectType } from './telemetry_saved_object_type';
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
@ -0,0 +1,63 @@
+/*
+ * 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 { SavedObjectsType } from 'src/core/server';
+
+import { REINDEX_OP_TYPE } from '../../common/types';
+
+export const reindexOperationSavedObjectType: SavedObjectsType = {
+  name: REINDEX_OP_TYPE,
+  hidden: false,
+  namespaceType: 'agnostic',
+  mappings: {
+    properties: {
+      reindexTaskId: {
+        type: 'keyword',
+      },
+      indexName: {
+        type: 'keyword',
+      },
+      newIndexName: {
+        type: 'keyword',
+      },
+      status: {
+        type: 'integer',
+      },
+      locked: {
+        type: 'date',
+      },
+      lastCompletedStep: {
+        type: 'integer',
+      },
+      errorMessage: {
+        type: 'keyword',
+      },
+      reindexTaskPercComplete: {
+        type: 'float',
+      },
+      runningReindexCount: {
+        type: 'integer',
+      },
+      reindexOptions: {
+        properties: {
+          openAndClose: {
+            type: 'boolean',
+          },
+          queueSettings: {
+            properties: {
+              queuedAt: {
+                type: 'long',
+              },
+              startedAt: {
+                type: 'long',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
@ -0,0 +1,67 @@
+/*
+ * 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 { SavedObjectsType } from 'src/core/server';
+
+import { UPGRADE_ASSISTANT_TYPE } from '../../common/types';
+
+export const telemetrySavedObjectType: SavedObjectsType = {
+  name: UPGRADE_ASSISTANT_TYPE,
+  hidden: false,
+  namespaceType: 'agnostic',
+  mappings: {
+    properties: {
+      ui_open: {
+        properties: {
+          overview: {
+            type: 'long',
+            null_value: 0,
+          },
+          cluster: {
+            type: 'long',
+            null_value: 0,
+          },
+          indices: {
+            type: 'long',
+            null_value: 0,
+          },
+        },
+      },
+      ui_reindex: {
+        properties: {
+          close: {
+            type: 'long',
+            null_value: 0,
+          },
+          open: {
+            type: 'long',
+            null_value: 0,
+          },
+          start: {
+            type: 'long',
+            null_value: 0,
+          },
+          stop: {
+            type: 'long',
+            null_value: 0,
+          },
+        },
+      },
+      features: {
+        properties: {
+          deprecation_logging: {
+            properties: {
+              enabled: {
+                type: 'boolean',
+                null_value: true,
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};