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

Jump to bottom

[NP] Migrate logstash server side code to NP #63135

Merged
merged 16 commits into from
Apr 14, 2020
Merged

[NP] Migrate logstash server side code to NP #63135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9432ada
convert api_integration test into TS
mshustov Apr 9, 2020
f6c9f01
create logstash NP plugin and move models
mshustov Apr 9, 2020
b8e114e
move common/constants to NP
mshustov Apr 9, 2020
fcca07d
type fetch all from scroll
mshustov Apr 9, 2020
877fa0f
move route declaration to NP
mshustov Apr 9, 2020
f3385ee
add licence checker wrapper
mshustov Apr 9, 2020
fa5fe8b
register logstash route handlers in NP
mshustov Apr 9, 2020
b703771
track logstash NP i18n
mshustov Apr 9, 2020
7cd1475
Merge branch 'master' into issue-60937-logstash-server
mshustov Apr 9, 2020
b40ef71
address shaunak comment
mshustov Apr 9, 2020
871b3d7
fix validation
mshustov Apr 9, 2020
f65fa3a
Merge branch 'master' into issue-60937-logstash-server
mshustov Apr 14, 2020
1d85d54
udpdate security tests since for new mock defaults
mshustov Apr 14, 2020
8d36307
Merge branch 'master' into issue-60937-logstash-server
mshustov Apr 14, 2020
de1a537
address Pierres comments
mshustov Apr 14, 2020
8344876
rename upgrade file route
mshustov Apr 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 @@ -24,7 +24,7 @@
"xpack.lens": "legacy/plugins/lens",
"xpack.licenseMgmt": "plugins/license_management",
"xpack.licensing": "plugins/licensing",
"xpack.logstash": "legacy/plugins/logstash",
"xpack.logstash": ["plugins/logstash", "legacy/plugins/logstash"],
"xpack.main": "legacy/plugins/xpack_main",
"xpack.maps": ["plugins/maps", "legacy/plugins/maps"],
"xpack.ml": ["plugins/ml", "legacy/plugins/ml"],
Expand Down
10 changes: 1 addition & 9 deletions x-pack/legacy/plugins/logstash/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
*/

import { resolve } from 'path';
import { registerLogstashPipelinesRoutes } from './server/routes/api/pipelines';
import { registerLogstashPipelineRoutes } from './server/routes/api/pipeline';
import { registerLogstashUpgradeRoutes } from './server/routes/api/upgrade';
import { registerLogstashClusterRoutes } from './server/routes/api/cluster';
import { registerLicenseChecker } from './server/lib/register_license_checker';
import { PLUGIN } from './common/constants';
import { PLUGIN } from '../../../plugins/logstash/common/constants';

export const logstash = kibana =>
new kibana.Plugin({
Expand All @@ -32,9 +28,5 @@ export const logstash = kibana =>
},
init: server => {
registerLicenseChecker(server);
registerLogstashPipelinesRoutes(server);
registerLogstashPipelineRoutes(server);
registerLogstashUpgradeRoutes(server);
registerLogstashClusterRoutes(server);
},
});
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/logstash/public/components/pipeline_editor/pipeline_editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import 'brace/mode/plain_text';
import 'brace/theme/github';

import { isEmpty } from 'lodash';
import { TOOLTIPS } from '../../../common/constants/tooltips';
import { TOOLTIPS } from '../../../../../../plugins/logstash/common/constants/tooltips';
import {
EuiButton,
EuiButtonEmpty,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/logstash/public/lib/register_home_feature.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { npSetup } from 'ui/new_platform';
import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
import { FeatureCatalogueCategory } from '../../../../../../src/plugins/home/public';
// @ts-ignore
import { PLUGIN } from '../../common/constants';
import { PLUGIN } from '../../../../../plugins/logstash/common/constants';

const {
plugins: { home },
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/logstash/public/models/pipeline_list_item/pipeline_list_item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { pick, capitalize } from 'lodash';

import { getSearchValue } from 'plugins/logstash/lib/get_search_value';
import { getMoment } from 'plugins/logstash/../common/lib/get_moment';
import { PIPELINE } from '../../../common/constants';
import { PIPELINE } from '../../../../../../plugins/logstash/common/constants';

/**
* Represents the model for listing pipelines in the UI
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/logstash/public/services/cluster/cluster_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import chrome from 'ui/chrome';
import { ROUTES } from '../../../common/constants';
import { ROUTES } from '../../../../../../plugins/logstash/common/constants';
import { Cluster } from 'plugins/logstash/models/cluster';

export class ClusterService {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/logstash/public/services/license/logstash_license_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import React from 'react';
import { toastNotifications } from 'ui/notify';
import { MarkdownSimple } from '../../../../../../../src/plugins/kibana_react/public';
import { PLUGIN } from '../../../common/constants';
import { PLUGIN } from '../../../../../../plugins/logstash/common/constants';

export class LogstashLicenseService {
constructor(xpackInfoService, kbnUrlService, $timeout) {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/logstash/public/services/monitoring/monitoring_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import moment from 'moment';
import chrome from 'ui/chrome';
import { ROUTES, MONITORING } from '../../../common/constants';
import { ROUTES, MONITORING } from '../../../../../../plugins/logstash/common/constants';
import { PipelineListItem } from 'plugins/logstash/models/pipeline_list_item';

export class MonitoringService {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/logstash/public/services/pipeline/pipeline_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import chrome from 'ui/chrome';
import { ROUTES } from '../../../common/constants';
import { ROUTES } from '../../../../../../plugins/logstash/common/constants';
import { Pipeline } from 'plugins/logstash/models/pipeline';

export class PipelineService {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/logstash/public/services/pipelines/pipelines_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import chrome from 'ui/chrome';
import { ROUTES, MONITORING } from '../../../common/constants';
import { ROUTES, MONITORING } from '../../../../../../plugins/logstash/common/constants';
import { PipelineListItem } from 'plugins/logstash/models/pipeline_list_item';

const RECENTLY_DELETED_PIPELINE_IDS_STORAGE_KEY = 'xpack.logstash.recentlyDeletedPipelines';
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/logstash/public/services/upgrade/upgrade_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import chrome from 'ui/chrome';
import { ROUTES } from '../../../common/constants';
import { ROUTES } from '../../../../../../plugins/logstash/common/constants';

export class UpgradeService {
constructor($http) {
Expand Down
18 changes: 0 additions & 18 deletions ...legacy/plugins/logstash/server/lib/call_with_request_factory/call_with_request_factory.js
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions x-pack/legacy/plugins/logstash/server/lib/error_wrappers/__tests__/wrap_custom_error.js
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions x-pack/legacy/plugins/logstash/server/lib/error_wrappers/__tests__/wrap_es_error.js
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions x-pack/legacy/plugins/logstash/server/lib/error_wrappers/__tests__/wrap_unknown_error.js
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions x-pack/legacy/plugins/logstash/server/lib/error_wrappers/wrap_custom_error.js
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions x-pack/legacy/plugins/logstash/server/lib/error_wrappers/wrap_es_error.js
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions x-pack/legacy/plugins/logstash/server/lib/error_wrappers/wrap_unknown_error.js
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions ...gacy/plugins/logstash/server/lib/fetch_all_from_scroll/__tests__/fetch_all_from_scroll.js
View file
Open in desktop

This file was deleted.

Loading