Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Beats Management UI to KP #65791

Merged
merged 10 commits into from
May 15, 2020
Merged

Migrate Beats Management UI to KP #65791

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
04127ae
Initial working version
joshdover May 7, 2020
2b0e90b
Move files from legacy
joshdover May 7, 2020
5f540a3
Fix routing and breadcrumbs
joshdover May 10, 2020
d6f416e
Fix i18nrc
joshdover May 10, 2020
3a2f86d
Remove unused parameters
joshdover May 12, 2020
67521e7
Merge remote-tracking branch 'upstream/master' into beats-cm/migrate-ui
joshdover May 12, 2020
c25f6ae
Fix type errors
joshdover May 12, 2020
3fbc812
Merge branch 'master' into beats-cm/migrate-ui
elasticmachine May 13, 2020
a93b3c0
Merge branch 'master' into beats-cm/migrate-ui
elasticmachine May 14, 2020
c7597de
Merge branch 'master' into beats-cm/migrate-ui
elasticmachine May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/.i18nrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"xpack.alerting": "plugins/alerting",
"xpack.alertingBuiltins": "plugins/alerting_builtins",
"xpack.apm": ["legacy/plugins/apm", "plugins/apm"],
"xpack.beatsManagement": "legacy/plugins/beats_management",
"xpack.beatsManagement": ["legacy/plugins/beats_management", "plugins/beats_management"],
"xpack.canvas": "plugins/canvas",
"xpack.dashboard": "plugins/dashboard_enhanced",
"xpack.crossClusterReplication": "plugins/cross_cluster_replication",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/beats_management/common/constants/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ export { INDEX_NAMES } from './index_names';
export { PLUGIN } from './plugin';
export { LICENSES, REQUIRED_LICENSES, REQUIRED_ROLES } from './security';
export { TABLE_CONFIG } from './table';
export const BASE_PATH = '/management/beats_management';
export const BASE_PATH = '/management/beats/beats_management';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way the new Management plugin works, this is unavoidable. This PR will change the URL for this UI, however since it's marked "beta" this should be fine.

5 changes: 0 additions & 5 deletions x-pack/legacy/plugins/beats_management/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
import Joi from 'joi';
import { resolve } from 'path';
import { PLUGIN } from './common/constants';
import { CONFIG_PREFIX } from './common/constants/plugin';
import { initServerWithKibana } from './server/kibana.index';
Expand All @@ -29,10 +28,6 @@ export function beats(kibana: any) {
return new kibana.Plugin({
id: PLUGIN.ID,
require: ['kibana', 'elasticsearch', 'xpack_main'],
publicDir: resolve(__dirname, 'public'),
uiExports: {
managementSections: ['plugins/beats_management'],
},
config: () => config,
configPrefix: CONFIG_PREFIX,
init(server: KibanaLegacyServer) {
Expand Down
261 changes: 0 additions & 261 deletions ...legacy/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts
View file
Open in desktop

This file was deleted.

70 changes: 0 additions & 70 deletions x-pack/legacy/plugins/beats_management/public/lib/compose/memory.ts
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion x-pack/legacy/plugins/beats_management/scripts/fake_env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import request from 'request';
import uuidv4 from 'uuid/v4';
import { configBlockSchemas } from '../common/config_schemas';
import { BeatTag } from '../common/domain_types';
import { compose } from '../public/lib/compose/scripts';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { compose } from '../../../../plugins/beats_management/public/lib/compose/scripts';
const args = process.argv.slice(2);
const chance = new Chance();

Expand Down
3 changes: 2 additions & 1 deletion x-pack/legacy/plugins/beats_management/server/lib/adapters/events/adapter_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { BeatEvent } from '../../../../common/domain_types';
import { FrameworkUser } from '../../../../public/lib/adapters/framework/adapter_types';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { FrameworkUser } from '../../../../../../../plugins/beats_management/public/lib/adapters/framework/adapter_types';

export interface BeatEventsAdapter {
bulkInsert(user: FrameworkUser, beatId: string, events: BeatEvent[]): Promise<void>;
Expand Down
3 changes: 2 additions & 1 deletion .../plugins/beats_management/server/lib/adapters/events/elasticsearch_beat_events_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
*/

import { BeatEvent } from '../../../../common/domain_types';
import { FrameworkUser } from '../../../../public/lib/adapters/framework/adapter_types';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { FrameworkUser } from '../../../../../../../plugins/beats_management/public/lib/adapters/framework/adapter_types';
import { DatabaseAdapter } from '../database/adapter_types';
import { BeatEventsAdapter } from './adapter_types';

Expand Down
Loading