Skip to content

Commit

Permalink
Merge branch 'master' into issue-54043-sharing-saved-objects-phase-1
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Apr 10, 2020
2 parents d24fa35 + 330956e commit c4c35c1
Show file tree
Hide file tree
Showing 184 changed files with 2,464 additions and 2,981 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
/src/plugins/console/ @elastic/es-ui
/src/plugins/es_ui_shared/ @elastic/es-ui
/x-pack/legacy/plugins/cross_cluster_replication/ @elastic/es-ui
/x-pack/legacy/plugins/index_lifecycle_management/ @elastic/es-ui
/x-pack/plugins/index_lifecycle_management/ @elastic/es-ui
/x-pack/legacy/plugins/index_management/ @elastic/es-ui
/x-pack/legacy/plugins/license_management/ @elastic/es-ui
/x-pack/legacy/plugins/rollup/ @elastic/es-ui
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"@babel/core": "^7.9.0",
"@babel/register": "^7.9.0",
"@elastic/apm-rum": "^4.6.0",
"@elastic/charts": "^18.1.1",
"@elastic/charts": "18.2.2",
"@elastic/datemath": "5.0.3",
"@elastic/ems-client": "7.8.0",
"@elastic/eui": "21.0.1",
Expand Down Expand Up @@ -396,7 +396,7 @@
"axe-core": "^3.4.1",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"babel-plugin-istanbul": "^5.2.0",
"babel-plugin-istanbul": "^6.0.0",
"backport": "5.1.3",
"chai": "3.5.0",
"chance": "1.0.18",
Expand Down Expand Up @@ -469,7 +469,7 @@
"nock": "12.0.3",
"node-sass": "^4.13.1",
"normalize-path": "^3.0.0",
"nyc": "^14.1.1",
"nyc": "^15.0.1",
"pixelmatch": "^5.1.0",
"pkg-up": "^2.0.0",
"pngjs": "^3.4.0",
Expand Down
1,919 changes: 922 additions & 997 deletions packages/kbn-pm/dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/kbn-ui-shared-deps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"kbn:watch": "node scripts/build --watch"
},
"dependencies": {
"@elastic/charts": "^18.1.1",
"@elastic/charts": "18.2.2",
"@elastic/eui": "21.0.1",
"@kbn/i18n": "1.0.0",
"abortcontroller-polyfill": "^1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/.i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"xpack.graph": ["legacy/plugins/graph", "plugins/graph"],
"xpack.grokDebugger": "plugins/grokdebugger",
"xpack.idxMgmt": "plugins/index_management",
"xpack.indexLifecycleMgmt": "legacy/plugins/index_lifecycle_management",
"xpack.indexLifecycleMgmt": "plugins/index_lifecycle_management",
"xpack.infra": "plugins/infra",
"xpack.ingestManager": "plugins/ingest_manager",
"xpack.lens": "legacy/plugins/lens",
Expand Down
2 changes: 0 additions & 2 deletions x-pack/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ 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 { indexLifecycleManagement } from './legacy/plugins/index_lifecycle_management';
import { spaces } from './legacy/plugins/spaces';
import { canvas } from './legacy/plugins/canvas';
import { infra } from './legacy/plugins/infra';
Expand Down Expand Up @@ -50,7 +49,6 @@ module.exports = function(kibana) {
maps(kibana),
canvas(kibana),
indexManagement(kibana),
indexLifecycleManagement(kibana),
infra(kibana),
taskManager(kibana),
rollup(kibana),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { i18n } from '@kbn/i18n';
import { get } from 'lodash';
import { IndexMgmtSetup } from '../../../../../plugins/index_management/public';
import { IndexManagementPluginSetup } from '../../../../../plugins/index_management/public';

const propertyPath = 'isFollowerIndex';

Expand All @@ -21,7 +21,7 @@ const followerBadgeExtension = {
filterExpression: 'isFollowerIndex:true',
};

export const extendIndexManagement = (indexManagement?: IndexMgmtSetup) => {
export const extendIndexManagement = (indexManagement?: IndexManagementPluginSetup) => {
if (indexManagement) {
indexManagement.extensionsService.addBadge(followerBadgeExtension);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
DocLinksStart,
} from 'src/core/public';

import { IndexMgmtSetup } from '../../../../../plugins/index_management/public';
import { IndexManagementPluginSetup } from '../../../../../plugins/index_management/public';

// @ts-ignore;
import { setHttpClient } from './app/services/api';
Expand All @@ -21,7 +21,7 @@ import { setNotifications } from './app/services/notifications';
import { extendIndexManagement } from './extend_index_management';

interface PluginDependencies {
indexManagement: IndexMgmtSetup;
indexManagement: IndexManagementPluginSetup;
__LEGACY: {
chrome: any;
MANAGEMENT_BREADCRUMB: ChromeBreadcrumb;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { Plugin, PluginInitializerContext, CoreSetup } from 'src/core/server';

import { IndexMgmtSetup } from '../../../../../plugins/index_management/server';
import { IndexManagementPluginSetup } from '../../../../../plugins/index_management/server';

// @ts-ignore
import { registerLicenseChecker } from './lib/register_license_checker';
Expand All @@ -15,7 +15,7 @@ import { registerRoutes } from './routes/register_routes';
import { ccrDataEnricher } from './cross_cluster_replication_data';

interface PluginDependencies {
indexManagement: IndexMgmtSetup;
indexManagement: IndexManagementPluginSetup;
__LEGACY: {
server: any;
ccrUIEnabled: boolean;
Expand Down
62 changes: 0 additions & 62 deletions x-pack/legacy/plugins/index_lifecycle_management/index.ts

This file was deleted.

54 changes: 0 additions & 54 deletions x-pack/legacy/plugins/index_lifecycle_management/plugin.ts

This file was deleted.

109 changes: 0 additions & 109 deletions x-pack/legacy/plugins/index_lifecycle_management/public/legacy.ts

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit c4c35c1

Please sign in to comment.