Skip to content

Commit

Permalink
ES UI new platform cleanup (#64332)
Browse files Browse the repository at this point in the history
  • Loading branch information
cjcenizal committed Apr 28, 2020
1 parent 4e0c11e commit 3b753ec
Show file tree
Hide file tree
Showing 15 changed files with 162 additions and 162 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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> | |

Original file line number Diff line number Diff line change
@@ -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;
```
1 change: 1 addition & 0 deletions src/core/server/saved_objects/mappings/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export interface IndexMappingMeta {
*/
export interface SavedObjectsCoreFieldMapping {
type: string;
null_value?: number | boolean | string;
index?: boolean;
enabled?: boolean;
fields?: {
Expand Down
2 changes: 2 additions & 0 deletions src/core/server/server.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -1840,6 +1840,8 @@ export interface SavedObjectsCoreFieldMapping {
// (undocumented)
index?: boolean;
// (undocumented)
null_value?: number | boolean | string;
// (undocumented)
type: string;
}

Expand Down
6 changes: 0 additions & 6 deletions x-pack/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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),
Expand Down
13 changes: 0 additions & 13 deletions x-pack/legacy/plugins/index_management/index.ts

This file was deleted.

40 changes: 0 additions & 40 deletions x-pack/legacy/plugins/remote_clusters/index.ts

This file was deleted.

28 changes: 0 additions & 28 deletions x-pack/legacy/plugins/upgrade_assistant/index.ts

This file was deleted.

65 changes: 0 additions & 65 deletions x-pack/legacy/plugins/upgrade_assistant/mappings.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/remote_clusters/public/application/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 12 additions & 3 deletions x-pack/plugins/upgrade_assistant/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import { registerClusterCheckupRoutes } from './routes/cluster_checkup';
import { registerDeprecationLoggingRoutes } from './routes/deprecation_logging';
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 {
Expand Down Expand Up @@ -57,11 +59,14 @@ export class UpgradeAssistantServerPlugin implements Plugin {
}

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

savedObjects.registerType(reindexOperationSavedObjectType);
savedObjects.registerType(telemetrySavedObjectType);

const router = http.createRouter();

const dependencies: RouteDependencies = {
Expand All @@ -85,8 +90,12 @@ export class UpgradeAssistantServerPlugin implements Plugin {
registerTelemetryRoutes(dependencies);

if (usageCollection) {
getStartServices().then(([{ savedObjects, elasticsearch }]) => {
registerUpgradeAssistantUsageCollector({ elasticsearch, usageCollection, savedObjects });
getStartServices().then(([{ savedObjects: savedObjectsService, elasticsearch }]) => {
registerUpgradeAssistantUsageCollector({
elasticsearch,
usageCollection,
savedObjects: savedObjectsService,
});
});
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Original file line number Diff line number Diff line change
@@ -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',
},
},
},
},
},
},
},
};
Loading

0 comments on commit 3b753ec

Please sign in to comment.