= ({ createAnomalyDetectionJobDisabled }
diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
index 5093801d2d1846..b6e95ae8373ee1 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
@@ -36,7 +36,7 @@ describe('check_capabilities', () => {
);
const { capabilities } = await getCapabilities();
const count = Object.keys(capabilities).length;
- expect(count).toBe(22);
+ expect(count).toBe(28);
done();
});
});
@@ -49,28 +49,42 @@ describe('check_capabilities', () => {
mlLicense,
mlIsEnabled
);
- const { capabilities, upgradeInProgress, mlFeatureEnabledInSpace } = await getCapabilities();
+ const {
+ capabilities,
+ upgradeInProgress,
+ mlFeatureEnabledInSpace,
+ isPlatinumOrTrialLicense,
+ } = await getCapabilities();
expect(upgradeInProgress).toBe(false);
expect(mlFeatureEnabledInSpace).toBe(true);
+ expect(isPlatinumOrTrialLicense).toBe(true);
+
+ expect(capabilities.canAccessML).toBe(true);
expect(capabilities.canGetJobs).toBe(true);
+ expect(capabilities.canGetDatafeeds).toBe(true);
+ expect(capabilities.canGetCalendars).toBe(true);
+ expect(capabilities.canFindFileStructure).toBe(true);
+ expect(capabilities.canGetFilters).toBe(true);
+ expect(capabilities.canGetDataFrameAnalytics).toBe(true);
+ expect(capabilities.canGetAnnotations).toBe(true);
+ expect(capabilities.canCreateAnnotation).toBe(true);
+ expect(capabilities.canDeleteAnnotation).toBe(true);
+
expect(capabilities.canCreateJob).toBe(false);
expect(capabilities.canDeleteJob).toBe(false);
expect(capabilities.canOpenJob).toBe(false);
expect(capabilities.canCloseJob).toBe(false);
expect(capabilities.canForecastJob).toBe(false);
- expect(capabilities.canGetDatafeeds).toBe(true);
expect(capabilities.canStartStopDatafeed).toBe(false);
expect(capabilities.canUpdateJob).toBe(false);
+ expect(capabilities.canCreateDatafeed).toBe(false);
+ expect(capabilities.canDeleteDatafeed).toBe(false);
expect(capabilities.canUpdateDatafeed).toBe(false);
expect(capabilities.canPreviewDatafeed).toBe(false);
- expect(capabilities.canGetCalendars).toBe(true);
expect(capabilities.canCreateCalendar).toBe(false);
expect(capabilities.canDeleteCalendar).toBe(false);
- expect(capabilities.canGetFilters).toBe(true);
expect(capabilities.canCreateFilter).toBe(false);
expect(capabilities.canDeleteFilter).toBe(false);
- expect(capabilities.canFindFileStructure).toBe(true);
- expect(capabilities.canGetDataFrameAnalytics).toBe(true);
expect(capabilities.canDeleteDataFrameAnalytics).toBe(false);
expect(capabilities.canCreateDataFrameAnalytics).toBe(false);
expect(capabilities.canStartStopDataFrameAnalytics).toBe(false);
@@ -84,28 +98,42 @@ describe('check_capabilities', () => {
mlLicense,
mlIsEnabled
);
- const { capabilities, upgradeInProgress, mlFeatureEnabledInSpace } = await getCapabilities();
+ const {
+ capabilities,
+ upgradeInProgress,
+ mlFeatureEnabledInSpace,
+ isPlatinumOrTrialLicense,
+ } = await getCapabilities();
expect(upgradeInProgress).toBe(false);
expect(mlFeatureEnabledInSpace).toBe(true);
+ expect(isPlatinumOrTrialLicense).toBe(true);
+
+ expect(capabilities.canAccessML).toBe(true);
expect(capabilities.canGetJobs).toBe(true);
+ expect(capabilities.canGetDatafeeds).toBe(true);
+ expect(capabilities.canGetCalendars).toBe(true);
+ expect(capabilities.canFindFileStructure).toBe(true);
+ expect(capabilities.canGetFilters).toBe(true);
+ expect(capabilities.canGetDataFrameAnalytics).toBe(true);
+ expect(capabilities.canGetAnnotations).toBe(true);
+ expect(capabilities.canCreateAnnotation).toBe(true);
+ expect(capabilities.canDeleteAnnotation).toBe(true);
+
expect(capabilities.canCreateJob).toBe(true);
expect(capabilities.canDeleteJob).toBe(true);
expect(capabilities.canOpenJob).toBe(true);
expect(capabilities.canCloseJob).toBe(true);
expect(capabilities.canForecastJob).toBe(true);
- expect(capabilities.canGetDatafeeds).toBe(true);
expect(capabilities.canStartStopDatafeed).toBe(true);
expect(capabilities.canUpdateJob).toBe(true);
+ expect(capabilities.canCreateDatafeed).toBe(true);
+ expect(capabilities.canDeleteDatafeed).toBe(true);
expect(capabilities.canUpdateDatafeed).toBe(true);
expect(capabilities.canPreviewDatafeed).toBe(true);
- expect(capabilities.canGetCalendars).toBe(true);
expect(capabilities.canCreateCalendar).toBe(true);
expect(capabilities.canDeleteCalendar).toBe(true);
- expect(capabilities.canGetFilters).toBe(true);
expect(capabilities.canCreateFilter).toBe(true);
expect(capabilities.canDeleteFilter).toBe(true);
- expect(capabilities.canFindFileStructure).toBe(true);
- expect(capabilities.canGetDataFrameAnalytics).toBe(true);
expect(capabilities.canDeleteDataFrameAnalytics).toBe(true);
expect(capabilities.canCreateDataFrameAnalytics).toBe(true);
expect(capabilities.canStartStopDataFrameAnalytics).toBe(true);
@@ -119,28 +147,42 @@ describe('check_capabilities', () => {
mlLicense,
mlIsEnabled
);
- const { capabilities, upgradeInProgress, mlFeatureEnabledInSpace } = await getCapabilities();
+ const {
+ capabilities,
+ upgradeInProgress,
+ mlFeatureEnabledInSpace,
+ isPlatinumOrTrialLicense,
+ } = await getCapabilities();
expect(upgradeInProgress).toBe(true);
expect(mlFeatureEnabledInSpace).toBe(true);
+ expect(isPlatinumOrTrialLicense).toBe(true);
+
+ expect(capabilities.canAccessML).toBe(true);
expect(capabilities.canGetJobs).toBe(true);
+ expect(capabilities.canGetDatafeeds).toBe(true);
+ expect(capabilities.canGetCalendars).toBe(true);
+ expect(capabilities.canFindFileStructure).toBe(true);
+ expect(capabilities.canGetFilters).toBe(true);
+ expect(capabilities.canGetDataFrameAnalytics).toBe(true);
+ expect(capabilities.canGetAnnotations).toBe(true);
+ expect(capabilities.canCreateAnnotation).toBe(false);
+ expect(capabilities.canDeleteAnnotation).toBe(false);
+
expect(capabilities.canCreateJob).toBe(false);
expect(capabilities.canDeleteJob).toBe(false);
expect(capabilities.canOpenJob).toBe(false);
expect(capabilities.canCloseJob).toBe(false);
expect(capabilities.canForecastJob).toBe(false);
- expect(capabilities.canGetDatafeeds).toBe(true);
expect(capabilities.canStartStopDatafeed).toBe(false);
expect(capabilities.canUpdateJob).toBe(false);
+ expect(capabilities.canCreateDatafeed).toBe(false);
+ expect(capabilities.canDeleteDatafeed).toBe(false);
expect(capabilities.canUpdateDatafeed).toBe(false);
expect(capabilities.canPreviewDatafeed).toBe(false);
- expect(capabilities.canGetCalendars).toBe(true);
expect(capabilities.canCreateCalendar).toBe(false);
expect(capabilities.canDeleteCalendar).toBe(false);
- expect(capabilities.canGetFilters).toBe(true);
expect(capabilities.canCreateFilter).toBe(false);
expect(capabilities.canDeleteFilter).toBe(false);
- expect(capabilities.canFindFileStructure).toBe(true);
- expect(capabilities.canGetDataFrameAnalytics).toBe(true);
expect(capabilities.canDeleteDataFrameAnalytics).toBe(false);
expect(capabilities.canCreateDataFrameAnalytics).toBe(false);
expect(capabilities.canStartStopDataFrameAnalytics).toBe(false);
@@ -154,28 +196,42 @@ describe('check_capabilities', () => {
mlLicense,
mlIsEnabled
);
- const { capabilities, upgradeInProgress, mlFeatureEnabledInSpace } = await getCapabilities();
+ const {
+ capabilities,
+ upgradeInProgress,
+ mlFeatureEnabledInSpace,
+ isPlatinumOrTrialLicense,
+ } = await getCapabilities();
expect(upgradeInProgress).toBe(true);
expect(mlFeatureEnabledInSpace).toBe(true);
+ expect(isPlatinumOrTrialLicense).toBe(true);
+
+ expect(capabilities.canAccessML).toBe(true);
expect(capabilities.canGetJobs).toBe(true);
+ expect(capabilities.canGetDatafeeds).toBe(true);
+ expect(capabilities.canGetCalendars).toBe(true);
+ expect(capabilities.canFindFileStructure).toBe(true);
+ expect(capabilities.canGetFilters).toBe(true);
+ expect(capabilities.canGetDataFrameAnalytics).toBe(true);
+ expect(capabilities.canGetAnnotations).toBe(true);
+ expect(capabilities.canCreateAnnotation).toBe(false);
+ expect(capabilities.canDeleteAnnotation).toBe(false);
+
expect(capabilities.canCreateJob).toBe(false);
expect(capabilities.canDeleteJob).toBe(false);
expect(capabilities.canOpenJob).toBe(false);
expect(capabilities.canCloseJob).toBe(false);
expect(capabilities.canForecastJob).toBe(false);
- expect(capabilities.canGetDatafeeds).toBe(true);
expect(capabilities.canStartStopDatafeed).toBe(false);
expect(capabilities.canUpdateJob).toBe(false);
+ expect(capabilities.canCreateDatafeed).toBe(false);
+ expect(capabilities.canDeleteDatafeed).toBe(false);
expect(capabilities.canUpdateDatafeed).toBe(false);
expect(capabilities.canPreviewDatafeed).toBe(false);
- expect(capabilities.canGetCalendars).toBe(true);
expect(capabilities.canCreateCalendar).toBe(false);
expect(capabilities.canDeleteCalendar).toBe(false);
- expect(capabilities.canGetFilters).toBe(true);
expect(capabilities.canCreateFilter).toBe(false);
expect(capabilities.canDeleteFilter).toBe(false);
- expect(capabilities.canFindFileStructure).toBe(true);
- expect(capabilities.canGetDataFrameAnalytics).toBe(true);
expect(capabilities.canDeleteDataFrameAnalytics).toBe(false);
expect(capabilities.canCreateDataFrameAnalytics).toBe(false);
expect(capabilities.canStartStopDataFrameAnalytics).toBe(false);
@@ -189,28 +245,42 @@ describe('check_capabilities', () => {
mlLicense,
mlIsNotEnabled
);
- const { capabilities, upgradeInProgress, mlFeatureEnabledInSpace } = await getCapabilities();
+ const {
+ capabilities,
+ upgradeInProgress,
+ mlFeatureEnabledInSpace,
+ isPlatinumOrTrialLicense,
+ } = await getCapabilities();
expect(upgradeInProgress).toBe(false);
expect(mlFeatureEnabledInSpace).toBe(false);
+ expect(isPlatinumOrTrialLicense).toBe(true);
+
+ expect(capabilities.canAccessML).toBe(false);
expect(capabilities.canGetJobs).toBe(false);
+ expect(capabilities.canGetDatafeeds).toBe(false);
+ expect(capabilities.canGetCalendars).toBe(false);
+ expect(capabilities.canFindFileStructure).toBe(false);
+ expect(capabilities.canGetFilters).toBe(false);
+ expect(capabilities.canGetDataFrameAnalytics).toBe(false);
+ expect(capabilities.canGetAnnotations).toBe(false);
+ expect(capabilities.canCreateAnnotation).toBe(false);
+ expect(capabilities.canDeleteAnnotation).toBe(false);
+
expect(capabilities.canCreateJob).toBe(false);
expect(capabilities.canDeleteJob).toBe(false);
expect(capabilities.canOpenJob).toBe(false);
expect(capabilities.canCloseJob).toBe(false);
expect(capabilities.canForecastJob).toBe(false);
- expect(capabilities.canGetDatafeeds).toBe(false);
expect(capabilities.canStartStopDatafeed).toBe(false);
expect(capabilities.canUpdateJob).toBe(false);
+ expect(capabilities.canCreateDatafeed).toBe(false);
+ expect(capabilities.canDeleteDatafeed).toBe(false);
expect(capabilities.canUpdateDatafeed).toBe(false);
expect(capabilities.canPreviewDatafeed).toBe(false);
- expect(capabilities.canGetCalendars).toBe(false);
expect(capabilities.canCreateCalendar).toBe(false);
expect(capabilities.canDeleteCalendar).toBe(false);
- expect(capabilities.canGetFilters).toBe(false);
expect(capabilities.canCreateFilter).toBe(false);
expect(capabilities.canDeleteFilter).toBe(false);
- expect(capabilities.canFindFileStructure).toBe(false);
- expect(capabilities.canGetDataFrameAnalytics).toBe(false);
expect(capabilities.canDeleteDataFrameAnalytics).toBe(false);
expect(capabilities.canCreateDataFrameAnalytics).toBe(false);
expect(capabilities.canStartStopDataFrameAnalytics).toBe(false);
@@ -225,28 +295,43 @@ describe('check_capabilities', () => {
mlLicenseBasic,
mlIsNotEnabled
);
- const { capabilities, upgradeInProgress, mlFeatureEnabledInSpace } = await getCapabilities();
+ const {
+ capabilities,
+ upgradeInProgress,
+ mlFeatureEnabledInSpace,
+ isPlatinumOrTrialLicense,
+ } = await getCapabilities();
+
expect(upgradeInProgress).toBe(false);
expect(mlFeatureEnabledInSpace).toBe(false);
+ expect(isPlatinumOrTrialLicense).toBe(false);
+
+ expect(capabilities.canAccessML).toBe(false);
expect(capabilities.canGetJobs).toBe(false);
+ expect(capabilities.canGetDatafeeds).toBe(false);
+ expect(capabilities.canGetCalendars).toBe(false);
+ expect(capabilities.canFindFileStructure).toBe(false);
+ expect(capabilities.canGetFilters).toBe(false);
+ expect(capabilities.canGetDataFrameAnalytics).toBe(false);
+ expect(capabilities.canGetAnnotations).toBe(false);
+ expect(capabilities.canCreateAnnotation).toBe(false);
+ expect(capabilities.canDeleteAnnotation).toBe(false);
+
expect(capabilities.canCreateJob).toBe(false);
expect(capabilities.canDeleteJob).toBe(false);
expect(capabilities.canOpenJob).toBe(false);
expect(capabilities.canCloseJob).toBe(false);
expect(capabilities.canForecastJob).toBe(false);
- expect(capabilities.canGetDatafeeds).toBe(false);
expect(capabilities.canStartStopDatafeed).toBe(false);
expect(capabilities.canUpdateJob).toBe(false);
+ expect(capabilities.canCreateDatafeed).toBe(false);
+ expect(capabilities.canDeleteDatafeed).toBe(false);
expect(capabilities.canUpdateDatafeed).toBe(false);
expect(capabilities.canPreviewDatafeed).toBe(false);
- expect(capabilities.canGetCalendars).toBe(false);
expect(capabilities.canCreateCalendar).toBe(false);
expect(capabilities.canDeleteCalendar).toBe(false);
- expect(capabilities.canGetFilters).toBe(false);
expect(capabilities.canCreateFilter).toBe(false);
expect(capabilities.canDeleteFilter).toBe(false);
- expect(capabilities.canFindFileStructure).toBe(false);
- expect(capabilities.canGetDataFrameAnalytics).toBe(false);
expect(capabilities.canDeleteDataFrameAnalytics).toBe(false);
expect(capabilities.canCreateDataFrameAnalytics).toBe(false);
expect(capabilities.canStartStopDataFrameAnalytics).toBe(false);
diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
index a2ad83c5522de3..d955cf981faca6 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
@@ -44,4 +44,6 @@ function disableAdminPrivileges(capabilities: MlCapabilities) {
Object.keys(adminMlCapabilities).forEach(k => {
capabilities[k as keyof MlCapabilities] = false;
});
+ capabilities.canCreateAnnotation = false;
+ capabilities.canDeleteAnnotation = false;
}
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index 64f8eb4b0acd3a..969b74194148b3 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -45,7 +45,7 @@ import { systemRoutes } from './routes/system';
import { MlLicense } from '../common/license';
import { MlServerLicense } from './lib/license';
import { createSharedServices, SharedServices } from './shared_services';
-import { userMlCapabilities, adminMlCapabilities } from '../common/types/capabilities';
+import { getPluginPrivileges } from '../common/types/capabilities';
import { setupCapabilitiesSwitcher } from './lib/capabilities';
import { registerKibanaSettings } from './lib/register_settings';
@@ -75,8 +75,7 @@ export class MlServerPlugin implements Plugin {
try {
@@ -86,6 +89,9 @@ export function annotationRoutes(
validate: {
body: indexAnnotationSchema,
},
+ options: {
+ tags: ['access:ml:canCreateAnnotation'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -130,6 +136,9 @@ export function annotationRoutes(
validate: {
params: deleteAnnotationSchema,
},
+ options: {
+ tags: ['access:ml:canDeleteAnnotation'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
index ca63d69f403f6b..63cd5498231af5 100644
--- a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
+++ b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
@@ -37,6 +37,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
{
path: '/api/ml/anomaly_detectors',
validate: false,
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -65,6 +68,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: jobIdSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -93,6 +99,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
{
path: '/api/ml/anomaly_detectors/_stats',
validate: false,
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -121,6 +130,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: jobIdSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -154,6 +166,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
params: jobIdSchema,
body: schema.object(anomalyDetectionJobSchema),
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -188,6 +203,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
params: jobIdSchema,
body: anomalyDetectionUpdateJobSchema,
},
+ options: {
+ tags: ['access:ml:canUpdateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -220,6 +238,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: jobIdSchema,
},
+ options: {
+ tags: ['access:ml:canOpenJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -251,6 +272,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: jobIdSchema,
},
+ options: {
+ tags: ['access:ml:canCloseJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -286,6 +310,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: jobIdSchema,
},
+ options: {
+ tags: ['access:ml:canDeleteJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -319,6 +346,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
body: schema.any(),
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -351,6 +381,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
params: jobIdSchema,
body: forecastAnomalyDetector,
},
+ options: {
+ tags: ['access:ml:canForecastJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -389,6 +422,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
params: jobIdSchema,
body: getRecordsSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -425,6 +461,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
params: getBucketParamsSchema,
body: getBucketsSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -462,6 +501,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
params: jobIdSchema,
body: getOverallBucketsSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -496,6 +538,9 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: getCategoriesSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/calendars.ts b/x-pack/plugins/ml/server/routes/calendars.ts
index a17601f74ae93e..9c80651a13999e 100644
--- a/x-pack/plugins/ml/server/routes/calendars.ts
+++ b/x-pack/plugins/ml/server/routes/calendars.ts
@@ -52,6 +52,9 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
{
path: '/api/ml/calendars',
validate: false,
+ options: {
+ tags: ['access:ml:canGetCalendars'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -81,6 +84,9 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
validate: {
params: calendarIdsSchema,
},
+ options: {
+ tags: ['access:ml:canGetCalendars'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
let returnValue;
@@ -117,6 +123,9 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
validate: {
body: calendarSchema,
},
+ options: {
+ tags: ['access:ml:canCreateCalendar'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -149,6 +158,9 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
params: calendarIdSchema,
body: calendarSchema,
},
+ options: {
+ tags: ['access:ml:canCreateCalendar'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -180,6 +192,9 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
validate: {
params: calendarIdSchema,
},
+ options: {
+ tags: ['access:ml:canDeleteCalendar'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
index dd9e0ea66aa9dd..32cb2b343f8760 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -33,6 +33,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
{
path: '/api/ml/data_frame/analytics',
validate: false,
+ options: {
+ tags: ['access:ml:canGetDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -61,6 +64,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
validate: {
params: analyticsIdSchema,
},
+ options: {
+ tags: ['access:ml:canGetDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -88,6 +94,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
{
path: '/api/ml/data_frame/analytics/_stats',
validate: false,
+ options: {
+ tags: ['access:ml:canGetDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -118,6 +127,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
validate: {
params: analyticsIdSchema,
},
+ options: {
+ tags: ['access:ml:canGetDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -155,6 +167,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
params: analyticsIdSchema,
body: dataAnalyticsJobConfigSchema,
},
+ options: {
+ tags: ['access:ml:canCreateDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -190,6 +205,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
validate: {
body: dataAnalyticsEvaluateSchema,
},
+ options: {
+ tags: ['access:ml:canCreateDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -224,6 +242,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
validate: {
body: dataAnalyticsExplainSchema,
},
+ options: {
+ tags: ['access:ml:canCreateDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -257,6 +278,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
validate: {
params: analyticsIdSchema,
},
+ options: {
+ tags: ['access:ml:canDeleteDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -291,6 +315,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
validate: {
params: analyticsIdSchema,
},
+ options: {
+ tags: ['access:ml:canStartStopDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -324,6 +351,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
params: analyticsIdSchema,
query: stopsDataFrameAnalyticsJobQuerySchema,
},
+ options: {
+ tags: ['access:ml:canStartStopDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -364,6 +394,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
validate: {
params: analyticsIdSchema,
},
+ options: {
+ tags: ['access:ml:canGetDataFrameAnalytics'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/data_visualizer.ts b/x-pack/plugins/ml/server/routes/data_visualizer.ts
index 20029fbd8d1a6b..04008a896a1a22 100644
--- a/x-pack/plugins/ml/server/routes/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/routes/data_visualizer.ts
@@ -88,6 +88,9 @@ export function dataVisualizerRoutes({ router, mlLicense }: RouteInitialization)
params: indexPatternTitleSchema,
body: dataVisualizerFieldStatsSchema,
},
+ options: {
+ tags: ['access:ml:canAccessML'],
+ },
},
mlLicense.basicLicenseAPIGuard(async (context, request, response) => {
try {
@@ -150,6 +153,9 @@ export function dataVisualizerRoutes({ router, mlLicense }: RouteInitialization)
params: indexPatternTitleSchema,
body: dataVisualizerOverallStatsSchema,
},
+ options: {
+ tags: ['access:ml:canAccessML'],
+ },
},
mlLicense.basicLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/datafeeds.ts b/x-pack/plugins/ml/server/routes/datafeeds.ts
index ec667e1d305f52..1fa1d408372da3 100644
--- a/x-pack/plugins/ml/server/routes/datafeeds.ts
+++ b/x-pack/plugins/ml/server/routes/datafeeds.ts
@@ -28,6 +28,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
{
path: '/api/ml/datafeeds',
validate: false,
+ options: {
+ tags: ['access:ml:canGetDatafeeds'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -57,6 +60,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: datafeedIdSchema,
},
+ options: {
+ tags: ['access:ml:canGetDatafeeds'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -83,6 +89,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
{
path: '/api/ml/datafeeds/_stats',
validate: false,
+ options: {
+ tags: ['access:ml:canGetDatafeeds'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -112,6 +121,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: datafeedIdSchema,
},
+ options: {
+ tags: ['access:ml:canGetDatafeeds'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -146,6 +158,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
params: datafeedIdSchema,
body: datafeedConfigSchema,
},
+ options: {
+ tags: ['access:ml:canCreateDatafeed'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -181,6 +196,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
params: datafeedIdSchema,
body: datafeedConfigSchema,
},
+ options: {
+ tags: ['access:ml:canUpdateDatafeed'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -216,6 +234,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
params: datafeedIdSchema,
query: deleteDatafeedQuerySchema,
},
+ options: {
+ tags: ['access:ml:canDeleteDatafeed'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -255,6 +276,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
params: datafeedIdSchema,
body: startDatafeedSchema,
},
+ options: {
+ tags: ['access:ml:canStartStopDatafeed'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -291,6 +315,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: datafeedIdSchema,
},
+ options: {
+ tags: ['access:ml:canStartStopDatafeed'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -324,6 +351,9 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: datafeedIdSchema,
},
+ options: {
+ tags: ['access:ml:canPreviewDatafeed'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/fields_service.ts b/x-pack/plugins/ml/server/routes/fields_service.ts
index 577e8e0161342a..b0f13df294145e 100644
--- a/x-pack/plugins/ml/server/routes/fields_service.ts
+++ b/x-pack/plugins/ml/server/routes/fields_service.ts
@@ -46,8 +46,10 @@ export function fieldsService({ router, mlLicense }: RouteInitialization) {
validate: {
body: getCardinalityOfFieldsSchema,
},
+ options: {
+ tags: ['access:ml:canAccessML'],
+ },
},
-
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
const resp = await getCardinalityOfFields(context, request.body);
@@ -79,6 +81,9 @@ export function fieldsService({ router, mlLicense }: RouteInitialization) {
validate: {
body: getTimeFieldRangeSchema,
},
+ options: {
+ tags: ['access:ml:canAccessML'],
+ },
},
mlLicense.basicLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/file_data_visualizer.ts b/x-pack/plugins/ml/server/routes/file_data_visualizer.ts
index 3f3fc3f547b6a0..0f389f9505943b 100644
--- a/x-pack/plugins/ml/server/routes/file_data_visualizer.ts
+++ b/x-pack/plugins/ml/server/routes/file_data_visualizer.ts
@@ -71,6 +71,7 @@ export function fileDataVisualizerRoutes({ router, mlLicense }: RouteInitializat
accepts: ['text/*', 'application/json'],
maxBytes: MAX_FILE_SIZE_BYTES,
},
+ tags: ['access:ml:canFindFileStructure'],
},
},
mlLicense.basicLicenseAPIGuard(async (context, request, response) => {
@@ -105,6 +106,7 @@ export function fileDataVisualizerRoutes({ router, mlLicense }: RouteInitializat
accepts: ['application/json'],
maxBytes: MAX_FILE_SIZE_BYTES,
},
+ tags: ['access:ml:canFindFileStructure'],
},
},
mlLicense.basicLicenseAPIGuard(async (context, request, response) => {
diff --git a/x-pack/plugins/ml/server/routes/filters.ts b/x-pack/plugins/ml/server/routes/filters.ts
index 738c25070358d1..d5287c349a8fca 100644
--- a/x-pack/plugins/ml/server/routes/filters.ts
+++ b/x-pack/plugins/ml/server/routes/filters.ts
@@ -57,6 +57,9 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
{
path: '/api/ml/filters',
validate: false,
+ options: {
+ tags: ['access:ml:canGetFilters'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -89,6 +92,9 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: filterIdSchema,
},
+ options: {
+ tags: ['access:ml:canGetFilters'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -120,6 +126,9 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
body: createFilterSchema,
},
+ options: {
+ tags: ['access:ml:canCreateFilter'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -155,6 +164,9 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
params: filterIdSchema,
body: updateFilterSchema,
},
+ options: {
+ tags: ['access:ml:canCreateFilter'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -186,6 +198,9 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
params: filterIdSchema,
},
+ options: {
+ tags: ['access:ml:canDeleteFilter'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -216,6 +231,9 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
{
path: '/api/ml/filters/_stats',
validate: false,
+ options: {
+ tags: ['access:ml:canGetFilters'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/indices.ts b/x-pack/plugins/ml/server/routes/indices.ts
index e434936beba630..fb3ef7fc41c767 100644
--- a/x-pack/plugins/ml/server/routes/indices.ts
+++ b/x-pack/plugins/ml/server/routes/indices.ts
@@ -27,6 +27,9 @@ export function indicesRoutes({ router, mlLicense }: RouteInitialization) {
validate: {
body: indicesSchema,
},
+ options: {
+ tags: ['access:ml:canAccessML'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/job_audit_messages.ts b/x-pack/plugins/ml/server/routes/job_audit_messages.ts
index 1fe5a7af95d4f0..5acc89e7d13be7 100644
--- a/x-pack/plugins/ml/server/routes/job_audit_messages.ts
+++ b/x-pack/plugins/ml/server/routes/job_audit_messages.ts
@@ -33,6 +33,9 @@ export function jobAuditMessagesRoutes({ router, mlLicense }: RouteInitializatio
params: jobAuditMessagesJobIdSchema,
query: jobAuditMessagesQuerySchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -67,6 +70,9 @@ export function jobAuditMessagesRoutes({ router, mlLicense }: RouteInitializatio
validate: {
query: jobAuditMessagesQuerySchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/job_service.ts b/x-pack/plugins/ml/server/routes/job_service.ts
index 149ca2591fd765..05c44e1da97575 100644
--- a/x-pack/plugins/ml/server/routes/job_service.ts
+++ b/x-pack/plugins/ml/server/routes/job_service.ts
@@ -4,11 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import Boom from 'boom';
import { schema } from '@kbn/config-schema';
-import { KibanaRequest } from 'kibana/server';
import { wrapError } from '../client/error_wrapper';
-import { RouteInitialization, JobServiceRouteDeps } from '../types';
+import { RouteInitialization } from '../types';
import {
categorizationFieldExamplesSchema,
chartSchema,
@@ -27,19 +25,7 @@ import { categorizationExamplesProvider } from '../models/job_service/new_job';
/**
* Routes for job service
*/
-export function jobServiceRoutes(
- { router, mlLicense }: RouteInitialization,
- { resolveMlCapabilities }: JobServiceRouteDeps
-) {
- async function hasPermissionToCreateJobs(request: KibanaRequest) {
- const mlCapabilities = await resolveMlCapabilities(request);
- if (mlCapabilities === null) {
- throw new Error('resolveMlCapabilities is not defined');
- }
-
- return mlCapabilities.canCreateJob;
- }
-
+export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
/**
* @apiGroup JobService
*
@@ -55,6 +41,9 @@ export function jobServiceRoutes(
validate: {
body: forceStartDatafeedSchema,
},
+ options: {
+ tags: ['access:ml:canStartStopDatafeed'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -86,6 +75,9 @@ export function jobServiceRoutes(
validate: {
body: datafeedIdsSchema,
},
+ options: {
+ tags: ['access:ml:canStartStopDatafeed'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -117,6 +109,9 @@ export function jobServiceRoutes(
validate: {
body: jobIdsSchema,
},
+ options: {
+ tags: ['access:ml:canDeleteJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -148,6 +143,9 @@ export function jobServiceRoutes(
validate: {
body: jobIdsSchema,
},
+ options: {
+ tags: ['access:ml:canCloseJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -184,6 +182,9 @@ export function jobServiceRoutes(
validate: {
body: jobIdsSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -215,6 +216,9 @@ export function jobServiceRoutes(
validate: {
body: schema.object(jobsWithTimerangeSchema),
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -245,6 +249,9 @@ export function jobServiceRoutes(
validate: {
body: jobIdsSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -272,6 +279,9 @@ export function jobServiceRoutes(
{
path: '/api/ml/jobs/groups',
validate: false,
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -302,6 +312,9 @@ export function jobServiceRoutes(
validate: {
body: schema.object(updateGroupsSchema),
},
+ options: {
+ tags: ['access:ml:canUpdateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -329,6 +342,9 @@ export function jobServiceRoutes(
{
path: '/api/ml/jobs/deleting_jobs_tasks',
validate: false,
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -359,6 +375,9 @@ export function jobServiceRoutes(
validate: {
body: jobIdsSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -389,6 +408,9 @@ export function jobServiceRoutes(
params: schema.object({ indexPattern: schema.string() }),
query: schema.maybe(schema.object({ rollup: schema.maybe(schema.string()) })),
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -422,6 +444,9 @@ export function jobServiceRoutes(
validate: {
body: schema.object(chartSchema),
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -474,6 +499,9 @@ export function jobServiceRoutes(
validate: {
body: schema.object(chartSchema),
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -522,6 +550,9 @@ export function jobServiceRoutes(
{
path: '/api/ml/jobs/all_jobs_and_group_ids',
validate: false,
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -552,6 +583,9 @@ export function jobServiceRoutes(
validate: {
body: schema.object(lookBackProgressSchema),
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -583,17 +617,12 @@ export function jobServiceRoutes(
validate: {
body: schema.object(categorizationFieldExamplesSchema),
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
- // due to the use of the _analyze endpoint which is called by the kibana user,
- // basic job creation privileges are required to use this endpoint
- if ((await hasPermissionToCreateJobs(request)) === false) {
- throw Boom.forbidden(
- 'Insufficient privileges, the machine_learning_admin role is required.'
- );
- }
-
const { validateCategoryExamples } = categorizationExamplesProvider(
context.ml!.mlClient.callAsCurrentUser,
context.ml!.mlClient.callAsInternalUser
@@ -644,6 +673,9 @@ export function jobServiceRoutes(
validate: {
body: schema.object(topCategoriesSchema),
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/job_validation.ts b/x-pack/plugins/ml/server/routes/job_validation.ts
index dd2bd9deadf43f..632166d6d5fb8f 100644
--- a/x-pack/plugins/ml/server/routes/job_validation.ts
+++ b/x-pack/plugins/ml/server/routes/job_validation.ts
@@ -57,6 +57,9 @@ export function jobValidationRoutes({ router, mlLicense }: RouteInitialization,
validate: {
body: estimateBucketSpanSchema,
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -106,6 +109,9 @@ export function jobValidationRoutes({ router, mlLicense }: RouteInitialization,
validate: {
body: modelMemoryLimitSchema,
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -135,6 +141,9 @@ export function jobValidationRoutes({ router, mlLicense }: RouteInitialization,
validate: {
body: validateCardinalitySchema,
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -167,6 +176,9 @@ export function jobValidationRoutes({ router, mlLicense }: RouteInitialization,
validate: {
body: validateJobSchema,
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/modules.ts b/x-pack/plugins/ml/server/routes/modules.ts
index 2891144fc4574a..622ae66ede4264 100644
--- a/x-pack/plugins/ml/server/routes/modules.ts
+++ b/x-pack/plugins/ml/server/routes/modules.ts
@@ -97,6 +97,9 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
indexPatternTitle: schema.string(),
}),
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -127,6 +130,9 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
...getModuleIdParamSchema(true),
}),
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -161,6 +167,9 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
params: schema.object(getModuleIdParamSchema()),
body: setupModuleBodySchema,
},
+ options: {
+ tags: ['access:ml:canCreateJob'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -218,6 +227,9 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
validate: {
params: schema.object(getModuleIdParamSchema()),
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/notification_settings.ts b/x-pack/plugins/ml/server/routes/notification_settings.ts
index 59458b1e486db2..e4a9abb0784beb 100644
--- a/x-pack/plugins/ml/server/routes/notification_settings.ts
+++ b/x-pack/plugins/ml/server/routes/notification_settings.ts
@@ -22,6 +22,9 @@ export function notificationRoutes({ router, mlLicense }: RouteInitialization) {
{
path: '/api/ml/notification_settings',
validate: false,
+ options: {
+ tags: ['access:ml:canAccessML'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/results_service.ts b/x-pack/plugins/ml/server/routes/results_service.ts
index 89c267340fe52f..94ca0827ccfa59 100644
--- a/x-pack/plugins/ml/server/routes/results_service.ts
+++ b/x-pack/plugins/ml/server/routes/results_service.ts
@@ -88,6 +88,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
validate: {
body: anomaliesTableDataSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -117,6 +120,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
validate: {
body: categoryDefinitionSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -146,6 +152,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
validate: {
body: maxAnomalyScoreSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -175,6 +184,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
validate: {
body: categoryExamplesSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
@@ -204,6 +216,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
validate: {
body: partitionFieldValuesSchema,
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/routes/system.ts b/x-pack/plugins/ml/server/routes/system.ts
index d5fe45728c56c7..7ae7dd8eef0653 100644
--- a/x-pack/plugins/ml/server/routes/system.ts
+++ b/x-pack/plugins/ml/server/routes/system.ts
@@ -54,6 +54,9 @@ export function systemRoutes(
validate: {
body: schema.maybe(schema.any()),
},
+ options: {
+ tags: ['access:ml:canAccessML'],
+ },
},
mlLicense.basicLicenseAPIGuard(async (context, request, response) => {
try {
@@ -110,6 +113,9 @@ export function systemRoutes(
{
path: '/api/ml/ml_capabilities',
validate: false,
+ options: {
+ tags: ['access:ml:canAccessML'],
+ },
},
mlLicense.basicLicenseAPIGuard(async (context, request, response) => {
try {
@@ -150,7 +156,11 @@ export function systemRoutes(
{
path: '/api/ml/ml_node_count',
validate: false,
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
+
mlLicense.basicLicenseAPIGuard(async (context, request, response) => {
try {
// check for basic license first for consistency with other
@@ -201,6 +211,9 @@ export function systemRoutes(
{
path: '/api/ml/info',
validate: false,
+ options: {
+ tags: ['access:ml:canAccessML'],
+ },
},
mlLicense.basicLicenseAPIGuard(async (context, request, response) => {
try {
@@ -229,6 +242,9 @@ export function systemRoutes(
validate: {
body: schema.maybe(schema.any()),
},
+ options: {
+ tags: ['access:ml:canGetJobs'],
+ },
},
mlLicense.fullLicenseAPIGuard(async (context, request, response) => {
try {
diff --git a/x-pack/plugins/ml/server/types.ts b/x-pack/plugins/ml/server/types.ts
index d4cd61a7fa4f71..678e81d3526ac8 100644
--- a/x-pack/plugins/ml/server/types.ts
+++ b/x-pack/plugins/ml/server/types.ts
@@ -30,10 +30,6 @@ export interface SystemRouteDeps {
resolveMlCapabilities: ResolveMlCapabilities;
}
-export interface JobServiceRouteDeps {
- resolveMlCapabilities: ResolveMlCapabilities;
-}
-
export interface PluginsSetup {
cloud: CloudSetup;
features: FeaturesPluginSetup;
diff --git a/x-pack/plugins/monitoring/common/constants.ts b/x-pack/plugins/monitoring/common/constants.ts
index edd6142455dfb6..eeed7b4d5acf61 100644
--- a/x-pack/plugins/monitoring/common/constants.ts
+++ b/x-pack/plugins/monitoring/common/constants.ts
@@ -245,7 +245,7 @@ export const ALERT_TYPES = [ALERT_TYPE_LICENSE_EXPIRATION, ALERT_TYPE_CLUSTER_ST
/**
* Matches the id for the built-in in email action type
- * See x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
+ * See x-pack/plugins/actions/server/builtin_action_types/email.ts
*/
export const ALERT_ACTION_TYPE_EMAIL = '.email';
diff --git a/x-pack/plugins/security/public/account_management/account_management_app.ts b/x-pack/plugins/security/public/account_management/account_management_app.ts
index cd3ef34858b19c..41567a04fe0302 100644
--- a/x-pack/plugins/security/public/account_management/account_management_app.ts
+++ b/x-pack/plugins/security/public/account_management/account_management_app.ts
@@ -7,7 +7,6 @@
import { i18n } from '@kbn/i18n';
import { StartServicesAccessor, ApplicationSetup, AppMountParameters } from 'src/core/public';
import { AuthenticationServiceSetup } from '../authentication';
-import { UserAPIClient } from '../management';
interface CreateDeps {
application: ApplicationSetup;
@@ -28,9 +27,14 @@ export const accountManagementApp = Object.freeze({
navLinkStatus: 3,
appRoute: '/security/account',
async mount({ element }: AppMountParameters) {
- const [[coreStart], { renderAccountManagementPage }] = await Promise.all([
+ const [
+ [coreStart],
+ { renderAccountManagementPage },
+ { UserAPIClient },
+ ] = await Promise.all([
getStartServices(),
import('./account_management_page'),
+ import('../management'),
]);
coreStart.chrome.setBreadcrumbs([{ text: title }]);
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/_index.scss b/x-pack/plugins/security/public/authentication/access_agreement/_index.scss
deleted file mode 100644
index dbab8347b096f1..00000000000000
--- a/x-pack/plugins/security/public/authentication/access_agreement/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './access_agreement_page';
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/_access_agreement_page.scss b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss
similarity index 100%
rename from x-pack/plugins/security/public/authentication/access_agreement/_access_agreement_page.scss
rename to x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.scss
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
index 0315e229c678b9..a34dcb18d2b9cc 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import './_index.scss';
+import './access_agreement_page.scss';
import React, { FormEvent, MouseEvent, useCallback, useEffect, useState } from 'react';
import ReactDOM from 'react-dom';
diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/_authentication_state_page.scss b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss
similarity index 100%
rename from x-pack/plugins/security/public/authentication/components/authentication_state_page/_authentication_state_page.scss
rename to x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.scss
diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx
index 7567f455bcca67..35be650d127fb7 100644
--- a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx
+++ b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import './_authentication_state_page.scss';
+import './authentication_state_page.scss';
import { EuiIcon, EuiSpacer, EuiTitle } from '@elastic/eui';
import React from 'react';
diff --git a/x-pack/plugins/security/public/authentication/login/_login_page.scss b/x-pack/plugins/security/public/authentication/login/login_page.scss
similarity index 100%
rename from x-pack/plugins/security/public/authentication/login/_login_page.scss
rename to x-pack/plugins/security/public/authentication/login/login_page.scss
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.tsx b/x-pack/plugins/security/public/authentication/login/login_page.tsx
index b7ac70f2aaf89e..d24a301ed24ec7 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.tsx
+++ b/x-pack/plugins/security/public/authentication/login/login_page.tsx
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import './_login_page.scss';
+import './login_page.scss';
import React, { Component } from 'react';
import ReactDOM from 'react-dom';
diff --git a/x-pack/plugins/security/public/index.scss b/x-pack/plugins/security/public/index.scss
deleted file mode 100644
index 1bdb8cc178fdf8..00000000000000
--- a/x-pack/plugins/security/public/index.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-$secFormWidth: 460px;
-
-// Management styles
-@import './management/index';
diff --git a/x-pack/plugins/security/public/index.ts b/x-pack/plugins/security/public/index.ts
index fc4e158652a0ae..8016c942240601 100644
--- a/x-pack/plugins/security/public/index.ts
+++ b/x-pack/plugins/security/public/index.ts
@@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import './index.scss';
import { PluginInitializer, PluginInitializerContext } from 'src/core/public';
import {
SecurityPlugin,
diff --git a/x-pack/plugins/security/public/management/_index.scss b/x-pack/plugins/security/public/management/_index.scss
deleted file mode 100644
index 5d419b53230799..00000000000000
--- a/x-pack/plugins/security/public/management/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './roles/index';
-@import './users/index';
-@import './role_mappings/index';
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
index 272fc9cfc2fe6a..b9ec5b35b3f9df 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx
@@ -10,8 +10,6 @@ import { i18n } from '@kbn/i18n';
import { StartServicesAccessor } from 'src/core/public';
import { RegisterManagementAppArgs } from '../../../../../../src/plugins/management/public';
import { PluginStartDependencies } from '../../plugin';
-import { APIKeysGridPage } from './api_keys_grid';
-import { APIKeysAPIClient } from './api_keys_api_client';
import { DocumentationLinksService } from './documentation_links';
interface CreateParams {
@@ -28,7 +26,6 @@ export const apiKeysManagementApp = Object.freeze({
defaultMessage: 'API Keys',
}),
async mount({ basePath, element, setBreadcrumbs }) {
- const [{ docLinks, http, notifications, i18n: i18nStart }] = await getStartServices();
setBreadcrumbs([
{
text: i18n.translate('xpack.security.apiKeys.breadcrumb', {
@@ -38,6 +35,16 @@ export const apiKeysManagementApp = Object.freeze({
},
]);
+ const [
+ [{ docLinks, http, notifications, i18n: i18nStart }],
+ { APIKeysGridPage },
+ { APIKeysAPIClient },
+ ] = await Promise.all([
+ getStartServices(),
+ import('./api_keys_grid'),
+ import('./api_keys_api_client'),
+ ]);
+
render(
;
@@ -31,7 +27,6 @@ export const roleMappingsManagementApp = Object.freeze({
defaultMessage: 'Role Mappings',
}),
async mount({ basePath, element, setBreadcrumbs }) {
- const [{ docLinks, http, notifications, i18n: i18nStart }] = await getStartServices();
const roleMappingsBreadcrumbs = [
{
text: i18n.translate('xpack.security.roleMapping.breadcrumb', {
@@ -41,6 +36,20 @@ export const roleMappingsManagementApp = Object.freeze({
},
];
+ const [
+ [{ docLinks, http, notifications, i18n: i18nStart }],
+ { RoleMappingsGridPage },
+ { EditRoleMappingPage },
+ { RoleMappingsAPIClient },
+ { RolesAPIClient },
+ ] = await Promise.all([
+ getStartServices(),
+ import('./role_mappings_grid'),
+ import('./edit_role_mapping'),
+ import('./role_mappings_api_client'),
+ import('../roles'),
+ ]);
+
const roleMappingsAPIClient = new RoleMappingsAPIClient(http);
const dockLinksService = new DocumentationLinksService(docLinks);
const RoleMappingsGridPageWithBreadcrumbs = () => {
diff --git a/x-pack/plugins/security/public/management/roles/_index.scss b/x-pack/plugins/security/public/management/roles/_index.scss
deleted file mode 100644
index 5256c79f01f10f..00000000000000
--- a/x-pack/plugins/security/public/management/roles/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './edit_role/index';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/_index.scss b/x-pack/plugins/security/public/management/roles/edit_role/_index.scss
deleted file mode 100644
index 0153b1734ceba0..00000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './collapsible_panel/index';
-@import './spaces_popover_list/index';
-@import './privileges/index';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/_index.scss b/x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/_index.scss
deleted file mode 100644
index c0f4f8ab9a8701..00000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './collapsible_panel';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/_collapsible_panel.scss b/x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/collapsible_panel.scss
similarity index 100%
rename from x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/_collapsible_panel.scss
rename to x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/collapsible_panel.scss
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/collapsible_panel.tsx b/x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/collapsible_panel.tsx
index 01af7cb4509f64..eb1417600e19b5 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/collapsible_panel.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/collapsible_panel/collapsible_panel.tsx
@@ -4,6 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import './collapsible_panel.scss';
+
import {
EuiFlexGroup,
EuiFlexItem,
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/_index.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/_index.scss
deleted file mode 100644
index a1a9d038065e61..00000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './privilege_feature_icon';
-@import './kibana/index';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/_index.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/_index.scss
deleted file mode 100644
index 19547c0e1953e0..00000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './feature_table/index';
-@import './space_aware_privilege_section/index';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/_index.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/_index.scss
deleted file mode 100644
index 6a96553742819f..00000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './change_all_privileges';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/_change_all_privileges.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.scss
similarity index 100%
rename from x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/_change_all_privileges.scss
rename to x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.scss
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx
index 2083778e539980..5d7b13acf79da6 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table/change_all_privileges.tsx
@@ -3,6 +3,9 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
+
+import './change_all_privileges.scss';
+
import { EuiContextMenuItem, EuiContextMenuPanel, EuiLink, EuiPopover } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import _ from 'lodash';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/_privilege_feature_icon.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.scss
similarity index 100%
rename from x-pack/plugins/security/public/management/roles/edit_role/privileges/_privilege_feature_icon.scss
rename to x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.scss
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx
index 9e4a3a8a99b565..77445952f3d692 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/feature_table_cell/feature_table_cell.tsx
@@ -4,6 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import './feature_table_cell.scss';
+
import React from 'react';
import { EuiText, EuiIconTip, EuiIcon, IconType } from '@elastic/eui';
import { SecuredFeature } from '../../../../model';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/_index.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/_index.scss
deleted file mode 100644
index 3f40f21e102a1d..00000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './privilege_matrix';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/_privilege_matrix.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/_privilege_matrix.scss
deleted file mode 100644
index 8f47727fdf8d62..00000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/_privilege_matrix.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * 1. Allow table to scroll both directions
- */
-
-.secPrivilegeMatrix__modal,
-.secPrivilegeMatrix__modal .euiModal__flex {
- overflow: hidden; /* 1 */
-}
-
-.secPrivilegeMatrix__row--isBasePrivilege,
-.secPrivilegeMatrix__cell--isGlobalPrivilege,
-.secPrivilegeTable__row--isGlobalSpace {
- background-color: $euiColorLightestShade;
-}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.scss b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.scss
new file mode 100644
index 00000000000000..8e2a3b0512afbf
--- /dev/null
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.scss
@@ -0,0 +1,3 @@
+.secPrivilegeTable__row--isGlobalSpace {
+ background-color: $euiColorLightestShade;
+}
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index ccb5398a11b236..30a275876fdc79 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -3,6 +3,9 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
+
+import './privilege_space_table.scss';
+
import {
EuiBadge,
EuiBadgeProps,
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/_index.scss b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/_index.scss
deleted file mode 100644
index b40a32cb8df96b..00000000000000
--- a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './spaces_popover_list';
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/_spaces_popover_list.scss b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.scss
similarity index 100%
rename from x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/_spaces_popover_list.scss
rename to x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.scss
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
index 92e42ec811afce..63ee311f3155ed 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/spaces_popover_list/spaces_popover_list.tsx
@@ -4,6 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import './spaces_popover_list.scss';
+
import {
EuiButtonEmpty,
EuiContextMenuItem,
diff --git a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
index e1a10fdc2b8c33..9aaa3b47f3b193 100644
--- a/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
+++ b/x-pack/plugins/security/public/management/roles/roles_management_app.tsx
@@ -12,13 +12,7 @@ import { StartServicesAccessor, FatalErrorsSetup } from 'src/core/public';
import { RegisterManagementAppArgs } from '../../../../../../src/plugins/management/public';
import { SecurityLicense } from '../../../common/licensing';
import { PluginStartDependencies } from '../../plugin';
-import { UserAPIClient } from '../users';
-import { RolesAPIClient } from './roles_api_client';
-import { RolesGridPage } from './roles_grid';
-import { EditRolePage } from './edit_role';
import { DocumentationLinksService } from './documentation_links';
-import { IndicesAPIClient } from './indices_api_client';
-import { PrivilegesAPIClient } from './privileges_api_client';
interface CreateParams {
fatalErrors: FatalErrorsSetup;
@@ -34,11 +28,6 @@ export const rolesManagementApp = Object.freeze({
order: 20,
title: i18n.translate('xpack.security.management.rolesTitle', { defaultMessage: 'Roles' }),
async mount({ basePath, element, setBreadcrumbs }) {
- const [
- { application, docLinks, http, i18n: i18nStart, injectedMetadata, notifications },
- { data, features },
- ] = await getStartServices();
-
const rolesBreadcrumbs = [
{
text: i18n.translate('xpack.security.roles.breadcrumb', { defaultMessage: 'Roles' }),
@@ -46,6 +35,27 @@ export const rolesManagementApp = Object.freeze({
},
];
+ const [
+ [
+ { application, docLinks, http, i18n: i18nStart, injectedMetadata, notifications },
+ { data, features },
+ ],
+ { RolesGridPage },
+ { EditRolePage },
+ { RolesAPIClient },
+ { IndicesAPIClient },
+ { PrivilegesAPIClient },
+ { UserAPIClient },
+ ] = await Promise.all([
+ getStartServices(),
+ import('./roles_grid'),
+ import('./edit_role'),
+ import('./roles_api_client'),
+ import('./indices_api_client'),
+ import('./privileges_api_client'),
+ import('../users'),
+ ]);
+
const rolesAPIClient = new RolesAPIClient(http);
const RolesGridPageWithBreadcrumbs = () => {
setBreadcrumbs(rolesBreadcrumbs);
diff --git a/x-pack/plugins/security/public/management/users/_index.scss b/x-pack/plugins/security/public/management/users/_index.scss
deleted file mode 100644
index 35df0c1b965837..00000000000000
--- a/x-pack/plugins/security/public/management/users/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './edit_user/index';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/_index.scss b/x-pack/plugins/security/public/management/users/edit_user/_index.scss
deleted file mode 100644
index 734ba7882ba72c..00000000000000
--- a/x-pack/plugins/security/public/management/users/edit_user/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './edit_user_page';
diff --git a/x-pack/plugins/security/public/management/users/edit_user/_edit_user_page.scss b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.scss
similarity index 76%
rename from x-pack/plugins/security/public/management/users/edit_user/_edit_user_page.scss
rename to x-pack/plugins/security/public/management/users/edit_user/edit_user_page.scss
index 7b24b74aceba0c..727fac4782752d 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/_edit_user_page.scss
+++ b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.scss
@@ -1,5 +1,5 @@
.secUsersEditPage__content {
- max-width: $secFormWidth;
+ max-width: 460px;
margin-left: auto;
margin-right: auto;
flex-grow: 0;
diff --git a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx
index 6417ce81b647d5..1c8130029bb501 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.tsx
@@ -3,6 +3,9 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
+
+import './edit_user_page.scss';
+
import { get } from 'lodash';
import React, { Component, Fragment, ChangeEvent } from 'react';
import {
diff --git a/x-pack/plugins/security/public/management/users/users_management_app.tsx b/x-pack/plugins/security/public/management/users/users_management_app.tsx
index 82a2b8d2a98ada..9d337c1508ad48 100644
--- a/x-pack/plugins/security/public/management/users/users_management_app.tsx
+++ b/x-pack/plugins/security/public/management/users/users_management_app.tsx
@@ -12,10 +12,6 @@ import { StartServicesAccessor } from 'src/core/public';
import { RegisterManagementAppArgs } from '../../../../../../src/plugins/management/public';
import { AuthenticationServiceSetup } from '../../authentication';
import { PluginStartDependencies } from '../../plugin';
-import { RolesAPIClient } from '../roles';
-import { UserAPIClient } from './user_api_client';
-import { UsersGridPage } from './users_grid';
-import { EditUserPage } from './edit_user';
interface CreateParams {
authc: AuthenticationServiceSetup;
@@ -30,7 +26,6 @@ export const usersManagementApp = Object.freeze({
order: 10,
title: i18n.translate('xpack.security.management.usersTitle', { defaultMessage: 'Users' }),
async mount({ basePath, element, setBreadcrumbs }) {
- const [{ http, notifications, i18n: i18nStart }] = await getStartServices();
const usersBreadcrumbs = [
{
text: i18n.translate('xpack.security.users.breadcrumb', { defaultMessage: 'Users' }),
@@ -38,6 +33,20 @@ export const usersManagementApp = Object.freeze({
},
];
+ const [
+ [{ http, notifications, i18n: i18nStart }],
+ { UsersGridPage },
+ { EditUserPage },
+ { UserAPIClient },
+ { RolesAPIClient },
+ ] = await Promise.all([
+ getStartServices(),
+ import('./users_grid'),
+ import('./edit_user'),
+ import('./user_api_client'),
+ import('../roles'),
+ ]);
+
const userAPIClient = new UserAPIClient(http);
const rolesAPIClient = new RolesAPIClient(http);
const UsersGridPageWithBreadcrumbs = () => {
diff --git a/x-pack/plugins/security/server/mocks.ts b/x-pack/plugins/security/server/mocks.ts
index ababf12c2be606..a6407366bbd3b2 100644
--- a/x-pack/plugins/security/server/mocks.ts
+++ b/x-pack/plugins/security/server/mocks.ts
@@ -8,6 +8,7 @@ import { SecurityPluginSetup } from './plugin';
import { authenticationMock } from './authentication/index.mock';
import { authorizationMock } from './authorization/index.mock';
+import { licenseMock } from '../common/licensing/index.mock';
function createSetupMock() {
const mockAuthz = authorizationMock.create();
@@ -19,6 +20,7 @@ function createSetupMock() {
mode: mockAuthz.mode,
},
registerSpacesService: jest.fn(),
+ license: licenseMock.create(),
__legacyCompat: {} as SecurityPluginSetup['__legacyCompat'],
};
}
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index 22a30f03c646a1..d58c999ddccdf8 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -50,21 +50,6 @@ describe('Security Plugin', () => {
await expect(plugin.setup(mockCoreSetup, mockDependencies)).resolves.toMatchInlineSnapshot(`
Object {
"__legacyCompat": Object {
- "license": Object {
- "features$": Observable {
- "_isScalar": false,
- "operator": MapOperator {
- "project": [Function],
- "thisArg": undefined,
- },
- "source": Observable {
- "_isScalar": false,
- "_subscribe": [Function],
- },
- },
- "getFeatures": [Function],
- "isEnabled": [Function],
- },
"registerLegacyAPI": [Function],
"registerPrivilegesWithCluster": [Function],
},
@@ -103,6 +88,21 @@ describe('Security Plugin', () => {
"useRbacForRequest": [Function],
},
},
+ "license": Object {
+ "features$": Observable {
+ "_isScalar": false,
+ "operator": MapOperator {
+ "project": [Function],
+ "thisArg": undefined,
+ },
+ "source": Observable {
+ "_isScalar": false,
+ "_subscribe": [Function],
+ },
+ },
+ "getFeatures": [Function],
+ "isEnabled": [Function],
+ },
"registerSpacesService": [Function],
}
`);
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index e30b0caf76ddc0..97f5aea888dc7c 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -59,6 +59,7 @@ export interface SecurityPluginSetup {
| 'invalidateAPIKeyAsInternalUser'
>;
authz: Pick;
+ license: SecurityLicense;
/**
* If Spaces plugin is available it's supposed to register its SpacesService with Security plugin
@@ -73,7 +74,6 @@ export interface SecurityPluginSetup {
__legacyCompat: {
registerLegacyAPI: (legacyAPI: LegacyAPI) => void;
registerPrivilegesWithCluster: () => void;
- license: SecurityLicense;
};
}
@@ -194,6 +194,8 @@ export class Plugin {
mode: authz.mode,
},
+ license,
+
registerSpacesService: service => {
if (this.wasSpacesServiceAccessed()) {
throw new Error('Spaces service has been accessed before registration.');
@@ -206,8 +208,6 @@ export class Plugin {
registerLegacyAPI: (legacyAPI: LegacyAPI) => (this.legacyAPI = legacyAPI),
registerPrivilegesWithCluster: async () => await authz.registerPrivilegesWithCluster(),
-
- license,
},
});
}
diff --git a/x-pack/plugins/siem/public/lib/telemetry/middleware.ts b/x-pack/plugins/siem/public/lib/telemetry/middleware.ts
index 59c6cb35669070..ca889e20e695f3 100644
--- a/x-pack/plugins/siem/public/lib/telemetry/middleware.ts
+++ b/x-pack/plugins/siem/public/lib/telemetry/middleware.ts
@@ -7,7 +7,7 @@
import { Action, Dispatch, MiddlewareAPI } from 'redux';
import { track, METRIC_TYPE, TELEMETRY_EVENT } from './';
-import { timelineActions } from '../../store/actions';
+import * as timelineActions from '../../store/timeline/actions';
export const telemetryMiddleware = (api: MiddlewareAPI) => (next: Dispatch) => (action: Action) => {
if (timelineActions.endTimelineSaving.match(action)) {
diff --git a/x-pack/plugins/siem/public/store/model.ts b/x-pack/plugins/siem/public/store/model.ts
index 9e9e663a59fe09..686dc096e61b01 100644
--- a/x-pack/plugins/siem/public/store/model.ts
+++ b/x-pack/plugins/siem/public/store/model.ts
@@ -9,15 +9,4 @@ export { dragAndDropModel } from './drag_and_drop';
export { hostsModel } from './hosts';
export { inputsModel } from './inputs';
export { networkModel } from './network';
-
-export type KueryFilterQueryKind = 'kuery' | 'lucene';
-
-export interface KueryFilterQuery {
- kind: KueryFilterQueryKind;
- expression: string;
-}
-
-export interface SerializedFilterQuery {
- kuery: KueryFilterQuery | null;
- serializedQuery: string;
-}
+export * from './types';
diff --git a/x-pack/plugins/siem/public/store/timeline/actions.ts b/x-pack/plugins/siem/public/store/timeline/actions.ts
index a03cc2643e014a..12155decf40d44 100644
--- a/x-pack/plugins/siem/public/store/timeline/actions.ts
+++ b/x-pack/plugins/siem/public/store/timeline/actions.ts
@@ -12,7 +12,7 @@ import {
DataProvider,
QueryOperator,
} from '../../components/timeline/data_providers/data_provider';
-import { KueryFilterQuery, SerializedFilterQuery } from '../model';
+import { KueryFilterQuery, SerializedFilterQuery } from '../types';
import { EventType, KqlMode, TimelineModel, ColumnHeaderOptions } from './model';
import { TimelineNonEcsData } from '../../graphql/types';
diff --git a/x-pack/plugins/siem/public/store/types.ts b/x-pack/plugins/siem/public/store/types.ts
new file mode 100644
index 00000000000000..2c679ba41116ee
--- /dev/null
+++ b/x-pack/plugins/siem/public/store/types.ts
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+
+export type KueryFilterQueryKind = 'kuery' | 'lucene';
+
+export interface KueryFilterQuery {
+ kind: KueryFilterQueryKind;
+ expression: string;
+}
+
+export interface SerializedFilterQuery {
+ kuery: KueryFilterQuery | null;
+ serializedQuery: string;
+}
diff --git a/x-pack/plugins/siem/server/lib/detection_engine/scripts/get_action_instances.sh b/x-pack/plugins/siem/server/lib/detection_engine/scripts/get_action_instances.sh
index 750c5574f4a729..2028216e6770f2 100755
--- a/x-pack/plugins/siem/server/lib/detection_engine/scripts/get_action_instances.sh
+++ b/x-pack/plugins/siem/server/lib/detection_engine/scripts/get_action_instances.sh
@@ -10,7 +10,7 @@ set -e
./check_env_variables.sh
# Example: ./get_action_instances.sh
-# https://github.com/elastic/kibana/blob/master/x-pack/legacy/plugins/actions/README.md#get-apiaction_find-find-actions
+# https://github.com/elastic/kibana/blob/master/x-pack/plugins/actions/README.md#get-apiaction_find-find-actions
curl -s -k \
-u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
-X GET ${KIBANA_URL}${SPACE_URL}/api/action/_getAll \
diff --git a/x-pack/plugins/siem/server/lib/detection_engine/scripts/get_action_types.sh b/x-pack/plugins/siem/server/lib/detection_engine/scripts/get_action_types.sh
index 8d8cbdd70a8036..c587e9a2041822 100755
--- a/x-pack/plugins/siem/server/lib/detection_engine/scripts/get_action_types.sh
+++ b/x-pack/plugins/siem/server/lib/detection_engine/scripts/get_action_types.sh
@@ -10,7 +10,7 @@ set -e
./check_env_variables.sh
# Example: ./get_action_types.sh
-# https://github.com/elastic/kibana/blob/master/x-pack/legacy/plugins/actions/README.md
+# https://github.com/elastic/kibana/blob/master/x-pack/plugins/actions/README.md
curl -s -k \
-u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
-X GET ${KIBANA_URL}${SPACE_URL}/api/action/types \
diff --git a/x-pack/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts b/x-pack/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
index d298f1cc7cbc66..a8cc6dc6804102 100644
--- a/x-pack/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
+++ b/x-pack/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
@@ -4,7 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { flow, set, omit } from 'lodash/fp';
+import { flow, omit } from 'lodash/fp';
+import set from 'set-value';
import { SearchResponse } from 'elasticsearch';
import { Logger } from '../../../../../../../src/core/server';
@@ -55,8 +56,11 @@ export const transformAnomalyFieldsToEcs = (anomaly: Anomaly): EcsAnomaly => {
}
const omitDottedFields = omit(errantFields.map(field => field.name));
- const setNestedFields = errantFields.map(field => set(field.name, field.value));
- const setTimestamp = set('@timestamp', new Date(timestamp).toISOString());
+ const setNestedFields = errantFields.map(field => (_anomaly: Anomaly) =>
+ set(_anomaly, field.name, field.value)
+ );
+ const setTimestamp = (_anomaly: Anomaly) =>
+ set(_anomaly, '@timestamp', new Date(timestamp).toISOString());
return flow(omitDottedFields, setNestedFields, setTimestamp)(anomaly);
};
diff --git a/x-pack/plugins/spaces/server/saved_objects/migrations/migrate_6x.ts b/x-pack/plugins/spaces/server/saved_objects/migrations/migrate_6x.ts
index b063404f68e4fb..65a810ff94a1f5 100644
--- a/x-pack/plugins/spaces/server/saved_objects/migrations/migrate_6x.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/migrations/migrate_6x.ts
@@ -6,7 +6,7 @@
import { SavedObjectMigrationFn } from 'src/core/server';
-export const migrateToKibana660: SavedObjectMigrationFn = doc => {
+export const migrateToKibana660: SavedObjectMigrationFn = doc => {
if (!doc.attributes.hasOwnProperty('disabledFeatures')) {
doc.attributes.disabledFeatures = [];
}
diff --git a/x-pack/plugins/task_manager/server/plugin.ts b/x-pack/plugins/task_manager/server/plugin.ts
index a70fbdb18c30b6..0f6e3fc31d96d6 100644
--- a/x-pack/plugins/task_manager/server/plugin.ts
+++ b/x-pack/plugins/task_manager/server/plugin.ts
@@ -12,11 +12,10 @@ import { TaskManager } from './task_manager';
import { createTaskManager } from './create_task_manager';
import { TaskManagerConfig } from './config';
import { Middleware } from './lib/middleware';
+import { setupSavedObjects } from './saved_objects';
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface PluginLegacyDependencies {}
export type TaskManagerSetupContract = {
- registerLegacyAPI: (legacyDependencies: PluginLegacyDependencies) => Promise;
+ registerLegacyAPI: () => Promise;
} & Pick;
export type TaskManagerStartContract = Pick<
@@ -35,12 +34,18 @@ export class TaskManagerPlugin
this.currentConfig = {} as TaskManagerConfig;
}
- public setup(core: CoreSetup, plugins: unknown): TaskManagerSetupContract {
+ public async setup(core: CoreSetup, plugins: unknown): Promise {
const logger = this.initContext.logger.get('taskManager');
- const config$ = this.initContext.config.create();
+ const config = await this.initContext.config
+ .create()
+ .pipe(first())
+ .toPromise();
+
+ setupSavedObjects(core.savedObjects, config);
+
return {
- registerLegacyAPI: once((__LEGACY: PluginLegacyDependencies) => {
- config$.subscribe(async config => {
+ registerLegacyAPI: once(() => {
+ (async () => {
const [{ savedObjects, elasticsearch }] = await core.getStartServices();
const savedObjectsRepository = savedObjects.createInternalRepository(['task']);
this.legacyTaskManager$.next(
@@ -53,7 +58,7 @@ export class TaskManagerPlugin
})
);
this.legacyTaskManager$.complete();
- });
+ })();
return this.taskManager;
}),
addMiddleware: (middleware: Middleware) => {
diff --git a/x-pack/plugins/task_manager/server/saved_objects/index.ts b/x-pack/plugins/task_manager/server/saved_objects/index.ts
new file mode 100644
index 00000000000000..0ad9021cd7f39c
--- /dev/null
+++ b/x-pack/plugins/task_manager/server/saved_objects/index.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { SavedObjectsServiceSetup } from 'kibana/server';
+import mappings from './mappings.json';
+import { TaskManagerConfig } from '../config.js';
+
+export function setupSavedObjects(
+ savedObjects: SavedObjectsServiceSetup,
+ config: TaskManagerConfig
+) {
+ savedObjects.registerType({
+ name: 'task',
+ namespaceType: 'agnostic',
+ hidden: true,
+ convertToAliasScript: `ctx._id = ctx._source.type + ':' + ctx._id`,
+ mappings: mappings.task,
+ indexPattern: config.index,
+ });
+}
diff --git a/x-pack/legacy/plugins/task_manager/server/mappings.json b/x-pack/plugins/task_manager/server/saved_objects/mappings.json
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/server/mappings.json
rename to x-pack/plugins/task_manager/server/saved_objects/mappings.json
diff --git a/x-pack/legacy/plugins/task_manager/server/migrations.ts b/x-pack/plugins/task_manager/server/saved_objects/migrations.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/server/migrations.ts
rename to x-pack/plugins/task_manager/server/saved_objects/migrations.ts
diff --git a/x-pack/plugins/task_manager/server/task_manager.ts b/x-pack/plugins/task_manager/server/task_manager.ts
index 24ceea0fe71ef2..2a45a599120ddc 100644
--- a/x-pack/plugins/task_manager/server/task_manager.ts
+++ b/x-pack/plugins/task_manager/server/task_manager.ts
@@ -240,7 +240,7 @@ export class TaskManager {
* @param taskDefinitions - The Kibana task definitions dictionary
*/
public registerTaskDefinitions(taskDefinitions: TaskDictionary) {
- this.assertUninitialized('register task definitions');
+ this.assertUninitialized('register task definitions', Object.keys(taskDefinitions).join(', '));
const duplicate = Object.keys(taskDefinitions).find(k => !!this.definitions[k]);
if (duplicate) {
throw new Error(`Task ${duplicate} is already defined!`);
@@ -360,9 +360,11 @@ export class TaskManager {
* @param {string} message shown if task manager is already initialized
* @returns void
*/
- private assertUninitialized(message: string) {
+ private assertUninitialized(message: string, context?: string) {
if (this.isStarted) {
- throw new Error(`Cannot ${message} after the task manager is initialized!`);
+ throw new Error(
+ `${context ? `[${context}] ` : ''}Cannot ${message} after the task manager is initialized`
+ );
}
}
}
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index cdff34ec3a6039..81dc44f3a4cb41 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -8225,11 +8225,8 @@
"xpack.ingestManager.agentConfigList.addButton": "エージェント構成を作成",
"xpack.ingestManager.agentConfigList.agentsColumnTitle": "エージェント",
"xpack.ingestManager.agentConfigList.clearFiltersLinkText": "フィルターを消去",
- "xpack.ingestManager.agentConfigList.copyConfigActionText": "構成をコピー",
"xpack.ingestManager.agentConfigList.createDatasourceActionText": "データソースを作成",
"xpack.ingestManager.agentConfigList.datasourcesCountColumnTitle": "データソース",
- "xpack.ingestManager.agentConfigList.deleteButton": "{count, plural, one {# エージェント設定} other {# エージェント設定}}を削除",
- "xpack.ingestManager.agentConfigList.deleteConfigActionText": "構成の削除",
"xpack.ingestManager.agentConfigList.descriptionColumnTitle": "説明",
"xpack.ingestManager.agentConfigList.loadingAgentConfigsMessage": "エージェント構成を読み込み中...",
"xpack.ingestManager.agentConfigList.nameColumnTitle": "名前",
@@ -8313,7 +8310,6 @@
"xpack.ingestManager.configDetails.configDetailsTitle": "構成「{id}」",
"xpack.ingestManager.configDetails.configNotFoundErrorTitle": "構成「{id}」が見つかりません",
"xpack.ingestManager.configDetails.datasourcesTable.actionsColumnTitle": "アクション",
- "xpack.ingestManager.configDetails.datasourcesTable.copyActionTitle": "データソースをコピー",
"xpack.ingestManager.configDetails.datasourcesTable.deleteActionTitle": "データソースを削除",
"xpack.ingestManager.configDetails.datasourcesTable.descriptionColumnTitle": "説明",
"xpack.ingestManager.configDetails.datasourcesTable.editActionTitle": "データソースを編集",
@@ -8321,7 +8317,6 @@
"xpack.ingestManager.configDetails.datasourcesTable.namespaceColumnTitle": "名前空間",
"xpack.ingestManager.configDetails.datasourcesTable.packageNameColumnTitle": "パッケージ",
"xpack.ingestManager.configDetails.datasourcesTable.streamsCountColumnTitle": "ストリーム",
- "xpack.ingestManager.configDetails.datasourcesTable.viewActionTitle": "データソースを表示",
"xpack.ingestManager.configDetails.subTabs.datasouces": "データソース",
"xpack.ingestManager.configDetails.subTabs.settings": "設定",
"xpack.ingestManager.configDetails.subTabs.yamlFile": "YAML ファイル",
@@ -10505,10 +10500,9 @@
"xpack.ml.overview.feedbackSectionTitle": "フィードバック",
"xpack.ml.overview.gettingStartedSectionCreateJob": "新規ジョブを作成中",
"xpack.ml.overview.gettingStartedSectionDocs": "ドキュメンテーション",
- "xpack.ml.overview.gettingStartedSectionText": "機械学習へようこそ。はじめに{docs}や{createJob}をご参照ください。Elastic Stackの機械学習の詳細については、{whatIsMachineLearning}をご覧ください。{transforms}を使用して、分析ジョブの機能インデックスを作成することをお勧めします。",
+ "xpack.ml.overview.gettingStartedSectionText": "機械学習へようこそ。はじめに{docs}や{createJob}をご参照ください。{transforms}を使用して、分析ジョブの機能インデックスを作成することをお勧めします。",
"xpack.ml.overview.gettingStartedSectionTitle": "はじめて使う",
"xpack.ml.overview.gettingStartedSectionTransforms": "Elasticsearchの変換",
- "xpack.ml.overview.gettingStartedSectionWhatIsMachineLearning": "こちら",
"xpack.ml.overview.overviewLabel": "概要",
"xpack.ml.overview.statsBar.failedAnalyticsLabel": "失敗",
"xpack.ml.overview.statsBar.runningAnalyticsLabel": "実行中",
@@ -16112,7 +16106,6 @@
"xpack.uptime.emptyStateError.notAuthorized": "アップタイムデータの表示が承認されていません。システム管理者にお問い合わせください。",
"xpack.uptime.emptyStateError.notFoundPage": "ページが見つかりません",
"xpack.uptime.emptyStateError.title": "エラー",
- "xpack.uptime.featureCatalogueDescription": "エンドポイントヘルスチェックとアップタイム監視を行います。",
"xpack.uptime.featureRegistry.uptimeFeatureName": "アップタイム",
"xpack.uptime.filterBar.ariaLabel": "概要ページのインプットフィルター基準",
"xpack.uptime.filterBar.filterDownLabel": "ダウン",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 819112feb9f572..e06edb45de8fa9 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -8228,11 +8228,8 @@
"xpack.ingestManager.agentConfigList.addButton": "创建代理配置",
"xpack.ingestManager.agentConfigList.agentsColumnTitle": "代理",
"xpack.ingestManager.agentConfigList.clearFiltersLinkText": "清除筛选",
- "xpack.ingestManager.agentConfigList.copyConfigActionText": "复制配置",
"xpack.ingestManager.agentConfigList.createDatasourceActionText": "创建数据源",
"xpack.ingestManager.agentConfigList.datasourcesCountColumnTitle": "数据源",
- "xpack.ingestManager.agentConfigList.deleteButton": "删除 {count, plural, one {# 个代理配置} other {# 个代理配置}}",
- "xpack.ingestManager.agentConfigList.deleteConfigActionText": "删除配置",
"xpack.ingestManager.agentConfigList.descriptionColumnTitle": "描述",
"xpack.ingestManager.agentConfigList.loadingAgentConfigsMessage": "正在加载代理配置……",
"xpack.ingestManager.agentConfigList.nameColumnTitle": "名称",
@@ -8316,7 +8313,6 @@
"xpack.ingestManager.configDetails.configDetailsTitle": "配置“{id}”",
"xpack.ingestManager.configDetails.configNotFoundErrorTitle": "未找到配置“{id}”",
"xpack.ingestManager.configDetails.datasourcesTable.actionsColumnTitle": "操作",
- "xpack.ingestManager.configDetails.datasourcesTable.copyActionTitle": "复制数据源",
"xpack.ingestManager.configDetails.datasourcesTable.deleteActionTitle": "删除数据源",
"xpack.ingestManager.configDetails.datasourcesTable.descriptionColumnTitle": "描述",
"xpack.ingestManager.configDetails.datasourcesTable.editActionTitle": "编辑数据源",
@@ -8324,7 +8320,6 @@
"xpack.ingestManager.configDetails.datasourcesTable.namespaceColumnTitle": "命名空间",
"xpack.ingestManager.configDetails.datasourcesTable.packageNameColumnTitle": "软件包",
"xpack.ingestManager.configDetails.datasourcesTable.streamsCountColumnTitle": "流计数",
- "xpack.ingestManager.configDetails.datasourcesTable.viewActionTitle": "查看数据源",
"xpack.ingestManager.configDetails.subTabs.datasouces": "数据源",
"xpack.ingestManager.configDetails.subTabs.settings": "设置",
"xpack.ingestManager.configDetails.subTabs.yamlFile": "YAML 文件",
@@ -10508,10 +10503,9 @@
"xpack.ml.overview.feedbackSectionTitle": "反馈",
"xpack.ml.overview.gettingStartedSectionCreateJob": "创建新作业",
"xpack.ml.overview.gettingStartedSectionDocs": "文档",
- "xpack.ml.overview.gettingStartedSectionText": "欢迎使用 Machine Learning。首先阅读我们的{docs}或{createJob}。有关 Elastic Stack 中的机器学习的详情，请参阅{whatIsMachineLearning}。建议使用 {transforms}为分析作业创建功能索引。",
+ "xpack.ml.overview.gettingStartedSectionText": "欢迎使用 Machine Learning。首先阅读我们的{docs}或{createJob}。建议使用 {transforms}为分析作业创建功能索引。",
"xpack.ml.overview.gettingStartedSectionTitle": "入门",
"xpack.ml.overview.gettingStartedSectionTransforms": "Elasticsearch 的转换",
- "xpack.ml.overview.gettingStartedSectionWhatIsMachineLearning": "此处",
"xpack.ml.overview.overviewLabel": "概览",
"xpack.ml.overview.statsBar.failedAnalyticsLabel": "失败",
"xpack.ml.overview.statsBar.runningAnalyticsLabel": "正在运行",
@@ -16117,7 +16111,6 @@
"xpack.uptime.emptyStateError.notAuthorized": "您无权查看 Uptime 数据，请联系系统管理员。",
"xpack.uptime.emptyStateError.notFoundPage": "未找到页面",
"xpack.uptime.emptyStateError.title": "错误",
- "xpack.uptime.featureCatalogueDescription": "执行终端节点运行状况检查和运行时间监测。",
"xpack.uptime.featureRegistry.uptimeFeatureName": "运行时间",
"xpack.uptime.filterBar.ariaLabel": "概览页面的输入筛选条件",
"xpack.uptime.filterBar.filterDownLabel": "关闭",
diff --git a/x-pack/legacy/plugins/uptime/README.md b/x-pack/plugins/uptime/README.md
similarity index 100%
rename from x-pack/legacy/plugins/uptime/README.md
rename to x-pack/plugins/uptime/README.md
diff --git a/x-pack/legacy/plugins/uptime/common/constants/alerts.ts b/x-pack/plugins/uptime/common/constants/alerts.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/alerts.ts
rename to x-pack/plugins/uptime/common/constants/alerts.ts
diff --git a/x-pack/legacy/plugins/uptime/common/constants/capabilities.ts b/x-pack/plugins/uptime/common/constants/capabilities.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/capabilities.ts
rename to x-pack/plugins/uptime/common/constants/capabilities.ts
diff --git a/x-pack/legacy/plugins/uptime/common/constants/chart_format_limits.ts b/x-pack/plugins/uptime/common/constants/chart_format_limits.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/chart_format_limits.ts
rename to x-pack/plugins/uptime/common/constants/chart_format_limits.ts
diff --git a/x-pack/legacy/plugins/uptime/common/constants/client_defaults.ts b/x-pack/plugins/uptime/common/constants/client_defaults.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/client_defaults.ts
rename to x-pack/plugins/uptime/common/constants/client_defaults.ts
diff --git a/x-pack/legacy/plugins/uptime/common/constants/context_defaults.ts b/x-pack/plugins/uptime/common/constants/context_defaults.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/context_defaults.ts
rename to x-pack/plugins/uptime/common/constants/context_defaults.ts
diff --git a/x-pack/legacy/plugins/uptime/common/constants/index.ts b/x-pack/plugins/uptime/common/constants/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/index.ts
rename to x-pack/plugins/uptime/common/constants/index.ts
diff --git a/x-pack/legacy/plugins/uptime/common/constants/plugin.ts b/x-pack/plugins/uptime/common/constants/plugin.ts
similarity index 64%
rename from x-pack/legacy/plugins/uptime/common/constants/plugin.ts
rename to x-pack/plugins/uptime/common/constants/plugin.ts
index 00781726941d5c..6064524872a0ac 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/plugin.ts
+++ b/x-pack/plugins/uptime/common/constants/plugin.ts
@@ -8,12 +8,17 @@ import { i18n } from '@kbn/i18n';
export const PLUGIN = {
APP_ROOT_ID: 'react-uptime-root',
- DESCRIPTION: 'Uptime monitoring',
+ DESCRIPTION: i18n.translate('xpack.uptime.pluginDescription', {
+ defaultMessage: 'Uptime monitoring',
+ description: 'The description text that will appear in the feature catalogue.',
+ }),
ID: 'uptime',
LOCAL_STORAGE_KEY: 'xpack.uptime',
NAME: i18n.translate('xpack.uptime.featureRegistry.uptimeFeatureName', {
defaultMessage: 'Uptime',
}),
ROUTER_BASE_NAME: '/app/uptime#',
- TITLE: 'uptime',
+ TITLE: i18n.translate('xpack.uptime.uptimeFeatureCatalogueTitle', {
+ defaultMessage: 'Uptime',
+ }),
};
diff --git a/x-pack/legacy/plugins/uptime/common/constants/query.ts b/x-pack/plugins/uptime/common/constants/query.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/query.ts
rename to x-pack/plugins/uptime/common/constants/query.ts
diff --git a/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts b/x-pack/plugins/uptime/common/constants/rest_api.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
rename to x-pack/plugins/uptime/common/constants/rest_api.ts
diff --git a/x-pack/legacy/plugins/uptime/common/constants/settings_defaults.ts b/x-pack/plugins/uptime/common/constants/settings_defaults.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/settings_defaults.ts
rename to x-pack/plugins/uptime/common/constants/settings_defaults.ts
diff --git a/x-pack/legacy/plugins/uptime/common/constants/ui.ts b/x-pack/plugins/uptime/common/constants/ui.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/constants/ui.ts
rename to x-pack/plugins/uptime/common/constants/ui.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/alerts/index.ts b/x-pack/plugins/uptime/common/runtime_types/alerts/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/alerts/index.ts
rename to x-pack/plugins/uptime/common/runtime_types/alerts/index.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/alerts/status_check.ts b/x-pack/plugins/uptime/common/runtime_types/alerts/status_check.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/alerts/status_check.ts
rename to x-pack/plugins/uptime/common/runtime_types/alerts/status_check.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/certs.ts b/x-pack/plugins/uptime/common/runtime_types/certs.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/certs.ts
rename to x-pack/plugins/uptime/common/runtime_types/certs.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/common.ts b/x-pack/plugins/uptime/common/runtime_types/common.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/common.ts
rename to x-pack/plugins/uptime/common/runtime_types/common.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/dynamic_settings.ts b/x-pack/plugins/uptime/common/runtime_types/dynamic_settings.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/dynamic_settings.ts
rename to x-pack/plugins/uptime/common/runtime_types/dynamic_settings.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts b/x-pack/plugins/uptime/common/runtime_types/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/index.ts
rename to x-pack/plugins/uptime/common/runtime_types/index.ts
index 78aab3806ae049..e80471bf8b56f9 100644
--- a/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts
+++ b/x-pack/plugins/uptime/common/runtime_types/index.ts
@@ -7,8 +7,8 @@
export * from './alerts';
export * from './certs';
export * from './common';
+export * from './dynamic_settings';
export * from './monitor';
export * from './overview_filters';
export * from './ping';
export * from './snapshot';
-export * from './dynamic_settings';
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/details.ts b/x-pack/plugins/uptime/common/runtime_types/monitor/details.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/monitor/details.ts
rename to x-pack/plugins/uptime/common/runtime_types/monitor/details.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/index.ts b/x-pack/plugins/uptime/common/runtime_types/monitor/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/monitor/index.ts
rename to x-pack/plugins/uptime/common/runtime_types/monitor/index.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/locations.ts b/x-pack/plugins/uptime/common/runtime_types/monitor/locations.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/monitor/locations.ts
rename to x-pack/plugins/uptime/common/runtime_types/monitor/locations.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/monitor/state.ts b/x-pack/plugins/uptime/common/runtime_types/monitor/state.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/monitor/state.ts
rename to x-pack/plugins/uptime/common/runtime_types/monitor/state.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/overview_filters/index.ts b/x-pack/plugins/uptime/common/runtime_types/overview_filters/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/overview_filters/index.ts
rename to x-pack/plugins/uptime/common/runtime_types/overview_filters/index.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/overview_filters/overview_filters.ts b/x-pack/plugins/uptime/common/runtime_types/overview_filters/overview_filters.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/overview_filters/overview_filters.ts
rename to x-pack/plugins/uptime/common/runtime_types/overview_filters/overview_filters.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/ping/histogram.ts b/x-pack/plugins/uptime/common/runtime_types/ping/histogram.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/ping/histogram.ts
rename to x-pack/plugins/uptime/common/runtime_types/ping/histogram.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/ping/index.ts b/x-pack/plugins/uptime/common/runtime_types/ping/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/ping/index.ts
rename to x-pack/plugins/uptime/common/runtime_types/ping/index.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/ping/ping.ts b/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/ping/ping.ts
rename to x-pack/plugins/uptime/common/runtime_types/ping/ping.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/snapshot/index.ts b/x-pack/plugins/uptime/common/runtime_types/snapshot/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/snapshot/index.ts
rename to x-pack/plugins/uptime/common/runtime_types/snapshot/index.ts
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts b/x-pack/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts
rename to x-pack/plugins/uptime/common/runtime_types/snapshot/snapshot_count.ts
diff --git a/x-pack/legacy/plugins/uptime/common/types/index.ts b/x-pack/plugins/uptime/common/types/index.ts
similarity index 69%
rename from x-pack/legacy/plugins/uptime/common/types/index.ts
rename to x-pack/plugins/uptime/common/types/index.ts
index a32eabd49a3e5e..71ccd54dd3cdcd 100644
--- a/x-pack/legacy/plugins/uptime/common/types/index.ts
+++ b/x-pack/plugins/uptime/common/types/index.ts
@@ -4,18 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-/** Represents a bucket of monitor status information. */
-export interface StatusData {
- /** The timeseries point for this status data. */
- x: number;
- /** The value of up counts for this point. */
- up?: number | null;
- /** The value for down counts for this point. */
- down?: number | null;
- /** The total down counts for this point. */
- total?: number | null;
-}
-
/** Represents the average monitor duration ms at a point in time. */
export interface MonitorDurationAveragePoint {
/** The timeseries value for this point. */
diff --git a/x-pack/plugins/uptime/kibana.json b/x-pack/plugins/uptime/kibana.json
index 6ec8a755ebea09..ce8b64ce07254a 100644
--- a/x-pack/plugins/uptime/kibana.json
+++ b/x-pack/plugins/uptime/kibana.json
@@ -2,8 +2,16 @@
"configPath": ["xpack", "uptime"],
"id": "uptime",
"kibanaVersion": "kibana",
- "requiredPlugins": ["alerting", "features", "licensing", "usageCollection"],
+ "optionalPlugins": ["capabilities", "data", "home"],
+ "requiredPlugins": [
+ "alerting",
+ "embeddable",
+ "features",
+ "licensing",
+ "triggers_actions_ui",
+ "usageCollection"
+ ],
"server": true,
- "ui": false,
+ "ui": true,
"version": "8.0.0"
}
diff --git a/x-pack/legacy/plugins/uptime/public/app.ts b/x-pack/plugins/uptime/public/app.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/app.ts
rename to x-pack/plugins/uptime/public/app.ts
diff --git a/x-pack/legacy/plugins/actions/index.ts b/x-pack/plugins/uptime/public/apps/index.ts
similarity index 85%
rename from x-pack/legacy/plugins/actions/index.ts
rename to x-pack/plugins/uptime/public/apps/index.ts
index 276d1ea3accea6..65b80d08d4f20f 100644
--- a/x-pack/legacy/plugins/actions/index.ts
+++ b/x-pack/plugins/uptime/public/apps/index.ts
@@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export * from './server/';
+export { UptimePlugin } from './plugin';
diff --git a/x-pack/plugins/uptime/public/apps/plugin.ts b/x-pack/plugins/uptime/public/apps/plugin.ts
new file mode 100644
index 00000000000000..719dac022dada8
--- /dev/null
+++ b/x-pack/plugins/uptime/public/apps/plugin.ts
@@ -0,0 +1,72 @@
+/*
+ * 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 { LegacyCoreStart, AppMountParameters } from 'src/core/public';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
+import { UMFrontendLibs } from '../lib/lib';
+import { PLUGIN } from '../../common/constants';
+import { FeatureCatalogueCategory } from '../../../../../src/plugins/home/public';
+import { getKibanaFrameworkAdapter } from '../lib/adapters/framework/new_platform_adapter';
+import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public';
+import { EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
+import { TriggersAndActionsUIPublicPluginSetup } from '../../../triggers_actions_ui/public';
+import { DataPublicPluginSetup } from '../../../../../src/plugins/data/public';
+
+export interface StartObject {
+ core: LegacyCoreStart;
+ plugins: any;
+}
+
+export interface ClientPluginsSetup {
+ data: DataPublicPluginSetup;
+ home: HomePublicPluginSetup;
+ triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
+}
+
+export interface ClientPluginsStart {
+ embeddable: EmbeddableStart;
+}
+
+export class UptimePlugin implements Plugin {
+ constructor(_context: PluginInitializerContext) {}
+
+ public async setup(
+ core: CoreSetup,
+ plugins: ClientPluginsSetup
+ ): Promise {
+ if (plugins.home) {
+ plugins.home.featureCatalogue.register({
+ id: PLUGIN.ID,
+ title: PLUGIN.TITLE,
+ description: PLUGIN.DESCRIPTION,
+ icon: 'uptimeApp',
+ path: '/app/uptime#/',
+ showOnHomePage: true,
+ category: FeatureCatalogueCategory.DATA,
+ });
+ }
+
+ core.application.register({
+ appRoute: '/app/uptime#/',
+ id: PLUGIN.ID,
+ euiIconType: 'uptimeApp',
+ order: 8900,
+ title: PLUGIN.TITLE,
+ async mount(params: AppMountParameters) {
+ const [coreStart, corePlugins] = await core.getStartServices();
+ const { element } = params;
+ const libs: UMFrontendLibs = {
+ framework: getKibanaFrameworkAdapter(coreStart, plugins, corePlugins),
+ };
+ libs.framework.render(element);
+ return () => {};
+ },
+ });
+ }
+
+ public start(_start: CoreStart, _plugins: {}): void {}
+
+ public stop(): void {}
+}
diff --git a/x-pack/legacy/plugins/uptime/public/apps/template.html b/x-pack/plugins/uptime/public/apps/template.html
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/apps/template.html
rename to x-pack/plugins/uptime/public/apps/template.html
diff --git a/x-pack/legacy/plugins/uptime/public/badge.ts b/x-pack/plugins/uptime/public/badge.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/badge.ts
rename to x-pack/plugins/uptime/public/badge.ts
diff --git a/x-pack/legacy/plugins/uptime/public/breadcrumbs.ts b/x-pack/plugins/uptime/public/breadcrumbs.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/breadcrumbs.ts
rename to x-pack/plugins/uptime/public/breadcrumbs.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/__tests__/__snapshots__/location_link.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/location_link.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/__tests__/__snapshots__/location_link.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/location_link.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/__tests__/location_link.test.tsx b/x-pack/plugins/uptime/public/components/common/__tests__/location_link.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/__tests__/location_link.test.tsx
rename to x-pack/plugins/uptime/public/components/common/__tests__/location_link.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/__tests__/uptime_date_picker.test.tsx b/x-pack/plugins/uptime/public/components/common/__tests__/uptime_date_picker.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/__tests__/uptime_date_picker.test.tsx
rename to x-pack/plugins/uptime/public/components/common/__tests__/uptime_date_picker.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/chart_empty_state.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/chart_empty_state.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/chart_empty_state.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/chart_empty_state.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/chart_wrapper.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/chart_wrapper.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/chart_wrapper.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/chart_wrapper.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart_legend.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart_legend.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart_legend.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart_legend.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart_legend_row.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart_legend_row.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart_legend_row.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart_legend_row.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/duration_charts.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/ping_histogram.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/ping_histogram.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/ping_histogram.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/ping_histogram.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/chart_empty_state.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/__tests__/chart_empty_state.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/chart_empty_state.test.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/chart_empty_state.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/chart_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/__tests__/chart_wrapper.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/chart_wrapper.test.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/chart_wrapper.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/donut_chart.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/__tests__/donut_chart.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/donut_chart.test.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/donut_chart.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/donut_chart_legend.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/__tests__/donut_chart_legend.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/donut_chart_legend.test.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/donut_chart_legend.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/donut_chart_legend_row.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/__tests__/donut_chart_legend_row.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/donut_chart_legend_row.test.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/donut_chart_legend_row.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/duration_charts.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/__tests__/duration_charts.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/duration_charts.test.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/duration_charts.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/get_tick_format.test.ts b/x-pack/plugins/uptime/public/components/common/charts/__tests__/get_tick_format.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/get_tick_format.test.ts
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/get_tick_format.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/monitor_bar_series.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/__tests__/monitor_bar_series.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/monitor_bar_series.test.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/monitor_bar_series.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/ping_histogram.test.tsx b/x-pack/plugins/uptime/public/components/common/charts/__tests__/ping_histogram.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/__tests__/ping_histogram.test.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/__tests__/ping_histogram.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/annotation_tooltip.tsx b/x-pack/plugins/uptime/public/components/common/charts/annotation_tooltip.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/annotation_tooltip.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/annotation_tooltip.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/chart_empty_state.tsx b/x-pack/plugins/uptime/public/components/common/charts/chart_empty_state.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/chart_empty_state.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/chart_empty_state.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/chart_wrapper/chart_wrapper.tsx b/x-pack/plugins/uptime/public/components/common/charts/chart_wrapper/chart_wrapper.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/chart_wrapper/chart_wrapper.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/chart_wrapper/chart_wrapper.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/chart_wrapper/index.ts b/x-pack/plugins/uptime/public/components/common/charts/chart_wrapper/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/chart_wrapper/index.ts
rename to x-pack/plugins/uptime/public/components/common/charts/chart_wrapper/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/donut_chart.tsx b/x-pack/plugins/uptime/public/components/common/charts/donut_chart.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/donut_chart.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/donut_chart.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/donut_chart_legend.tsx b/x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/donut_chart_legend.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/donut_chart_legend_row.tsx b/x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend_row.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/donut_chart_legend_row.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/donut_chart_legend_row.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/duration_chart.tsx b/x-pack/plugins/uptime/public/components/common/charts/duration_chart.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/duration_chart.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/duration_chart.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx b/x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
similarity index 94%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
index a31a143b71fd24..ceb1e700f293e2 100644
--- a/x-pack/legacy/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
+++ b/x-pack/plugins/uptime/public/components/common/charts/duration_line_bar_list.tsx
@@ -9,11 +9,11 @@ import moment from 'moment';
import { AnnotationTooltipFormatter, RectAnnotation } from '@elastic/charts';
import { RectAnnotationDatum } from '@elastic/charts/dist/chart_types/xy_chart/utils/specs';
import { AnnotationTooltip } from './annotation_tooltip';
-import { ANOMALY_SEVERITY } from '../../../../../../../plugins/ml/common/constants/anomalies';
+import { ANOMALY_SEVERITY } from '../../../../../../plugins/ml/common/constants/anomalies';
import {
getSeverityColor,
getSeverityType,
-} from '../../../../../../../plugins/ml/common/util/anomaly_utils';
+} from '../../../../../../plugins/ml/common/util/anomaly_utils';
interface Props {
anomalies: any;
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx b/x-pack/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/get_tick_format.ts b/x-pack/plugins/uptime/public/components/common/charts/get_tick_format.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/get_tick_format.ts
rename to x-pack/plugins/uptime/public/components/common/charts/get_tick_format.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/index.ts b/x-pack/plugins/uptime/public/components/common/charts/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/index.ts
rename to x-pack/plugins/uptime/public/components/common/charts/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/monitor_bar_series.tsx b/x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/monitor_bar_series.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/monitor_bar_series.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/charts/ping_histogram.tsx b/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/charts/ping_histogram.tsx
rename to x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/higher_order/__tests__/__snapshots__/responsive_wrapper.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/higher_order/__tests__/__snapshots__/responsive_wrapper.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/higher_order/__tests__/__snapshots__/responsive_wrapper.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/common/higher_order/__tests__/__snapshots__/responsive_wrapper.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/higher_order/__tests__/responsive_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/common/higher_order/__tests__/responsive_wrapper.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/higher_order/__tests__/responsive_wrapper.test.tsx
rename to x-pack/plugins/uptime/public/components/common/higher_order/__tests__/responsive_wrapper.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/higher_order/index.ts b/x-pack/plugins/uptime/public/components/common/higher_order/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/higher_order/index.ts
rename to x-pack/plugins/uptime/public/components/common/higher_order/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/higher_order/responsive_wrapper.tsx b/x-pack/plugins/uptime/public/components/common/higher_order/responsive_wrapper.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/higher_order/responsive_wrapper.tsx
rename to x-pack/plugins/uptime/public/components/common/higher_order/responsive_wrapper.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/location_link.tsx b/x-pack/plugins/uptime/public/components/common/location_link.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/location_link.tsx
rename to x-pack/plugins/uptime/public/components/common/location_link.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/common/uptime_date_picker.tsx b/x-pack/plugins/uptime/public/components/common/uptime_date_picker.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/common/uptime_date_picker.tsx
rename to x-pack/plugins/uptime/public/components/common/uptime_date_picker.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/__tests__/__snapshots__/monitor_charts.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/__tests__/__snapshots__/monitor_charts.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/__tests__/__snapshots__/monitor_charts.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/__tests__/__snapshots__/monitor_charts.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/__tests__/monitor_charts.test.tsx b/x-pack/plugins/uptime/public/components/monitor/__tests__/monitor_charts.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/__tests__/monitor_charts.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/__tests__/monitor_charts.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/index.ts b/x-pack/plugins/uptime/public/components/monitor/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/index.ts
rename to x-pack/plugins/uptime/public/components/monitor/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_map.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_map.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_map.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_map.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_status_tags.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_status_tags.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_status_tags.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/__snapshots__/location_status_tags.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/location_map.test.tsx b/x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/location_map.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/location_map.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/location_map.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/location_missing.test.tsx b/x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/location_missing.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/location_missing.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/location_missing.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/location_status_tags.test.tsx b/x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/location_status_tags.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/__tests__/location_status_tags.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/location_map/__tests__/location_status_tags.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/__tests__/__mocks__/mock.ts b/x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/__tests__/__mocks__/mock.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/__tests__/__mocks__/mock.ts
rename to x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/__tests__/__mocks__/mock.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/__tests__/map_config.test.ts b/x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/__tests__/map_config.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/__tests__/map_config.test.ts
rename to x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/__tests__/map_config.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/embedded_map.tsx b/x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/embedded_map.tsx
similarity index 85%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/embedded_map.tsx
rename to x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/embedded_map.tsx
index 85d0b1b593704a..06cdb07bd8bcdb 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/embedded_map.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/embedded_map.tsx
@@ -7,21 +7,17 @@
import React, { useEffect, useState, useContext, useRef } from 'react';
import uuid from 'uuid';
import styled from 'styled-components';
-import { npStart } from 'ui/new_platform';
-
-import {
- ViewMode,
- EmbeddableOutput,
- ErrorEmbeddable,
- isErrorEmbeddable,
-} from '../../../../../../../../../src/plugins/embeddable/public';
+import { MapEmbeddable, MapEmbeddableInput } from '../../../../../../../legacy/plugins/maps/public';
import * as i18n from './translations';
-import { MapEmbeddable, MapEmbeddableInput } from '../../../../../../maps/public';
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../../../plugins/maps/public';
import { Location } from '../../../../../common/runtime_types';
-
import { getLayerList } from './map_config';
-import { UptimeThemeContext } from '../../../../contexts';
+import { UptimeThemeContext, UptimeStartupPluginsContext } from '../../../../contexts';
+import {
+ isErrorEmbeddable,
+ ViewMode,
+ ErrorEmbeddable,
+} from '../../../../../../../../src/plugins/embeddable/public';
+import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../maps/public';
export interface EmbeddedMapProps {
upPoints: LocationPoint[];
@@ -52,11 +48,11 @@ export const EmbeddedMap = React.memo(({ upPoints, downPoints }: EmbeddedMapProp
const { colors } = useContext(UptimeThemeContext);
const [embeddable, setEmbeddable] = useState();
const embeddableRoot: React.RefObject = useRef(null);
- const factory = npStart.plugins.embeddable.getEmbeddableFactory<
- MapEmbeddableInput,
- EmbeddableOutput,
- MapEmbeddable
- >(MAP_SAVED_OBJECT_TYPE);
+ const { embeddable: embeddablePlugin } = useContext(UptimeStartupPluginsContext);
+ if (!embeddablePlugin) {
+ throw new Error('Embeddable start plugin not found');
+ }
+ const factory: any = embeddablePlugin.getEmbeddableFactory(MAP_SAVED_OBJECT_TYPE);
const input: MapEmbeddableInput = {
id: uuid.v4(),
@@ -88,7 +84,7 @@ export const EmbeddedMap = React.memo(({ upPoints, downPoints }: EmbeddedMapProp
if (!factory) {
throw new Error('Map embeddable not found.');
}
- const embeddableObject = await factory.create({
+ const embeddableObject: any = await factory.create({
...input,
title: i18n.MAP_TITLE,
});
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/low_poly_layer.json b/x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/low_poly_layer.json
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/low_poly_layer.json
rename to x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/low_poly_layer.json
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/map_config.ts b/x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/map_config.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/map_config.ts
rename to x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/map_config.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/translations.ts b/x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/translations.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/embeddables/translations.ts
rename to x-pack/plugins/uptime/public/components/monitor/location_map/embeddables/translations.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/index.tsx b/x-pack/plugins/uptime/public/components/monitor/location_map/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/index.tsx
rename to x-pack/plugins/uptime/public/components/monitor/location_map/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/location_map.tsx b/x-pack/plugins/uptime/public/components/monitor/location_map/location_map.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/location_map.tsx
rename to x-pack/plugins/uptime/public/components/monitor/location_map/location_map.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/location_missing.tsx b/x-pack/plugins/uptime/public/components/monitor/location_map/location_missing.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/location_missing.tsx
rename to x-pack/plugins/uptime/public/components/monitor/location_map/location_missing.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/location_map/location_status_tags.tsx b/x-pack/plugins/uptime/public/components/monitor/location_map/location_status_tags.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/location_map/location_status_tags.tsx
rename to x-pack/plugins/uptime/public/components/monitor/location_map/location_status_tags.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/confirm_delete.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_integerations.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_job_link.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_manage_job.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/confirm_delete.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/confirm_delete.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/confirm_delete.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/confirm_delete.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/license_info.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/license_info.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/license_info.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/license_info.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx
similarity index 97%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx
index c0b02181dcce1a..31cdcfac9feef3 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_flyout.test.tsx
@@ -9,7 +9,7 @@ import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
import { MLFlyoutView } from '../ml_flyout';
import { UptimeSettingsContext } from '../../../../contexts';
import { CLIENT_DEFAULTS } from '../../../../../common/constants';
-import { License } from '../../../../../../../../plugins/licensing/common/license';
+import { License } from '../../../../../../../plugins/licensing/common/license';
const expiredLicense = new License({
signature: 'test signature',
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/ml_integerations.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_integerations.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/ml_integerations.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_integerations.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/ml_job_link.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_job_link.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/ml_job_link.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_job_link.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/ml_manage_job.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_manage_job.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/__tests__/ml_manage_job.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/__tests__/ml_manage_job.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/confirm_delete.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/confirm_delete.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/confirm_delete.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/confirm_delete.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/index.ts b/x-pack/plugins/uptime/public/components/monitor/ml/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/index.ts
rename to x-pack/plugins/uptime/public/components/monitor/ml/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/license_info.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/license_info.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/license_info.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/license_info.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
similarity index 98%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
index c3e8579ca48370..6eec30d405f769 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/ml_flyout_container.tsx
@@ -19,7 +19,7 @@ import * as labels from './translations';
import {
useKibana,
KibanaReactNotifications,
-} from '../../../../../../../../src/plugins/kibana_react/public';
+} from '../../../../../../../src/plugins/kibana_react/public';
import { MLFlyoutView } from './ml_flyout';
import { ML_JOB_ID } from '../../../../common/constants';
import { UptimeRefreshContext, UptimeSettingsContext } from '../../../contexts';
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
similarity index 95%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
index 4963a901f0ecc5..7f19885c15406e 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/ml_integeration.tsx
@@ -18,9 +18,9 @@ import { ConfirmJobDeletion } from './confirm_delete';
import { UptimeRefreshContext } from '../../../contexts';
import { getMLJobId } from '../../../state/api/ml_anomaly';
import * as labels from './translations';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
import { ManageMLJobComponent } from './manage_ml_job';
-import { JobStat } from '../../../../../../../plugins/ml/common/types/data_recognizer';
+import { JobStat } from '../../../../../../plugins/ml/common/types/data_recognizer';
import { useMonitorId } from '../../../hooks';
export const MLIntegrationComponent = () => {
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_job_link.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/ml_job_link.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/ml_job_link.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/ml_job_link.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ml/translations.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/translations.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ml/translations.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ml/translations.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_charts.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_charts.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_charts.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_charts.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_duration/index.ts b/x-pack/plugins/uptime/public/components/monitor/monitor_duration/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_duration/index.ts
rename to x-pack/plugins/uptime/public/components/monitor/monitor_duration/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
similarity index 96%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
index 7e39b977f12710..52d4f620f84b3f 100644
--- a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/monitor_duration/monitor_duration_container.tsx
@@ -20,7 +20,7 @@ import {
} from '../../../state/selectors';
import { UptimeRefreshContext } from '../../../contexts';
import { getMLJobId } from '../../../state/api/ml_anomaly';
-import { JobStat } from '../../../../../../../plugins/ml/common/types/data_recognizer';
+import { JobStat } from '../../../../../ml/common/types/data_recognizer';
import { MonitorDurationComponent } from './monitor_duration';
import { MonitorIdParam } from '../../../../common/types';
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/monitor_ssl_certificate.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/monitor_ssl_certificate.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/monitor_ssl_certificate.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/monitor_ssl_certificate.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/monitor_status.bar.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/monitor_status.bar.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/monitor_status.bar.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/monitor_status.bar.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/status_by_location.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/status_by_location.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/status_by_location.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/__snapshots__/status_by_location.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/monitor_ssl_certificate.test.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/monitor_ssl_certificate.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/monitor_ssl_certificate.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/monitor_ssl_certificate.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/monitor_status.bar.test.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/monitor_status.bar.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/monitor_status.bar.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/monitor_status.bar.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/status_by_location.test.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/status_by_location.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/__test__/status_by_location.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/__test__/status_by_location.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/index.ts b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/index.ts
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/index.ts b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/index.ts
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/ssl_certificate.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/ssl_certificate.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/ssl_certificate.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/ssl_certificate.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_bar.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_bar.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_bar.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_bar.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_bar_container.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_bar_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_bar_container.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_bar_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_by_location.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_by_location.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_by_location.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/status_by_location.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/translations.ts b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/translations.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/translations.ts
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/monitor_status_bar/translations.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/status_details.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/status_details.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/status_details.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/status_details.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/status_details_container.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/status_details_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/status_details_container.tsx
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/status_details_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/translations.ts b/x-pack/plugins/uptime/public/components/monitor/monitor_status_details/translations.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/monitor_status_details/translations.ts
rename to x-pack/plugins/uptime/public/components/monitor/monitor_status_details/translations.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_histogram/index.ts b/x-pack/plugins/uptime/public/components/monitor/ping_histogram/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_histogram/index.ts
rename to x-pack/plugins/uptime/public/components/monitor/ping_histogram/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_histogram/ping_histogram_container.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_histogram/ping_histogram_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_histogram/ping_histogram_container.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_histogram/ping_histogram_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/doc_link_body.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/doc_link_body.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/doc_link_body.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/doc_link_body.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/doc_link_body.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/doc_link_body.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/doc_link_body.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/doc_link_body.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/expanded_row.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/expanded_row.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/expanded_row.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/expanded_row.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/ping_list.test.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/ping_list.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/__tests__/ping_list.test.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/ping_list.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/doc_link_body.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/doc_link_body.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/doc_link_body.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/doc_link_body.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/index.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/index.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/index.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/index.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/location_name.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/location_name.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/location_name.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/location_name.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/ping_list_container.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/monitor/ping_list/ping_list_container.tsx
rename to x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/__tests__/__snapshots__/parsing_error_callout.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/__tests__/__snapshots__/parsing_error_callout.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/__tests__/__snapshots__/parsing_error_callout.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/__tests__/__snapshots__/parsing_error_callout.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/__tests__/__snapshots__/snapshot.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/__tests__/__snapshots__/snapshot.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/__tests__/__snapshots__/snapshot.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/__tests__/__snapshots__/snapshot.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/__tests__/__snapshots__/snapshot_heading.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/__tests__/__snapshots__/snapshot_heading.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/__tests__/__snapshots__/snapshot_heading.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/__tests__/__snapshots__/snapshot_heading.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/__tests__/parsing_error_callout.test.tsx b/x-pack/plugins/uptime/public/components/overview/__tests__/parsing_error_callout.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/__tests__/parsing_error_callout.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/__tests__/parsing_error_callout.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/__tests__/snapshot.test.tsx b/x-pack/plugins/uptime/public/components/overview/__tests__/snapshot.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/__tests__/snapshot.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/__tests__/snapshot.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/__tests__/snapshot_heading.test.tsx b/x-pack/plugins/uptime/public/components/overview/__tests__/snapshot_heading.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/__tests__/snapshot_heading.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/__tests__/snapshot_heading.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/__tests__/alert_monitor_status.test.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/__tests__/alert_monitor_status.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/__tests__/alert_monitor_status.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/alerts/__tests__/alert_monitor_status.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/alert_monitor_status.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/alert_monitor_status.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/alert_monitor_status.tsx
rename to x-pack/plugins/uptime/public/components/overview/alerts/alert_monitor_status.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/alerts_containers/alert_monitor_status.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/alert_monitor_status.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/alerts_containers/alert_monitor_status.tsx
rename to x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/alert_monitor_status.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/alerts_containers/index.ts b/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/alerts_containers/index.ts
rename to x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
rename to x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/toggle_alert_flyout_button.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/alerts_containers/uptime_alerts_flyout_wrapper.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/uptime_alerts_flyout_wrapper.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/alerts_containers/uptime_alerts_flyout_wrapper.tsx
rename to x-pack/plugins/uptime/public/components/overview/alerts/alerts_containers/uptime_alerts_flyout_wrapper.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/index.ts b/x-pack/plugins/uptime/public/components/overview/alerts/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/index.ts
rename to x-pack/plugins/uptime/public/components/overview/alerts/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
similarity index 97%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
rename to x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
index 04dfe4b3e3509a..92fc015a276d3f 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/toggle_alert_flyout_button.tsx
@@ -8,7 +8,7 @@ import { EuiButtonEmpty, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } f
import React, { useState } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
interface Props {
setAlertFlyoutVisible: (value: boolean) => void;
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx
similarity index 83%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx
rename to x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx
index 09e6dc72b7f981..262e1552e3660d 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx
@@ -5,8 +5,8 @@
*/
import React from 'react';
-import { AlertsContextProvider } from '../../../../../../../plugins/triggers_actions_ui/public';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { AlertsContextProvider } from '../../../../../../plugins/triggers_actions_ui/public';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
export const UptimeAlertsContextProvider: React.FC = ({ children }) => {
const {
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
similarity index 90%
rename from x-pack/legacy/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
rename to x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
index 13705e7d192933..9b1d3a73dc6614 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_flyout_wrapper.tsx
@@ -5,7 +5,7 @@
*/
import React from 'react';
-import { AlertAdd } from '../../../../../../../plugins/triggers_actions_ui/public';
+import { AlertAdd } from '../../../../../../plugins/triggers_actions_ui/public';
interface Props {
alertFlyoutVisible: boolean;
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/data_or_index_missing.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/data_or_index_missing.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/data_or_index_missing.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/data_or_index_missing.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/__tests__/data_or_index_missing.test.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/data_or_index_missing.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/__tests__/data_or_index_missing.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/data_or_index_missing.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/__tests__/empty_state.test.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/empty_state.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/__tests__/empty_state.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/empty_state.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/data_or_index_missing.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/data_or_index_missing.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/data_or_index_missing.tsx
rename to x-pack/plugins/uptime/public/components/overview/empty_state/data_or_index_missing.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.tsx
similarity index 96%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state.tsx
rename to x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.tsx
index 651103a34bf212..d38f203739ceac 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.tsx
@@ -10,7 +10,7 @@ import { EmptyStateError } from './empty_state_error';
import { EmptyStateLoading } from './empty_state_loading';
import { DataOrIndexMissing } from './data_or_index_missing';
import { DynamicSettings, StatesIndexStatus } from '../../../../common/runtime_types';
-import { IHttpFetchError } from '../../../../../../../../target/types/core/public/http';
+import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
interface EmptyStateProps {
children: JSX.Element[] | JSX.Element;
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state_container.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state_container.tsx
rename to x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
similarity index 95%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
rename to x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
index 1135b969018a11..aa4040e319e0f2 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_error.tsx
@@ -7,7 +7,7 @@
import { EuiEmptyPrompt, EuiPanel, EuiTitle, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { Fragment } from 'react';
-import { IHttpFetchError } from '../../../../../../../../target/types/core/public/http';
+import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
interface EmptyStateErrorProps {
errors: IHttpFetchError[];
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state_loading.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_loading.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/empty_state_loading.tsx
rename to x-pack/plugins/uptime/public/components/overview/empty_state/empty_state_loading.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/empty_state/index.ts b/x-pack/plugins/uptime/public/components/overview/empty_state/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/empty_state/index.ts
rename to x-pack/plugins/uptime/public/components/overview/empty_state/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_status_button.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_status_button.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_status_button.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_status_button.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/parse_filter_map.test.ts.snap b/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/parse_filter_map.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/parse_filter_map.test.ts.snap
rename to x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/parse_filter_map.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/filter_popover.test.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/filter_popover.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/filter_popover.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/filter_popover.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/filter_status_button.test.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/filter_status_button.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/filter_status_button.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/filter_status_button.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/parse_filter_map.test.ts b/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/parse_filter_map.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/parse_filter_map.test.ts
rename to x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/parse_filter_map.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/toggle_selected_item.test.ts b/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/toggle_selected_item.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/__tests__/toggle_selected_item.test.ts
rename to x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/toggle_selected_item.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/filter_group.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/filter_group.tsx
rename to x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/filter_group_container.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_group_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/filter_group_container.tsx
rename to x-pack/plugins/uptime/public/components/overview/filter_group/filter_group_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/filter_popover.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_popover.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/filter_popover.tsx
rename to x-pack/plugins/uptime/public/components/overview/filter_group/filter_popover.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/filter_status_button.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/filter_status_button.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/filter_status_button.tsx
rename to x-pack/plugins/uptime/public/components/overview/filter_group/filter_status_button.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/index.ts b/x-pack/plugins/uptime/public/components/overview/filter_group/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/index.ts
rename to x-pack/plugins/uptime/public/components/overview/filter_group/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/parse_filter_map.ts b/x-pack/plugins/uptime/public/components/overview/filter_group/parse_filter_map.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/parse_filter_map.ts
rename to x-pack/plugins/uptime/public/components/overview/filter_group/parse_filter_map.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/toggle_selected_item.ts b/x-pack/plugins/uptime/public/components/overview/filter_group/toggle_selected_item.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/toggle_selected_item.ts
rename to x-pack/plugins/uptime/public/components/overview/filter_group/toggle_selected_item.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/filter_group/uptime_filter_button.tsx b/x-pack/plugins/uptime/public/components/overview/filter_group/uptime_filter_button.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/filter_group/uptime_filter_button.tsx
rename to x-pack/plugins/uptime/public/components/overview/filter_group/uptime_filter_button.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/index.ts b/x-pack/plugins/uptime/public/components/overview/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/index.ts
rename to x-pack/plugins/uptime/public/components/overview/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/index.ts b/x-pack/plugins/uptime/public/components/overview/kuery_bar/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/index.ts
rename to x-pack/plugins/uptime/public/components/overview/kuery_bar/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx b/x-pack/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx
similarity index 98%
rename from x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx
rename to x-pack/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx
index 63aceed2be6362..792fff4c7cdca2 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx
@@ -16,7 +16,7 @@ import {
IIndexPattern,
QuerySuggestion,
DataPublicPluginSetup,
-} from '../../../../../../../../src/plugins/data/public';
+} from '../../../../../../../src/plugins/data/public';
const Container = styled.div`
margin-bottom: 10px;
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/kuery_bar_container.tsx b/x-pack/plugins/uptime/public/components/overview/kuery_bar/kuery_bar_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/kuery_bar_container.tsx
rename to x-pack/plugins/uptime/public/components/overview/kuery_bar/kuery_bar_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/click_outside.js b/x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/click_outside.js
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/click_outside.js
rename to x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/click_outside.js
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/index.d.ts b/x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/index.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/index.d.ts
rename to x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/index.d.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/index.js b/x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/index.js
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/index.js
rename to x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/index.js
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestion.js b/x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestion.js
similarity index 97%
rename from x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestion.js
rename to x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestion.js
index 2b5ad9b59e39f8..936eae04ffa641 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestion.js
+++ b/x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestion.js
@@ -14,7 +14,7 @@ import {
units,
fontSizes,
unit,
-} from '../../../../../../apm/public/style/variables';
+} from '../../../../../../../legacy/plugins/apm/public/style/variables';
import { tint } from 'polished';
import theme from '@elastic/eui/dist/eui_theme_light.json';
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestions.js b/x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestions.js
similarity index 95%
rename from x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestions.js
rename to x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestions.js
index 7fbabe71bcdb52..ac6832050b9d3c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestions.js
+++ b/x-pack/plugins/uptime/public/components/overview/kuery_bar/typeahead/suggestions.js
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
import styled from 'styled-components';
import { isEmpty } from 'lodash';
import Suggestion from './suggestion';
-import { units, px, unit } from '../../../../../../apm/public/style/variables';
+import { units, px, unit } from '../../../../../../../legacy/plugins/apm/public/style/variables';
import { tint } from 'polished';
import theme from '@elastic/eui/dist/eui_theme_light.json';
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_page_link.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_page_link.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_page_link.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_page_link.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list_page_size_select.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list_page_size_select.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list_page_size_select.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list_page_size_select.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list_status_column.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list_status_column.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list_status_column.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list_status_column.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_page_link.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_page_link.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_page_link.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_page_link.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/parse_timestamp.test.ts b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/parse_timestamp.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/__tests__/parse_timestamp.test.ts
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/parse_timestamp.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/index.ts b/x-pack/plugins/uptime/public/components/overview/monitor_list/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/index.ts
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
similarity index 96%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
index 18e2e2437e1477..7e9536689470e6 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
@@ -202,13 +202,7 @@ export const MonitorListComponent: React.FC = ({
itemId="monitor_id"
itemIdToExpandedRowMap={getExpandedRowMap()}
items={items}
- // TODO: not needed without sorting and pagination
- // onChange={onChange}
noItemsMessage={!!filters ? labels.NO_MONITOR_ITEM_SELECTED : labels.NO_DATA_MESSAGE}
- // TODO: reintegrate pagination in future release
- // pagination={pagination}
- // TODO: reintegrate sorting in future release
- // sorting={sorting}
columns={columns}
/>
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_container.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_container.tsx
similarity index 95%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_container.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_container.tsx
index 5bfe6ff0c5b4f1..6fb880e28c7347 100644
--- a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_container.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_container.tsx
@@ -9,7 +9,7 @@ import { useSelector, useDispatch } from 'react-redux';
import { getMonitorList } from '../../../state/actions';
import { FetchMonitorStatesQueryArgs } from '../../../../common/runtime_types';
import { monitorListSelector } from '../../../state/selectors';
-import { MonitorListComponent } from './index';
+import { MonitorListComponent } from './monitor_list';
export interface MonitorListProps {
filters?: string;
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/integration_group.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/integration_group.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/integration_group.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/integration_group.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/integration_link.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/integration_link.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/integration_link.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/integration_link.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_list.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_list.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_list.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_row.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_row.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_row.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_row.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/data.json b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/data.json
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/data.json
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/data.json
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/integration_group.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/integration_group.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/integration_group.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/integration_group.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/integration_link.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/integration_link.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/integration_link.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/integration_link.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_status_list.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_status_list.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_status_list.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_status_list.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_status_row.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_status_row.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_status_row.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_status_row.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/most_recent_error.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/most_recent_error.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/most_recent_error.test.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/most_recent_error.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/actions_popover_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_group.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_group.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_group.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_group.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_link.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_link.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_link.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/actions_popover/integration_link.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/index.ts b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/index.ts
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_list.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_status_row.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/most_recent_error.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_page_size_select.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_page_size_select.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_page_size_select.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_page_size_select.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_status_column.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_status_column.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_list_status_column.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_status_column.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_page_link.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_page_link.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/monitor_page_link.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_page_link.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/parse_timestamp.ts b/x-pack/plugins/uptime/public/components/overview/monitor_list/parse_timestamp.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/parse_timestamp.ts
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/parse_timestamp.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/translations.ts b/x-pack/plugins/uptime/public/components/overview/monitor_list/translations.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/translations.ts
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/translations.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/types.ts b/x-pack/plugins/uptime/public/components/overview/monitor_list/types.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/monitor_list/types.ts
rename to x-pack/plugins/uptime/public/components/overview/monitor_list/types.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/overview_container.tsx b/x-pack/plugins/uptime/public/components/overview/overview_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/overview_container.tsx
rename to x-pack/plugins/uptime/public/components/overview/overview_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/parsing_error_callout.tsx b/x-pack/plugins/uptime/public/components/overview/parsing_error_callout.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/parsing_error_callout.tsx
rename to x-pack/plugins/uptime/public/components/overview/parsing_error_callout.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/snapshot/index.ts b/x-pack/plugins/uptime/public/components/overview/snapshot/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/snapshot/index.ts
rename to x-pack/plugins/uptime/public/components/overview/snapshot/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/snapshot/snapshot.tsx b/x-pack/plugins/uptime/public/components/overview/snapshot/snapshot.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/snapshot/snapshot.tsx
rename to x-pack/plugins/uptime/public/components/overview/snapshot/snapshot.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/snapshot/snapshot_container.tsx b/x-pack/plugins/uptime/public/components/overview/snapshot/snapshot_container.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/snapshot/snapshot_container.tsx
rename to x-pack/plugins/uptime/public/components/overview/snapshot/snapshot_container.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/snapshot/snapshot_heading.tsx b/x-pack/plugins/uptime/public/components/overview/snapshot/snapshot_heading.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/snapshot/snapshot_heading.tsx
rename to x-pack/plugins/uptime/public/components/overview/snapshot/snapshot_heading.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/overview/status_panel.tsx b/x-pack/plugins/uptime/public/components/overview/status_panel.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/overview/status_panel.tsx
rename to x-pack/plugins/uptime/public/components/overview/status_panel.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
rename to x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx b/x-pack/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx
rename to x-pack/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx b/x-pack/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx
rename to x-pack/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/certificate_form.tsx b/x-pack/plugins/uptime/public/components/settings/certificate_form.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/settings/certificate_form.tsx
rename to x-pack/plugins/uptime/public/components/settings/certificate_form.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/indices_form.tsx b/x-pack/plugins/uptime/public/components/settings/indices_form.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/components/settings/indices_form.tsx
rename to x-pack/plugins/uptime/public/components/settings/indices_form.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/contexts/index.ts b/x-pack/plugins/uptime/public/contexts/index.ts
similarity index 82%
rename from x-pack/legacy/plugins/uptime/public/contexts/index.ts
rename to x-pack/plugins/uptime/public/contexts/index.ts
index 2b27fcfe907abd..243a25c26901a1 100644
--- a/x-pack/legacy/plugins/uptime/public/contexts/index.ts
+++ b/x-pack/plugins/uptime/public/contexts/index.ts
@@ -11,3 +11,7 @@ export {
UptimeSettingsContextProvider,
} from './uptime_settings_context';
export { UptimeThemeContextProvider, UptimeThemeContext } from './uptime_theme_context';
+export {
+ UptimeStartupPluginsContext,
+ UptimeStartupPluginsContextProvider,
+} from './uptime_startup_plugins_context';
diff --git a/x-pack/legacy/plugins/uptime/public/contexts/uptime_refresh_context.tsx b/x-pack/plugins/uptime/public/contexts/uptime_refresh_context.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/contexts/uptime_refresh_context.tsx
rename to x-pack/plugins/uptime/public/contexts/uptime_refresh_context.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx b/x-pack/plugins/uptime/public/contexts/uptime_settings_context.tsx
similarity index 96%
rename from x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx
rename to x-pack/plugins/uptime/public/contexts/uptime_settings_context.tsx
index 137846de103b4d..4fabf3f2ed4972 100644
--- a/x-pack/legacy/plugins/uptime/public/contexts/uptime_settings_context.tsx
+++ b/x-pack/plugins/uptime/public/contexts/uptime_settings_context.tsx
@@ -9,7 +9,7 @@ import { UptimeAppProps } from '../uptime_app';
import { CLIENT_DEFAULTS, CONTEXT_DEFAULTS } from '../../common/constants';
import { CommonlyUsedRange } from '../components/common/uptime_date_picker';
import { useGetUrlParams } from '../hooks';
-import { ILicense } from '../../../../../plugins/licensing/common/types';
+import { ILicense } from '../../../../plugins/licensing/common/types';
export interface UptimeSettingsContextValues {
basePath: string;
diff --git a/x-pack/plugins/uptime/public/contexts/uptime_startup_plugins_context.tsx b/x-pack/plugins/uptime/public/contexts/uptime_startup_plugins_context.tsx
new file mode 100644
index 00000000000000..e516ff44aa12ab
--- /dev/null
+++ b/x-pack/plugins/uptime/public/contexts/uptime_startup_plugins_context.tsx
@@ -0,0 +1,15 @@
+/*
+ * 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 React, { createContext } from 'react';
+import { ClientPluginsStart } from '../apps/plugin';
+
+export const UptimeStartupPluginsContext = createContext>({});
+
+export const UptimeStartupPluginsContextProvider: React.FC> = ({
+ children,
+ ...props
+}) => ;
diff --git a/x-pack/legacy/plugins/uptime/public/contexts/uptime_theme_context.tsx b/x-pack/plugins/uptime/public/contexts/uptime_theme_context.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/contexts/uptime_theme_context.tsx
rename to x-pack/plugins/uptime/public/contexts/uptime_theme_context.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/__tests__/__snapshots__/use_url_params.test.tsx.snap b/x-pack/plugins/uptime/public/hooks/__tests__/__snapshots__/use_url_params.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/hooks/__tests__/__snapshots__/use_url_params.test.tsx.snap
rename to x-pack/plugins/uptime/public/hooks/__tests__/__snapshots__/use_url_params.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/__tests__/use_breadcrumbs.test.tsx b/x-pack/plugins/uptime/public/hooks/__tests__/use_breadcrumbs.test.tsx
similarity index 95%
rename from x-pack/legacy/plugins/uptime/public/hooks/__tests__/use_breadcrumbs.test.tsx
rename to x-pack/plugins/uptime/public/hooks/__tests__/use_breadcrumbs.test.tsx
index 1ce00fe7ce3af5..306919015fcb1d 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/__tests__/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/uptime/public/hooks/__tests__/use_breadcrumbs.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
import { Route } from 'react-router-dom';
import { mountWithRouter } from '../../lib';
import { OVERVIEW_ROUTE } from '../../../common/constants';
-import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
import { UptimeUrlParams, getSupportedUrlParams } from '../../lib/helper';
import { makeBaseBreadcrumb, useBreadcrumbs } from '../use_breadcrumbs';
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/__tests__/use_url_params.test.tsx b/x-pack/plugins/uptime/public/hooks/__tests__/use_url_params.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/hooks/__tests__/use_url_params.test.tsx
rename to x-pack/plugins/uptime/public/hooks/__tests__/use_url_params.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/index.ts b/x-pack/plugins/uptime/public/hooks/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/hooks/index.ts
rename to x-pack/plugins/uptime/public/hooks/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts b/x-pack/plugins/uptime/public/hooks/update_kuery_string.ts
similarity index 95%
rename from x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts
rename to x-pack/plugins/uptime/public/hooks/update_kuery_string.ts
index ab4d6f75849e88..492d2bab5bb806 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts
+++ b/x-pack/plugins/uptime/public/hooks/update_kuery_string.ts
@@ -5,7 +5,7 @@
*/
import { combineFiltersAndUserSearch, stringifyKueries } from '../lib/helper';
-import { esKuery, IIndexPattern } from '../../../../../../src/plugins/data/public';
+import { esKuery, IIndexPattern } from '../../../../../src/plugins/data/public';
const getKueryString = (urlFilters: string): string => {
let kueryString = '';
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
similarity index 94%
rename from x-pack/legacy/plugins/uptime/public/hooks/use_breadcrumbs.ts
rename to x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
index d1cc8e18973868..182c6b01141284 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
import { useEffect } from 'react';
import { UptimeUrlParams } from '../lib/helper';
import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '../../../../../src/plugins/kibana_react/public';
import { useUrlParams } from '.';
export const makeBaseBreadcrumb = (params?: UptimeUrlParams): ChromeBreadcrumb => {
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_monitor.ts b/x-pack/plugins/uptime/public/hooks/use_monitor.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/hooks/use_monitor.ts
rename to x-pack/plugins/uptime/public/hooks/use_monitor.ts
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts b/x-pack/plugins/uptime/public/hooks/use_telemetry.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
rename to x-pack/plugins/uptime/public/hooks/use_telemetry.ts
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts b/x-pack/plugins/uptime/public/hooks/use_url_params.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/hooks/use_url_params.ts
rename to x-pack/plugins/uptime/public/hooks/use_url_params.ts
diff --git a/x-pack/legacy/plugins/uptime/public/icons/heartbeat_white.svg b/x-pack/plugins/uptime/public/icons/heartbeat_white.svg
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/icons/heartbeat_white.svg
rename to x-pack/plugins/uptime/public/icons/heartbeat_white.svg
diff --git a/x-pack/legacy/plugins/uptime/common/graphql/resolver_types.ts b/x-pack/plugins/uptime/public/index.ts
similarity index 53%
rename from x-pack/legacy/plugins/uptime/common/graphql/resolver_types.ts
rename to x-pack/plugins/uptime/public/index.ts
index 22df610d2d516c..48cf2c90ad07b1 100644
--- a/x-pack/legacy/plugins/uptime/common/graphql/resolver_types.ts
+++ b/x-pack/plugins/uptime/public/index.ts
@@ -4,10 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
-type UMResolverResult = Promise | T;
+import { PluginInitializerContext } from 'kibana/public';
+import { UptimePlugin } from './apps';
-export type UMResolver = (
- parent: Parent,
- args: Args,
- context: Context
-) => UMResolverResult;
+export const plugin = (initializerContext: PluginInitializerContext) =>
+ new UptimePlugin(initializerContext);
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/capabilities_adapter.ts b/x-pack/plugins/uptime/public/lib/adapters/framework/capabilities_adapter.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/adapters/framework/capabilities_adapter.ts
rename to x-pack/plugins/uptime/public/lib/adapters/framework/capabilities_adapter.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx b/x-pack/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
similarity index 86%
rename from x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
rename to x-pack/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
index 71c73bf5ba5d4f..f7f9e056f41af5 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
+++ b/x-pack/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
@@ -9,7 +9,6 @@ import React from 'react';
import ReactDOM from 'react-dom';
import { get } from 'lodash';
import { i18n as i18nFormatter } from '@kbn/i18n';
-import { PluginsSetup } from 'ui/new_platform/new_platform';
import { alertTypeInitializers } from '../../alert_types';
import { UptimeApp, UptimeAppProps } from '../../../uptime_app';
import { getIntegratedAppAvailability } from './capabilities_adapter';
@@ -20,10 +19,12 @@ import {
DEFAULT_TIMEPICKER_QUICK_RANGES,
} from '../../../../common/constants';
import { UMFrameworkAdapter } from '../../lib';
+import { ClientPluginsStart, ClientPluginsSetup } from '../../../apps/plugin';
export const getKibanaFrameworkAdapter = (
core: CoreStart,
- plugins: PluginsSetup
+ plugins: ClientPluginsSetup,
+ startPlugins: ClientPluginsStart
): UMFrameworkAdapter => {
const {
application: { capabilities },
@@ -35,14 +36,15 @@ export const getKibanaFrameworkAdapter = (
const {
data: { autocomplete },
- // TODO: after NP migration we can likely fix this typing problem
- // @ts-ignore we don't control this type
triggers_actions_ui,
} = plugins;
- alertTypeInitializers.forEach(init =>
- triggers_actions_ui.alertTypeRegistry.register(init({ autocomplete }))
- );
+ alertTypeInitializers.forEach(init => {
+ const alertInitializer = init({ autocomplete });
+ if (!triggers_actions_ui.alertTypeRegistry.has(alertInitializer.id)) {
+ triggers_actions_ui.alertTypeRegistry.register(init({ autocomplete }));
+ }
+ });
let breadcrumbs: ChromeBreadcrumb[] = [];
core.chrome.getBreadcrumbs$().subscribe((nextBreadcrumbs?: ChromeBreadcrumb[]) => {
@@ -68,6 +70,7 @@ export const getKibanaFrameworkAdapter = (
isLogsAvailable: logs,
kibanaBreadcrumbs: breadcrumbs,
plugins,
+ startPlugins,
renderGlobalHelpControls: () =>
setHelpExtension({
appName: i18nFormatter.translate('xpack.uptime.header.appName', {
diff --git a/x-pack/legacy/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts b/x-pack/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts
rename to x-pack/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/alert_types/index.ts b/x-pack/plugins/uptime/public/lib/alert_types/index.ts
similarity index 67%
rename from x-pack/legacy/plugins/uptime/public/lib/alert_types/index.ts
rename to x-pack/plugins/uptime/public/lib/alert_types/index.ts
index 74160577cb0b13..f7ab254ffe675f 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/alert_types/index.ts
+++ b/x-pack/plugins/uptime/public/lib/alert_types/index.ts
@@ -4,9 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-// TODO: after NP migration is complete we should be able to remove this lint ignore comment
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { AlertTypeModel } from '../../../../../../plugins/triggers_actions_ui/public';
+import { AlertTypeModel } from '../../../../triggers_actions_ui/public';
import { initMonitorStatusAlertType } from './monitor_status';
export type AlertTypeInitializer = (dependenies: { autocomplete: any }) => AlertTypeModel;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/alert_types/monitor_status.tsx b/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx
similarity index 88%
rename from x-pack/legacy/plugins/uptime/public/lib/alert_types/monitor_status.tsx
rename to x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx
index 0624d20b197c0e..e7695fb1cbb56c 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/alert_types/monitor_status.tsx
+++ b/x-pack/plugins/uptime/public/lib/alert_types/monitor_status.tsx
@@ -8,17 +8,12 @@ import { PathReporter } from 'io-ts/lib/PathReporter';
import React from 'react';
import DateMath from '@elastic/datemath';
import { isRight } from 'fp-ts/lib/Either';
-import {
- AlertTypeModel,
- ValidationResult,
- // TODO: this typing issue should be resolved after NP migration
- // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../plugins/triggers_actions_ui/public/types';
+import { AlertTypeModel } from '../../../../triggers_actions_ui/public';
import { AlertTypeInitializer } from '.';
import { StatusCheckExecutorParamsType } from '../../../common/runtime_types';
import { AlertMonitorStatus } from '../../components/overview/alerts/alerts_containers';
-export const validate = (alertParams: any): ValidationResult => {
+export const validate = (alertParams: any) => {
const errors: Record = {};
const decoded = StatusCheckExecutorParamsType.decode(alertParams);
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/stringify_kueries.test.ts.snap b/x-pack/plugins/uptime/public/lib/helper/__tests__/__snapshots__/stringify_kueries.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/stringify_kueries.test.ts.snap
rename to x-pack/plugins/uptime/public/lib/helper/__tests__/__snapshots__/stringify_kueries.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/stringify_url_params.test.ts.snap b/x-pack/plugins/uptime/public/lib/helper/__tests__/__snapshots__/stringify_url_params.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/stringify_url_params.test.ts.snap
rename to x-pack/plugins/uptime/public/lib/helper/__tests__/__snapshots__/stringify_url_params.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/combine_filters_and_user_search.test.ts b/x-pack/plugins/uptime/public/lib/helper/__tests__/combine_filters_and_user_search.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/combine_filters_and_user_search.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/__tests__/combine_filters_and_user_search.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/convert_measurements.test.ts b/x-pack/plugins/uptime/public/lib/helper/__tests__/convert_measurements.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/convert_measurements.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/__tests__/convert_measurements.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/series_has_down_values.test.ts b/x-pack/plugins/uptime/public/lib/helper/__tests__/series_has_down_values.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/series_has_down_values.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/__tests__/series_has_down_values.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/stringify_kueries.test.ts b/x-pack/plugins/uptime/public/lib/helper/__tests__/stringify_kueries.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/stringify_kueries.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/__tests__/stringify_kueries.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/stringify_url_params.test.ts b/x-pack/plugins/uptime/public/lib/helper/__tests__/stringify_url_params.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/stringify_url_params.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/__tests__/stringify_url_params.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/__tests__/get_label_format.test.ts b/x-pack/plugins/uptime/public/lib/helper/charts/__tests__/get_label_format.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/charts/__tests__/get_label_format.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/charts/__tests__/get_label_format.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/__tests__/is_within_current_date.test.ts b/x-pack/plugins/uptime/public/lib/helper/charts/__tests__/is_within_current_date.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/charts/__tests__/is_within_current_date.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/charts/__tests__/is_within_current_date.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts b/x-pack/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts
rename to x-pack/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_label_format.ts b/x-pack/plugins/uptime/public/lib/helper/charts/get_label_format.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_label_format.ts
rename to x-pack/plugins/uptime/public/lib/helper/charts/get_label_format.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/index.ts b/x-pack/plugins/uptime/public/lib/helper/charts/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/charts/index.ts
rename to x-pack/plugins/uptime/public/lib/helper/charts/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/is_within_current_date.ts b/x-pack/plugins/uptime/public/lib/helper/charts/is_within_current_date.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/charts/is_within_current_date.ts
rename to x-pack/plugins/uptime/public/lib/helper/charts/is_within_current_date.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/combine_filters_and_user_search.ts b/x-pack/plugins/uptime/public/lib/helper/combine_filters_and_user_search.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/combine_filters_and_user_search.ts
rename to x-pack/plugins/uptime/public/lib/helper/combine_filters_and_user_search.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/convert_measurements.ts b/x-pack/plugins/uptime/public/lib/helper/convert_measurements.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/convert_measurements.ts
rename to x-pack/plugins/uptime/public/lib/helper/convert_measurements.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/get_title.ts b/x-pack/plugins/uptime/public/lib/helper/get_title.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/get_title.ts
rename to x-pack/plugins/uptime/public/lib/helper/get_title.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/helper_with_router.tsx b/x-pack/plugins/uptime/public/lib/helper/helper_with_router.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/helper_with_router.tsx
rename to x-pack/plugins/uptime/public/lib/helper/helper_with_router.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/index.ts b/x-pack/plugins/uptime/public/lib/helper/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/index.ts
rename to x-pack/plugins/uptime/public/lib/helper/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_apm_href.test.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_apm_href.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_apm_href.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_apm_href.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/add_base_path.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/add_base_path.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/add_base_path.ts
rename to x-pack/plugins/uptime/public/lib/helper/observability_integration/add_base_path.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/build_href.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/build_href.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/build_href.ts
rename to x-pack/plugins/uptime/public/lib/helper/observability_integration/build_href.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts
rename to x-pack/plugins/uptime/public/lib/helper/observability_integration/get_apm_href.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts
rename to x-pack/plugins/uptime/public/lib/helper/observability_integration/get_infra_href.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts
rename to x-pack/plugins/uptime/public/lib/helper/observability_integration/get_logging_href.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/index.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/observability_integration/index.ts
rename to x-pack/plugins/uptime/public/lib/helper/observability_integration/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/series_has_down_values.ts b/x-pack/plugins/uptime/public/lib/helper/series_has_down_values.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/series_has_down_values.ts
rename to x-pack/plugins/uptime/public/lib/helper/series_has_down_values.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/stringify_kueries.ts b/x-pack/plugins/uptime/public/lib/helper/stringify_kueries.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/stringify_kueries.ts
rename to x-pack/plugins/uptime/public/lib/helper/stringify_kueries.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/stringify_url_params.ts b/x-pack/plugins/uptime/public/lib/helper/stringify_url_params.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/stringify_url_params.ts
rename to x-pack/plugins/uptime/public/lib/helper/stringify_url_params.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/__snapshots__/get_supported_url_params.test.ts.snap b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/__snapshots__/get_supported_url_params.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/__snapshots__/get_supported_url_params.test.ts.snap
rename to x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/__snapshots__/get_supported_url_params.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/get_supported_url_params.test.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/get_supported_url_params.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/get_supported_url_params.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/get_supported_url_params.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/parse_absolute_date.test.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/parse_absolute_date.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/parse_absolute_date.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/parse_absolute_date.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/parse_url_int.test.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/parse_autorefresh_interval.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/parse_url_int.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/parse_autorefresh_interval.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/parse_is_paused.test.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/parse_is_paused.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/__tests__/parse_is_paused.test.ts
rename to x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/parse_is_paused.test.ts
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/parse_url_int.test.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/parse_url_int.test.ts
new file mode 100644
index 00000000000000..a5c2168378089d
--- /dev/null
+++ b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/parse_url_int.test.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { parseUrlInt } from '../parse_url_int';
+
+describe('parseUrlInt', () => {
+ it('parses a number', () => {
+ const result = parseUrlInt('23', 50);
+ expect(result).toBe(23);
+ });
+
+ it('returns default value for empty string', () => {
+ const result = parseUrlInt('', 50);
+ expect(result).toBe(50);
+ });
+
+ it('returns default value for non-numeric string', () => {
+ const result = parseUrlInt('abc', 50);
+ expect(result).toBe(50);
+ });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
rename to x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/index.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/index.ts
rename to x-pack/plugins/uptime/public/lib/helper/url_params/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts
rename to x-pack/plugins/uptime/public/lib/helper/url_params/parse_absolute_date.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_is_paused.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/parse_is_paused.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_is_paused.ts
rename to x-pack/plugins/uptime/public/lib/helper/url_params/parse_is_paused.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_url_int.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/parse_url_int.ts
similarity index 87%
rename from x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_url_int.ts
rename to x-pack/plugins/uptime/public/lib/helper/url_params/parse_url_int.ts
index b1a4d0a2aba0d8..0e5363527b5163 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/url_params/parse_url_int.ts
+++ b/x-pack/plugins/uptime/public/lib/helper/url_params/parse_url_int.ts
@@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-// TODO: add a comment explaining the purpose of this function
export const parseUrlInt = (value: string | undefined, defaultValue: number): number => {
const parsed = parseInt(value || '', 10);
return isNaN(parsed) ? defaultValue : parsed;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/index.ts b/x-pack/plugins/uptime/public/lib/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/index.ts
rename to x-pack/plugins/uptime/public/lib/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/lib/lib.ts b/x-pack/plugins/uptime/public/lib/lib.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/lib/lib.ts
rename to x-pack/plugins/uptime/public/lib/lib.ts
diff --git a/x-pack/legacy/plugins/uptime/public/pages/__tests__/__snapshots__/monitor.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/monitor.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/__tests__/__snapshots__/monitor.test.tsx.snap
rename to x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/monitor.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/pages/__tests__/__snapshots__/not_found.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/not_found.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/__tests__/__snapshots__/not_found.test.tsx.snap
rename to x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/not_found.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/pages/__tests__/__snapshots__/overview.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/overview.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/__tests__/__snapshots__/overview.test.tsx.snap
rename to x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/overview.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap
rename to x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap
diff --git a/x-pack/legacy/plugins/uptime/public/pages/__tests__/monitor.test.tsx b/x-pack/plugins/uptime/public/pages/__tests__/monitor.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/__tests__/monitor.test.tsx
rename to x-pack/plugins/uptime/public/pages/__tests__/monitor.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/pages/__tests__/not_found.test.tsx b/x-pack/plugins/uptime/public/pages/__tests__/not_found.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/__tests__/not_found.test.tsx
rename to x-pack/plugins/uptime/public/pages/__tests__/not_found.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/pages/__tests__/overview.test.tsx b/x-pack/plugins/uptime/public/pages/__tests__/overview.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/__tests__/overview.test.tsx
rename to x-pack/plugins/uptime/public/pages/__tests__/overview.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/pages/__tests__/page_header.test.tsx b/x-pack/plugins/uptime/public/pages/__tests__/page_header.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/__tests__/page_header.test.tsx
rename to x-pack/plugins/uptime/public/pages/__tests__/page_header.test.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/pages/index.ts b/x-pack/plugins/uptime/public/pages/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/index.ts
rename to x-pack/plugins/uptime/public/pages/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx b/x-pack/plugins/uptime/public/pages/monitor.tsx
similarity index 87%
rename from x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
rename to x-pack/plugins/uptime/public/pages/monitor.tsx
index 4495be9b24dc1f..8a309db75acd23 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/plugins/uptime/public/pages/monitor.tsx
@@ -7,14 +7,13 @@
import { EuiSpacer } from '@elastic/eui';
import React from 'react';
import { useSelector } from 'react-redux';
-import { useTrackPageview } from '../../../../../plugins/observability/public';
import { monitorStatusSelector } from '../state/selectors';
import { PageHeader } from './page_header';
import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
+import { useTrackPageview } from '../../../observability/public';
import { useMonitorId, useUptimeTelemetry, UptimePage } from '../hooks';
import { MonitorCharts } from '../components/monitor';
-import { MonitorStatusDetails } from '../components/monitor';
-import { PingList } from '../components/monitor';
+import { MonitorStatusDetails, PingList } from '../components/monitor';
export const MonitorPage: React.FC = () => {
const monitorId = useMonitorId();
diff --git a/x-pack/legacy/plugins/uptime/public/pages/not_found.tsx b/x-pack/plugins/uptime/public/pages/not_found.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/not_found.tsx
rename to x-pack/plugins/uptime/public/pages/not_found.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/plugins/uptime/public/pages/overview.tsx
similarity index 96%
rename from x-pack/legacy/plugins/uptime/public/pages/overview.tsx
rename to x-pack/plugins/uptime/public/pages/overview.tsx
index adc36efa6f7db1..fefd804cbfabf0 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/plugins/uptime/public/pages/overview.tsx
@@ -10,11 +10,11 @@ import styled from 'styled-components';
import { i18n } from '@kbn/i18n';
import { useUptimeTelemetry, UptimePage, useGetUrlParams } from '../hooks';
import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
-import { useTrackPageview } from '../../../../../plugins/observability/public';
-import { DataPublicPluginSetup, IIndexPattern } from '../../../../../../src/plugins/data/public';
-import { useUpdateKueryString } from '../hooks';
import { PageHeader } from './page_header';
+import { DataPublicPluginSetup, IIndexPattern } from '../../../../../src/plugins/data/public';
+import { useUpdateKueryString } from '../hooks';
import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
+import { useTrackPageview } from '../../../observability/public';
import { MonitorList } from '../components/overview/monitor_list/monitor_list_container';
import { EmptyState, FilterGroup, KueryBar, ParsingErrorCallout } from '../components/overview';
import { StatusPanel } from '../components/overview/status_panel';
diff --git a/x-pack/legacy/plugins/uptime/public/pages/page_header.tsx b/x-pack/plugins/uptime/public/pages/page_header.tsx
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/page_header.tsx
rename to x-pack/plugins/uptime/public/pages/page_header.tsx
diff --git a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx b/x-pack/plugins/uptime/public/pages/settings.tsx
similarity index 98%
rename from x-pack/legacy/plugins/uptime/public/pages/settings.tsx
rename to x-pack/plugins/uptime/public/pages/settings.tsx
index d8c2a780928541..52096a49435d72 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/plugins/uptime/public/pages/settings.tsx
@@ -24,7 +24,7 @@ import { getDynamicSettings, setDynamicSettings } from '../state/actions/dynamic
import { DynamicSettings } from '../../common/runtime_types';
import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
import { OVERVIEW_ROUTE } from '../../common/constants';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { useKibana } from '../../../../../src/plugins/kibana_react/public';
import { UptimePage, useUptimeTelemetry } from '../hooks';
import { IndicesForm } from '../components/settings/indices_form';
import {
diff --git a/x-pack/legacy/plugins/uptime/public/pages/translations.ts b/x-pack/plugins/uptime/public/pages/translations.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/pages/translations.ts
rename to x-pack/plugins/uptime/public/pages/translations.ts
diff --git a/x-pack/legacy/plugins/uptime/public/routes.tsx b/x-pack/plugins/uptime/public/routes.tsx
similarity index 93%
rename from x-pack/legacy/plugins/uptime/public/routes.tsx
rename to x-pack/plugins/uptime/public/routes.tsx
index b5e20ef8a70a9b..eb0587c0417a2b 100644
--- a/x-pack/legacy/plugins/uptime/public/routes.tsx
+++ b/x-pack/plugins/uptime/public/routes.tsx
@@ -6,7 +6,7 @@
import React, { FC } from 'react';
import { Route, Switch } from 'react-router-dom';
-import { DataPublicPluginSetup } from '../../../../../src/plugins/data/public';
+import { DataPublicPluginSetup } from '../../../../src/plugins/data/public';
import { OverviewPage } from './components/overview/overview_container';
import { MONITOR_ROUTE, OVERVIEW_ROUTE, SETTINGS_ROUTE } from '../common/constants';
import { MonitorPage, NotFoundPage, SettingsPage } from './pages';
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/__tests__/__snapshots__/overview_filters.test.ts.snap b/x-pack/plugins/uptime/public/state/actions/__tests__/__snapshots__/overview_filters.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/__tests__/__snapshots__/overview_filters.test.ts.snap
rename to x-pack/plugins/uptime/public/state/actions/__tests__/__snapshots__/overview_filters.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/__tests__/overview_filters.test.ts b/x-pack/plugins/uptime/public/state/actions/__tests__/overview_filters.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/__tests__/overview_filters.test.ts
rename to x-pack/plugins/uptime/public/state/actions/__tests__/overview_filters.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/dynamic_settings.ts b/x-pack/plugins/uptime/public/state/actions/dynamic_settings.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/dynamic_settings.ts
rename to x-pack/plugins/uptime/public/state/actions/dynamic_settings.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index.ts b/x-pack/plugins/uptime/public/state/actions/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/index.ts
rename to x-pack/plugins/uptime/public/state/actions/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index_patternts.ts b/x-pack/plugins/uptime/public/state/actions/index_patternts.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/index_patternts.ts
rename to x-pack/plugins/uptime/public/state/actions/index_patternts.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts b/x-pack/plugins/uptime/public/state/actions/index_status.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts
rename to x-pack/plugins/uptime/public/state/actions/index_status.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts
similarity index 82%
rename from x-pack/legacy/plugins/uptime/public/state/actions/ml_anomaly.ts
rename to x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts
index 67c75314a7305b..441a3cefdf204d 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/ml_anomaly.ts
+++ b/x-pack/plugins/uptime/public/state/actions/ml_anomaly.ts
@@ -6,15 +6,15 @@
import { createAction } from 'redux-actions';
import { createAsyncAction } from './utils';
-import { MlCapabilitiesResponse } from '../../../../../../plugins/ml/common/types/capabilities';
-import { AnomaliesTableRecord } from '../../../../../../plugins/ml/common/types/anomalies';
+import { MlCapabilitiesResponse } from '../../../../../plugins/ml/common/types/capabilities';
+import { AnomaliesTableRecord } from '../../../../../plugins/ml/common/types/anomalies';
import {
CreateMLJobSuccess,
DeleteJobResults,
MonitorIdParam,
HeartbeatIndicesParam,
} from './types';
-import { JobExistResult } from '../../../../../../plugins/ml/common/types/data_recognizer';
+import { JobExistResult } from '../../../../../plugins/ml/common/types/data_recognizer';
export const resetMLState = createAction('RESET_ML_STATE');
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts b/x-pack/plugins/uptime/public/state/actions/monitor.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts
rename to x-pack/plugins/uptime/public/state/actions/monitor.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/monitor_duration.ts b/x-pack/plugins/uptime/public/state/actions/monitor_duration.ts
similarity index 90%
rename from x-pack/legacy/plugins/uptime/public/state/actions/monitor_duration.ts
rename to x-pack/plugins/uptime/public/state/actions/monitor_duration.ts
index 9a2db5be60b12a..524044f873687a 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/monitor_duration.ts
+++ b/x-pack/plugins/uptime/public/state/actions/monitor_duration.ts
@@ -7,7 +7,7 @@
import { createAction } from 'redux-actions';
import { QueryParams } from './types';
import { MonitorDurationResult } from '../../../common/types';
-import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
+import { IHttpFetchError } from '../../../../../../target/types/core/public/http';
type MonitorQueryParams = QueryParams & { monitorId: string };
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/monitor_list.ts b/x-pack/plugins/uptime/public/state/actions/monitor_list.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/monitor_list.ts
rename to x-pack/plugins/uptime/public/state/actions/monitor_list.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.ts b/x-pack/plugins/uptime/public/state/actions/monitor_status.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.ts
rename to x-pack/plugins/uptime/public/state/actions/monitor_status.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/overview_filters.ts b/x-pack/plugins/uptime/public/state/actions/overview_filters.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/overview_filters.ts
rename to x-pack/plugins/uptime/public/state/actions/overview_filters.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/ping.ts b/x-pack/plugins/uptime/public/state/actions/ping.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/ping.ts
rename to x-pack/plugins/uptime/public/state/actions/ping.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/snapshot.ts b/x-pack/plugins/uptime/public/state/actions/snapshot.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/snapshot.ts
rename to x-pack/plugins/uptime/public/state/actions/snapshot.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts b/x-pack/plugins/uptime/public/state/actions/types.ts
similarity index 94%
rename from x-pack/legacy/plugins/uptime/public/state/actions/types.ts
rename to x-pack/plugins/uptime/public/state/actions/types.ts
index 41381afd31453f..dee2df77707d28 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
+++ b/x-pack/plugins/uptime/public/state/actions/types.ts
@@ -5,7 +5,7 @@
*/
import { Action } from 'redux-actions';
-import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
+import { IHttpFetchError } from '../../../../../../target/types/core/public/http';
export interface AsyncAction {
get: (payload: Payload) => Action;
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/ui.ts b/x-pack/plugins/uptime/public/state/actions/ui.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/actions/ui.ts
rename to x-pack/plugins/uptime/public/state/actions/ui.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/utils.ts b/x-pack/plugins/uptime/public/state/actions/utils.ts
similarity index 90%
rename from x-pack/legacy/plugins/uptime/public/state/actions/utils.ts
rename to x-pack/plugins/uptime/public/state/actions/utils.ts
index a5adb96731f330..8ce4cf011406be 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/utils.ts
+++ b/x-pack/plugins/uptime/public/state/actions/utils.ts
@@ -6,7 +6,7 @@
import { createAction } from 'redux-actions';
import { AsyncAction, AsyncAction1 } from './types';
-import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
+import { IHttpFetchError } from '../../../../../../target/types/core/public/http';
export function createAsyncAction(
actionStr: string
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/__tests__/__snapshots__/snapshot.test.ts.snap b/x-pack/plugins/uptime/public/state/api/__tests__/__snapshots__/snapshot.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/__tests__/__snapshots__/snapshot.test.ts.snap
rename to x-pack/plugins/uptime/public/state/api/__tests__/__snapshots__/snapshot.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/__tests__/ml_anomaly.test.ts b/x-pack/plugins/uptime/public/state/api/__tests__/ml_anomaly.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/__tests__/ml_anomaly.test.ts
rename to x-pack/plugins/uptime/public/state/api/__tests__/ml_anomaly.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/__tests__/snapshot.test.ts b/x-pack/plugins/uptime/public/state/api/__tests__/snapshot.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/__tests__/snapshot.test.ts
rename to x-pack/plugins/uptime/public/state/api/__tests__/snapshot.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/dynamic_settings.ts b/x-pack/plugins/uptime/public/state/api/dynamic_settings.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/dynamic_settings.ts
rename to x-pack/plugins/uptime/public/state/api/dynamic_settings.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/index.ts b/x-pack/plugins/uptime/public/state/api/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/index.ts
rename to x-pack/plugins/uptime/public/state/api/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/index_pattern.ts b/x-pack/plugins/uptime/public/state/api/index_pattern.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/index_pattern.ts
rename to x-pack/plugins/uptime/public/state/api/index_pattern.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/index_status.ts b/x-pack/plugins/uptime/public/state/api/index_status.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/index_status.ts
rename to x-pack/plugins/uptime/public/state/api/index_status.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/api/ml_anomaly.ts
similarity index 92%
rename from x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts
rename to x-pack/plugins/uptime/public/state/api/ml_anomaly.ts
index ca324895c26dbd..c4ecb769abefce 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts
+++ b/x-pack/plugins/uptime/public/state/api/ml_anomaly.ts
@@ -8,15 +8,15 @@ import moment from 'moment';
import { apiService } from './utils';
import { AnomalyRecords, AnomalyRecordsParams } from '../actions';
import { API_URLS, ML_JOB_ID, ML_MODULE_ID } from '../../../common/constants';
-import { MlCapabilitiesResponse } from '../../../../../../plugins/ml/common/types/capabilities';
+import { MlCapabilitiesResponse } from '../../../../../plugins/ml/common/types/capabilities';
import {
CreateMLJobSuccess,
DeleteJobResults,
MonitorIdParam,
HeartbeatIndicesParam,
} from '../actions/types';
-import { DataRecognizerConfigResponse } from '../../../../../../plugins/ml/common/types/modules';
-import { JobExistResult } from '../../../../../../plugins/ml/common/types/data_recognizer';
+import { DataRecognizerConfigResponse } from '../../../../../plugins/ml/common/types/modules';
+import { JobExistResult } from '../../../../../plugins/ml/common/types/data_recognizer';
const getJobPrefix = (monitorId: string) => {
// ML App doesn't support upper case characters in job name
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/monitor.ts b/x-pack/plugins/uptime/public/state/api/monitor.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/monitor.ts
rename to x-pack/plugins/uptime/public/state/api/monitor.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/monitor_duration.ts b/x-pack/plugins/uptime/public/state/api/monitor_duration.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/monitor_duration.ts
rename to x-pack/plugins/uptime/public/state/api/monitor_duration.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/monitor_list.ts b/x-pack/plugins/uptime/public/state/api/monitor_list.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/monitor_list.ts
rename to x-pack/plugins/uptime/public/state/api/monitor_list.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts b/x-pack/plugins/uptime/public/state/api/monitor_status.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts
rename to x-pack/plugins/uptime/public/state/api/monitor_status.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/overview_filters.ts b/x-pack/plugins/uptime/public/state/api/overview_filters.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/overview_filters.ts
rename to x-pack/plugins/uptime/public/state/api/overview_filters.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/ping.ts b/x-pack/plugins/uptime/public/state/api/ping.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/ping.ts
rename to x-pack/plugins/uptime/public/state/api/ping.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/snapshot.ts b/x-pack/plugins/uptime/public/state/api/snapshot.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/snapshot.ts
rename to x-pack/plugins/uptime/public/state/api/snapshot.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/types.ts b/x-pack/plugins/uptime/public/state/api/types.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/api/types.ts
rename to x-pack/plugins/uptime/public/state/api/types.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/utils.ts b/x-pack/plugins/uptime/public/state/api/utils.ts
similarity index 95%
rename from x-pack/legacy/plugins/uptime/public/state/api/utils.ts
rename to x-pack/plugins/uptime/public/state/api/utils.ts
index e67efa8570c110..acd9bec5a74bcb 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/utils.ts
+++ b/x-pack/plugins/uptime/public/state/api/utils.ts
@@ -6,7 +6,7 @@
import { PathReporter } from 'io-ts/lib/PathReporter';
import { isRight } from 'fp-ts/lib/Either';
-import { HttpFetchQuery, HttpSetup } from '../../../../../../../target/types/core/public';
+import { HttpFetchQuery, HttpSetup } from '../../../../../../target/types/core/public';
class ApiService {
private static instance: ApiService;
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/__tests__/fetch_effect.test.ts b/x-pack/plugins/uptime/public/state/effects/__tests__/fetch_effect.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/__tests__/fetch_effect.test.ts
rename to x-pack/plugins/uptime/public/state/effects/__tests__/fetch_effect.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/dynamic_settings.ts b/x-pack/plugins/uptime/public/state/effects/dynamic_settings.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/dynamic_settings.ts
rename to x-pack/plugins/uptime/public/state/effects/dynamic_settings.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts b/x-pack/plugins/uptime/public/state/effects/fetch_effect.ts
similarity index 94%
rename from x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts
rename to x-pack/plugins/uptime/public/state/effects/fetch_effect.ts
index b0734cb5ccabbc..0aa85609fe4f06 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts
+++ b/x-pack/plugins/uptime/public/state/effects/fetch_effect.ts
@@ -6,7 +6,7 @@
import { call, put } from 'redux-saga/effects';
import { Action } from 'redux-actions';
-import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
+import { IHttpFetchError } from '../../../../../../target/types/core/public/http';
/**
* Factory function for a fetch effect. It expects three action creators,
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts b/x-pack/plugins/uptime/public/state/effects/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/index.ts
rename to x-pack/plugins/uptime/public/state/effects/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/index_pattern.ts b/x-pack/plugins/uptime/public/state/effects/index_pattern.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/index_pattern.ts
rename to x-pack/plugins/uptime/public/state/effects/index_pattern.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/index_status.ts b/x-pack/plugins/uptime/public/state/effects/index_status.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/index_status.ts
rename to x-pack/plugins/uptime/public/state/effects/index_status.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/ml_anomaly.ts
rename to x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts b/x-pack/plugins/uptime/public/state/effects/monitor.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts
rename to x-pack/plugins/uptime/public/state/effects/monitor.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/monitor_duration.ts b/x-pack/plugins/uptime/public/state/effects/monitor_duration.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/monitor_duration.ts
rename to x-pack/plugins/uptime/public/state/effects/monitor_duration.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/monitor_list.ts b/x-pack/plugins/uptime/public/state/effects/monitor_list.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/monitor_list.ts
rename to x-pack/plugins/uptime/public/state/effects/monitor_list.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/monitor_status.ts b/x-pack/plugins/uptime/public/state/effects/monitor_status.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/monitor_status.ts
rename to x-pack/plugins/uptime/public/state/effects/monitor_status.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/overview_filters.ts b/x-pack/plugins/uptime/public/state/effects/overview_filters.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/overview_filters.ts
rename to x-pack/plugins/uptime/public/state/effects/overview_filters.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/ping.ts b/x-pack/plugins/uptime/public/state/effects/ping.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/ping.ts
rename to x-pack/plugins/uptime/public/state/effects/ping.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/snapshot.ts b/x-pack/plugins/uptime/public/state/effects/snapshot.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/effects/snapshot.ts
rename to x-pack/plugins/uptime/public/state/effects/snapshot.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/index.ts b/x-pack/plugins/uptime/public/state/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/index.ts
rename to x-pack/plugins/uptime/public/state/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/kibana_service.ts b/x-pack/plugins/uptime/public/state/kibana_service.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/kibana_service.ts
rename to x-pack/plugins/uptime/public/state/kibana_service.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/snapshot.test.ts.snap b/x-pack/plugins/uptime/public/state/reducers/__tests__/__snapshots__/snapshot.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/snapshot.test.ts.snap
rename to x-pack/plugins/uptime/public/state/reducers/__tests__/__snapshots__/snapshot.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap b/x-pack/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap
rename to x-pack/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/snapshot.test.ts b/x-pack/plugins/uptime/public/state/reducers/__tests__/snapshot.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/snapshot.test.ts
rename to x-pack/plugins/uptime/public/state/reducers/__tests__/snapshot.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts b/x-pack/plugins/uptime/public/state/reducers/__tests__/ui.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts
rename to x-pack/plugins/uptime/public/state/reducers/__tests__/ui.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/dynamic_settings.ts b/x-pack/plugins/uptime/public/state/reducers/dynamic_settings.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/dynamic_settings.ts
rename to x-pack/plugins/uptime/public/state/reducers/dynamic_settings.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts b/x-pack/plugins/uptime/public/state/reducers/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
rename to x-pack/plugins/uptime/public/state/reducers/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts b/x-pack/plugins/uptime/public/state/reducers/index_pattern.ts
similarity index 92%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts
rename to x-pack/plugins/uptime/public/state/reducers/index_pattern.ts
index bc482e2f35c451..b357f5a904ea63 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/index_pattern.ts
@@ -5,7 +5,7 @@
*/
import { handleActions, Action } from 'redux-actions';
import { getIndexPattern, getIndexPatternSuccess, getIndexPatternFail } from '../actions';
-import { IIndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns';
+import { IIndexPattern } from '../../../../../../src/plugins/data/common/index_patterns';
export interface IndexPatternState {
index_pattern: IIndexPattern | null;
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index_status.ts b/x-pack/plugins/uptime/public/state/reducers/index_status.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/index_status.ts
rename to x-pack/plugins/uptime/public/state/reducers/index_status.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
similarity index 88%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/ml_anomaly.ts
rename to x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
index df5e825c3488b9..61e03a95929211 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/ml_anomaly.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
@@ -15,11 +15,11 @@ import {
getMLCapabilitiesAction,
} from '../actions';
import { getAsyncInitialState, handleAsyncAction } from './utils';
-import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
+import { IHttpFetchError } from '../../../../../../target/types/core/public/http';
import { AsyncInitialState } from './types';
-import { MlCapabilitiesResponse } from '../../../../../../plugins/ml/common/types/capabilities';
+import { MlCapabilitiesResponse } from '../../../../../plugins/ml/common/types/capabilities';
import { CreateMLJobSuccess, DeleteJobResults } from '../actions/types';
-import { JobExistResult } from '../../../../../../plugins/ml/common/types/data_recognizer';
+import { JobExistResult } from '../../../../../plugins/ml/common/types/data_recognizer';
export interface MLJobState {
mlJob: AsyncInitialState;
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor.ts b/x-pack/plugins/uptime/public/state/reducers/monitor.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/monitor.ts
rename to x-pack/plugins/uptime/public/state/reducers/monitor.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_duration.ts b/x-pack/plugins/uptime/public/state/reducers/monitor_duration.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/monitor_duration.ts
rename to x-pack/plugins/uptime/public/state/reducers/monitor_duration.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_list.ts b/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/monitor_list.ts
rename to x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts b/x-pack/plugins/uptime/public/state/reducers/monitor_status.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts
rename to x-pack/plugins/uptime/public/state/reducers/monitor_status.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/overview_filters.ts b/x-pack/plugins/uptime/public/state/reducers/overview_filters.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/overview_filters.ts
rename to x-pack/plugins/uptime/public/state/reducers/overview_filters.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/ping.ts b/x-pack/plugins/uptime/public/state/reducers/ping.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/ping.ts
rename to x-pack/plugins/uptime/public/state/reducers/ping.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/ping_list.ts b/x-pack/plugins/uptime/public/state/reducers/ping_list.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/ping_list.ts
rename to x-pack/plugins/uptime/public/state/reducers/ping_list.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/snapshot.ts b/x-pack/plugins/uptime/public/state/reducers/snapshot.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/snapshot.ts
rename to x-pack/plugins/uptime/public/state/reducers/snapshot.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/types.ts b/x-pack/plugins/uptime/public/state/reducers/types.ts
similarity index 81%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/types.ts
rename to x-pack/plugins/uptime/public/state/reducers/types.ts
index 88995a2f5dd70c..c81ee6875f305a 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/types.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/types.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
+import { IHttpFetchError } from '../../../../../../target/types/core/public/http';
export interface AsyncInitialState {
data: ReduceStateType | null;
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts b/x-pack/plugins/uptime/public/state/reducers/ui.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts
rename to x-pack/plugins/uptime/public/state/reducers/ui.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts b/x-pack/plugins/uptime/public/state/reducers/utils.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts
rename to x-pack/plugins/uptime/public/state/reducers/utils.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
rename to x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts b/x-pack/plugins/uptime/public/state/selectors/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
rename to x-pack/plugins/uptime/public/state/selectors/index.ts
diff --git a/x-pack/legacy/plugins/uptime/public/uptime_app.tsx b/x-pack/plugins/uptime/public/uptime_app.tsx
similarity index 75%
rename from x-pack/legacy/plugins/uptime/public/uptime_app.tsx
rename to x-pack/plugins/uptime/public/uptime_app.tsx
index 92775a26638633..0d18f959230d11 100644
--- a/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
+++ b/x-pack/plugins/uptime/public/uptime_app.tsx
@@ -10,13 +10,14 @@ import React, { useEffect } from 'react';
import { Provider as ReduxProvider } from 'react-redux';
import { BrowserRouter as Router } from 'react-router-dom';
import { I18nStart, ChromeBreadcrumb, CoreStart } from 'src/core/public';
-import { PluginsSetup } from 'ui/new_platform/new_platform';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
+import { ClientPluginsSetup, ClientPluginsStart } from './apps/plugin';
import { UMUpdateBadge } from './lib/lib';
import {
UptimeRefreshContextProvider,
UptimeSettingsContextProvider,
UptimeThemeContextProvider,
+ UptimeStartupPluginsContextProvider,
} from './contexts';
import { CommonlyUsedRange } from './components/common/uptime_date_picker';
import { store } from './state';
@@ -47,7 +48,8 @@ export interface UptimeAppProps {
isInfraAvailable: boolean;
isLogsAvailable: boolean;
kibanaBreadcrumbs: ChromeBreadcrumb[];
- plugins: PluginsSetup;
+ plugins: ClientPluginsSetup;
+ startPlugins: ClientPluginsStart;
routerBasename: string;
setBadge: UMUpdateBadge;
renderGlobalHelpControls(): void;
@@ -66,6 +68,7 @@ const Application = (props: UptimeAppProps) => {
renderGlobalHelpControls,
routerBasename,
setBadge,
+ startPlugins,
} = props;
useEffect(() => {
@@ -87,7 +90,6 @@ const Application = (props: UptimeAppProps) => {
kibanaService.core = core;
- // @ts-ignore
store.dispatch(setBasePath(basePath));
return (
@@ -99,17 +101,19 @@ const Application = (props: UptimeAppProps) => {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/x-pack/plugins/uptime/server/kibana.index.ts b/x-pack/plugins/uptime/server/kibana.index.ts
index 725b53aeca02db..d68bbabe82b861 100644
--- a/x-pack/plugins/uptime/server/kibana.index.ts
+++ b/x-pack/plugins/uptime/server/kibana.index.ts
@@ -5,7 +5,7 @@
*/
import { Request, Server } from 'hapi';
-import { PLUGIN } from '../../../legacy/plugins/uptime/common/constants';
+import { PLUGIN } from '../common/constants';
import { compose } from './lib/compose/kibana';
import { initUptimeServer } from './uptime_server';
import { UptimeCorePlugins, UptimeCoreSetup } from './lib/adapters/framework';
diff --git a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
index 98c6be5aa3c8e8..f4d1c72770494d 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
@@ -13,7 +13,7 @@ import {
} from 'src/core/server';
import { UMKibanaRoute } from '../../../rest_api';
import { PluginSetupContract } from '../../../../../features/server';
-import { DynamicSettings } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { DynamicSettings } from '../../../../common/runtime_types';
export type APICaller = (
endpoint: string,
@@ -31,7 +31,7 @@ export type UMSavedObjectsQueryFn = (
) => Promise | T;
export interface UptimeCoreSetup {
- route: IRouter;
+ router: IRouter;
}
export interface UptimeCorePlugins {
diff --git a/x-pack/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts
index 0176471aec1be2..46f46720d4c04a 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -21,10 +21,10 @@ export class UMKibanaBackendFrameworkAdapter implements UMBackendFrameworkAdapte
};
switch (method) {
case 'GET':
- this.server.route.get(routeDefinition, handler);
+ this.server.router.get(routeDefinition, handler);
break;
case 'POST':
- this.server.route.post(routeDefinition, handler);
+ this.server.router.post(routeDefinition, handler);
break;
default:
throw new Error(`Handler for method ${method} is not defined`);
diff --git a/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts b/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts
index 4f4c6e3011ad14..24da3f3fa4d067 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts
@@ -16,7 +16,7 @@ import { AlertType } from '../../../../../alerting/server';
import { IRouter } from 'kibana/server';
import { UMServerLibs } from '../../lib';
import { UptimeCoreSetup } from '../../adapters';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
import { alertsMock, AlertServicesMock } from '../../../../../alerting/server/mocks';
/**
@@ -27,10 +27,10 @@ import { alertsMock, AlertServicesMock } from '../../../../../alerting/server/mo
* so we don't have to mock them all for each test.
*/
const bootstrapDependencies = (customRequests?: any) => {
- const route: IRouter = {} as IRouter;
+ const router: IRouter = {} as IRouter;
// these server/libs parameters don't have any functionality, which is fine
// because we aren't testing them here
- const server: UptimeCoreSetup = { route };
+ const server: UptimeCoreSetup = { router };
const libs: UMServerLibs = { requests: {} } as UMServerLibs;
libs.requests = { ...libs.requests, ...customRequests };
return { server, libs };
diff --git a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts b/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
index 829e6f92d37020..f9df559a3977ba 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
@@ -9,14 +9,14 @@ import { isRight } from 'fp-ts/lib/Either';
import { ThrowReporter } from 'io-ts/lib/ThrowReporter';
import { i18n } from '@kbn/i18n';
import { AlertExecutorOptions } from '../../../../alerting/server';
-import { ACTION_GROUP_DEFINITIONS } from '../../../../../legacy/plugins/uptime/common/constants';
import { UptimeAlertTypeFactory } from './types';
import { GetMonitorStatusResult } from '../requests';
import {
StatusCheckExecutorParamsType,
StatusCheckAlertStateType,
StatusCheckAlertState,
-} from '../../../../../legacy/plugins/uptime/common/runtime_types';
+} from '../../../common/runtime_types';
+import { ACTION_GROUP_DEFINITIONS } from '../../../common/constants';
import { savedObjectsAdapter } from '../saved_objects';
const { MONITOR_STATUS } = ACTION_GROUP_DEFINITIONS;
diff --git a/x-pack/plugins/uptime/server/lib/helper/get_histogram_interval.ts b/x-pack/plugins/uptime/server/lib/helper/get_histogram_interval.ts
index fb44f5727aab38..26515fb4b4c63b 100644
--- a/x-pack/plugins/uptime/server/lib/helper/get_histogram_interval.ts
+++ b/x-pack/plugins/uptime/server/lib/helper/get_histogram_interval.ts
@@ -5,7 +5,7 @@
*/
import DateMath from '@elastic/datemath';
-import { QUERY } from '../../../../../legacy/plugins/uptime/common/constants';
+import { QUERY } from '../../../common/constants';
export const parseRelativeDate = (dateStr: string, options = {}) => {
// We need this this parsing because if user selects This week or this date
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_certs.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_certs.test.ts
index b49a6b22ff9768..894e2316dc927f 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_certs.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_certs.test.ts
@@ -5,7 +5,7 @@
*/
import { getCerts } from '../get_certs';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
describe('getCerts', () => {
let mockHits: any;
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
index 03e2bc7a44bd04..75bf5096bd9978 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
@@ -5,7 +5,7 @@
*/
import { getLatestMonitor } from '../get_latest_monitor';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
describe('getLatestMonitor', () => {
let expectedGetLatestSearchParams: any;
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts
index 5d3f9ce8d4ad9d..45be1df3e8d3bf 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts
@@ -7,7 +7,7 @@
import { set } from 'lodash';
import mockChartsData from './monitor_charts_mock.json';
import { getMonitorDurationChart } from '../get_monitor_duration';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
describe('ElasticsearchMonitorsAdapter', () => {
it('getMonitorChartsData will provide expected filters', async () => {
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
index e47be617d7c994..82e624221c301c 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
@@ -6,8 +6,8 @@
import { elasticsearchServiceMock } from '../../../../../../../src/core/server/mocks';
import { getMonitorStatus } from '../get_monitor_status';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
import { ScopedClusterClient } from 'src/core/server';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
interface BucketItemCriteria {
monitor_id: string;
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_ping_histogram.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_ping_histogram.test.ts
index 4de7d3ffd2a7d5..e456670a5e68de 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_ping_histogram.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_ping_histogram.test.ts
@@ -5,7 +5,7 @@
*/
import { getPingHistogram } from '../get_ping_histogram';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
describe('getPingHistogram', () => {
const standardMockResponse: any = {
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts
index abd3655cc64028..fd890a30cf7428 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts
@@ -6,7 +6,7 @@
import { getPings } from '../get_pings';
import { set } from 'lodash';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../legacy/plugins/uptime/common/constants';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
describe('getAll', () => {
let mockEsSearchResult: any;
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_certs.ts b/x-pack/plugins/uptime/server/lib/requests/get_certs.ts
index 4f99fbe94d54c7..b427e7cae1a7e8 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_certs.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_certs.ts
@@ -5,7 +5,7 @@
*/
import { UMElasticsearchQueryFn } from '../adapters';
-import { Cert, GetCertsParams } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { Cert, GetCertsParams } from '../../../common/runtime_types';
export const getCerts: UMElasticsearchQueryFn = async ({
callES,
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_filter_bar.ts b/x-pack/plugins/uptime/server/lib/requests/get_filter_bar.ts
index 95d23ddcbf466e..dbe71cf689214f 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_filter_bar.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_filter_bar.ts
@@ -5,7 +5,7 @@
*/
import { UMElasticsearchQueryFn } from '../adapters';
-import { OverviewFilters } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { OverviewFilters } from '../../../common/runtime_types';
import { generateFilterAggs } from './generate_filter_aggs';
export interface GetFilterBarParams {
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts
index 6f7854d35b308b..7688f04f1acd95 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts
@@ -5,7 +5,7 @@
*/
import { UMElasticsearchQueryFn } from '../adapters';
-import { StatesIndexStatus } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { StatesIndexStatus } from '../../../common/runtime_types';
export const getIndexStatus: UMElasticsearchQueryFn<{}, StatesIndexStatus> = async ({
callES,
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
index a8e9ccb875a08c..98ce449002f217 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
@@ -5,7 +5,7 @@
*/
import { UMElasticsearchQueryFn } from '../adapters';
-import { Ping } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { Ping } from '../../../common/runtime_types';
export interface GetLatestMonitorParams {
/** @member dateRangeStart timestamp bounds */
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
index 4ce7176b57b199..cf4ffa339ddfc5 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
@@ -5,10 +5,7 @@
*/
import { UMElasticsearchQueryFn } from '../adapters';
-import {
- MonitorDetails,
- MonitorError,
-} from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { MonitorDetails, MonitorError } from '../../../common/runtime_types';
export interface GetMonitorDetailsParams {
monitorId: string;
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts
index e9c745b0a87133..ea2a7e790652bd 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts
@@ -5,11 +5,8 @@
*/
import { UMElasticsearchQueryFn } from '../adapters';
-import { QUERY } from '../../../../../legacy/plugins/uptime/common/constants';
-import {
- LocationDurationLine,
- MonitorDurationResult,
-} from '../../../../../legacy/plugins/uptime/common/types';
+import { LocationDurationLine, MonitorDurationResult } from '../../../common/types';
+import { QUERY } from '../../../common/constants';
export interface GetMonitorChartsParams {
/** @member monitorId ID value for the selected monitor */
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts
index f49e404ffb084b..c8d3ca043edc50 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts
@@ -5,11 +5,8 @@
*/
import { UMElasticsearchQueryFn } from '../adapters';
-import { UNNAMED_LOCATION } from '../../../../../legacy/plugins/uptime/common/constants';
-import {
- MonitorLocations,
- MonitorLocation,
-} from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { MonitorLocations, MonitorLocation } from '../../../common/runtime_types';
+import { UNNAMED_LOCATION } from '../../../common/constants';
/**
* Fetch data for the monitor page title.
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts
index 4b40943a857051..b1791dd04861c4 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_states.ts
@@ -4,15 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { CONTEXT_DEFAULTS } from '../../../../../legacy/plugins/uptime/common/constants';
+import { CONTEXT_DEFAULTS } from '../../../common/constants';
import { fetchPage } from './search';
import { UMElasticsearchQueryFn } from '../adapters';
-import {
- SortOrder,
- CursorDirection,
- MonitorSummary,
-} from '../../../../../legacy/plugins/uptime/common/runtime_types';
-
+import { MonitorSummary, SortOrder, CursorDirection } from '../../../common/runtime_types';
import { QueryContext } from './search';
export interface CursorPagination {
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts b/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
index 5a8927764ea5c2..299913c8dff086 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
@@ -5,12 +5,9 @@
*/
import { UMElasticsearchQueryFn } from '../adapters';
-import { QUERY } from '../../../../../legacy/plugins/uptime/common/constants';
import { getFilterClause } from '../helper';
-import {
- HistogramResult,
- HistogramQueryResult,
-} from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { HistogramResult, HistogramQueryResult } from '../../../common/runtime_types';
+import { QUERY } from '../../../common/constants';
export interface GetPingHistogramParams {
/** @member dateRangeStart timestamp bounds */
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_pings.ts b/x-pack/plugins/uptime/server/lib/requests/get_pings.ts
index 6eccfdb13cef74..a6a0e3c3d6542e 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_pings.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_pings.ts
@@ -10,7 +10,7 @@ import {
HttpResponseBody,
PingsResponse,
Ping,
-} from '../../../../../legacy/plugins/uptime/common/runtime_types';
+} from '../../../common/runtime_types';
const DEFAULT_PAGE_SIZE = 25;
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts b/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
index 01f2ad88161cf0..b57bc87d454183 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
@@ -5,8 +5,8 @@
*/
import { UMElasticsearchQueryFn } from '../adapters';
-import { Snapshot } from '../../../../../legacy/plugins/uptime/common/runtime_types';
-import { CONTEXT_DEFAULTS } from '../../../../../legacy/plugins/uptime/common/constants';
+import { CONTEXT_DEFAULTS } from '../../../common/constants';
+import { Snapshot } from '../../../common/runtime_types';
import { QueryContext } from './search';
export interface GetSnapshotCountParams {
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/fetch_page.test.ts b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/fetch_page.test.ts
index 2a8f681ab34536..d4ad80c85ec3d5 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/fetch_page.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/fetch_page.test.ts
@@ -12,7 +12,7 @@ import {
MonitorGroupsPage,
} from '../fetch_page';
import { QueryContext } from '../query_context';
-import { MonitorSummary } from '../../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { MonitorSummary } from '../../../../../common/runtime_types';
import { nextPagination, prevPagination, simpleQueryContext } from './test_helpers';
const simpleFixture: MonitorGroups[] = [
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts
index 84774cdeed8567..e53fff429dd8df 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts
@@ -6,10 +6,7 @@
import { QueryContext } from '../query_context';
import { CursorPagination } from '../types';
-import {
- CursorDirection,
- SortOrder,
-} from '../../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { CursorDirection, SortOrder } from '../../../../../common/runtime_types';
describe(QueryContext, () => {
// 10 minute range
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts
index 47034c21301164..40775bde1c7f5a 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts
@@ -5,10 +5,7 @@
*/
import { CursorPagination } from '../types';
-import {
- CursorDirection,
- SortOrder,
-} from '../../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { CursorDirection, SortOrder } from '../../../../../common/runtime_types';
import { QueryContext } from '../query_context';
export const prevPagination = (key: any): CursorPagination => {
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts b/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
index 4739c804d24e75..d21259fad77a66 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
@@ -6,14 +6,14 @@
import { get, sortBy } from 'lodash';
import { QueryContext } from './query_context';
-import { QUERY, STATES } from '../../../../../../legacy/plugins/uptime/common/constants';
+import { QUERY, STATES } from '../../../../common/constants';
import {
Check,
Histogram,
MonitorSummary,
CursorDirection,
SortOrder,
-} from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+} from '../../../../common/runtime_types';
import { MonitorEnricher } from './fetch_page';
export const enrichMonitorGroups: MonitorEnricher = async (
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/fetch_page.ts b/x-pack/plugins/uptime/server/lib/requests/search/fetch_page.ts
index 84167840d5d9ba..bef8106ad1896c 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/fetch_page.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/fetch_page.ts
@@ -7,12 +7,8 @@
import { flatten } from 'lodash';
import { CursorPagination } from './types';
import { QueryContext } from './query_context';
-import { QUERY } from '../../../../../../legacy/plugins/uptime/common/constants';
-import {
- CursorDirection,
- MonitorSummary,
- SortOrder,
-} from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { QUERY } from '../../../../common/constants';
+import { CursorDirection, MonitorSummary, SortOrder } from '../../../../common/runtime_types';
import { enrichMonitorGroups } from './enrich_monitor_groups';
import { MonitorGroupIterator } from './monitor_group_iterator';
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts b/x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
index 3449febfa5b053..e60c52660915a1 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
@@ -5,7 +5,7 @@
*/
import { get, set } from 'lodash';
-import { CursorDirection } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { CursorDirection } from '../../../../common/runtime_types';
import { QueryContext } from './query_context';
// This is the first phase of the query. In it, we find the most recent check groups that matched the given query.
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/monitor_group_iterator.ts b/x-pack/plugins/uptime/server/lib/requests/search/monitor_group_iterator.ts
index 31d9166eb1e73b..2fb95620282583 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/monitor_group_iterator.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/monitor_group_iterator.ts
@@ -6,7 +6,7 @@
import { QueryContext } from './query_context';
import { fetchChunk } from './fetch_chunk';
-import { CursorDirection } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { CursorDirection } from '../../../../common/runtime_types';
import { MonitorGroups } from './fetch_page';
import { CursorPagination } from './types';
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/refine_potential_matches.ts b/x-pack/plugins/uptime/server/lib/requests/search/refine_potential_matches.ts
index 43fc54fb258089..977c32ad1f984b 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/refine_potential_matches.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/refine_potential_matches.ts
@@ -5,7 +5,7 @@
*/
import { QueryContext } from './query_context';
-import { CursorDirection } from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { CursorDirection } from '../../../../common/runtime_types';
import { MonitorGroups, MonitorLocCheckGroup } from './fetch_page';
/**
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/types.ts b/x-pack/plugins/uptime/server/lib/requests/search/types.ts
index 2ec52d400b5972..35e9647196454e 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/types.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/types.ts
@@ -4,10 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import {
- CursorDirection,
- SortOrder,
-} from '../../../../../../legacy/plugins/uptime/common/runtime_types';
+import { CursorDirection, SortOrder } from '../../../../common/runtime_types';
export interface CursorPagination {
cursorKey?: any;
diff --git a/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts b/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts
index 84154429b91888..69507d2950cd84 100644
--- a/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts
@@ -8,10 +8,17 @@ import { UMElasticsearchQueryFn } from '../adapters';
import {
HistogramResult,
Ping,
- PingsResponse as PingResults,
+ PingsResponse,
GetCertsParams,
GetPingsParams,
-} from '../../../../../legacy/plugins/uptime/common/runtime_types';
+ Cert,
+ OverviewFilters,
+ MonitorDetails,
+ MonitorLocations,
+ Snapshot,
+ StatesIndexStatus,
+} from '../../../common/runtime_types';
+import { MonitorDurationResult } from '../../../common/types';
import {
GetFilterBarParams,
GetLatestMonitorParams,
@@ -23,17 +30,8 @@ import {
GetMonitorStatusParams,
GetMonitorStatusResult,
} from '.';
-import {
- OverviewFilters,
- MonitorDetails,
- MonitorLocations,
- Snapshot,
- StatesIndexStatus,
- Cert,
-} from '../../../../../legacy/plugins/uptime/common/runtime_types';
import { GetMonitorStatesResult } from './get_monitor_states';
import { GetSnapshotCountParams } from './get_snapshot_counts';
-import { MonitorDurationResult } from '../../../../../legacy/plugins/uptime/common/types';
type ESQ = UMElasticsearchQueryFn;
@@ -47,7 +45,7 @@ export interface UptimeRequests {
getMonitorLocations: ESQ;
getMonitorStates: ESQ;
getMonitorStatus: ESQ;
- getPings: ESQ;
+ getPings: ESQ;
getPingHistogram: ESQ;
getSnapshotCount: ESQ;
getIndexStatus: ESQ<{}, StatesIndexStatus>;
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects.ts b/x-pack/plugins/uptime/server/lib/saved_objects.ts
index d849fbd8ce0a8f..28b9eaad2cf6f0 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects.ts
+++ b/x-pack/plugins/uptime/server/lib/saved_objects.ts
@@ -4,8 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { DynamicSettings } from '../../../../legacy/plugins/uptime/common/runtime_types';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../legacy/plugins/uptime/common/constants';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../common/constants';
+import { DynamicSettings } from '../../common/runtime_types';
import { SavedObjectsType, SavedObjectsErrorHelpers } from '../../../../../src/core/server';
import { UMSavedObjectsQueryFn } from './adapters';
diff --git a/x-pack/plugins/uptime/server/plugin.ts b/x-pack/plugins/uptime/server/plugin.ts
index 7cc591a6b2db17..13d1ae216f2041 100644
--- a/x-pack/plugins/uptime/server/plugin.ts
+++ b/x-pack/plugins/uptime/server/plugin.ts
@@ -8,19 +8,20 @@ import {
PluginInitializerContext,
CoreStart,
CoreSetup,
+ Plugin as PluginType,
ISavedObjectsRepository,
} from '../../../../src/core/server';
import { initServerWithKibana } from './kibana.index';
import { KibanaTelemetryAdapter, UptimeCorePlugins } from './lib/adapters';
import { umDynamicSettings } from './lib/saved_objects';
-export class Plugin {
+export class Plugin implements PluginType {
private savedObjectsClient?: ISavedObjectsRepository;
constructor(_initializerContext: PluginInitializerContext) {}
public setup(core: CoreSetup, plugins: UptimeCorePlugins) {
- initServerWithKibana({ route: core.http.createRouter() }, plugins);
+ initServerWithKibana({ router: core.http.createRouter() }, plugins);
core.savedObjects.registerType(umDynamicSettings);
KibanaTelemetryAdapter.registerUsageCollector(
plugins.usageCollection,
@@ -28,7 +29,9 @@ export class Plugin {
);
}
- public start(_core: CoreStart, _plugins: any) {
- this.savedObjectsClient = _core.savedObjects.createInternalRepository();
+ public start(core: CoreStart, _plugins: any) {
+ this.savedObjectsClient = core.savedObjects.createInternalRepository();
}
+
+ public stop() {}
}
diff --git a/x-pack/plugins/uptime/server/rest_api/certs.ts b/x-pack/plugins/uptime/server/rest_api/certs.ts
index 31fb3f4ab96a78..f2e1700b23e7d8 100644
--- a/x-pack/plugins/uptime/server/rest_api/certs.ts
+++ b/x-pack/plugins/uptime/server/rest_api/certs.ts
@@ -7,7 +7,7 @@
import { schema } from '@kbn/config-schema';
import { UMServerLibs } from '../lib/lib';
import { UMRestApiRouteFactory } from '.';
-import { API_URLS } from '../../../../legacy/plugins/uptime/common/constants/rest_api';
+import { API_URLS } from '../../common/constants';
const DEFAULT_INDEX = 0;
const DEFAULT_SIZE = 25;
diff --git a/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts b/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts
index 3f4e2fc345182c..31833a25ee8acf 100644
--- a/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts
+++ b/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts
@@ -8,10 +8,7 @@ import { schema } from '@kbn/config-schema';
import { isRight } from 'fp-ts/lib/Either';
import { PathReporter } from 'io-ts/lib/PathReporter';
import { UMServerLibs } from '../lib/lib';
-import {
- DynamicSettings,
- DynamicSettingsType,
-} from '../../../../legacy/plugins/uptime/common/runtime_types';
+import { DynamicSettings, DynamicSettingsType } from '../../common/runtime_types';
import { UMRestApiRouteFactory } from '.';
import { savedObjectsAdapter } from '../lib/saved_objects';
diff --git a/x-pack/plugins/uptime/server/rest_api/index_state/get_index_pattern.ts b/x-pack/plugins/uptime/server/rest_api/index_state/get_index_pattern.ts
index 689a75c5903a64..26715f0ff37b64 100644
--- a/x-pack/plugins/uptime/server/rest_api/index_state/get_index_pattern.ts
+++ b/x-pack/plugins/uptime/server/rest_api/index_state/get_index_pattern.ts
@@ -6,7 +6,7 @@
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
+import { API_URLS } from '../../../common/constants';
export const createGetIndexPatternRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts b/x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts
index 8ed73d90b2389e..9a4280efa98f92 100644
--- a/x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts
+++ b/x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts
@@ -6,7 +6,7 @@
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
+import { API_URLS } from '../../../common/constants';
export const createGetIndexStatusRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts b/x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts
index 5cb4e8a6241b74..60b3eafaa765e6 100644
--- a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts
+++ b/x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts
@@ -6,8 +6,7 @@
import { schema } from '@kbn/config-schema';
import { UMRestApiRouteFactory } from '../types';
-import { CONTEXT_DEFAULTS } from '../../../../../legacy/plugins/uptime/common/constants';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
+import { API_URLS, CONTEXT_DEFAULTS } from '../../../common/constants';
export const createMonitorListRoute: UMRestApiRouteFactory = libs => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_locations.ts b/x-pack/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
index 66ce9871506d4e..a110209043a7e7 100644
--- a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
+++ b/x-pack/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
@@ -7,7 +7,7 @@
import { schema } from '@kbn/config-schema';
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
+import { API_URLS } from '../../../common/constants';
export const createGetMonitorLocationsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_status.ts b/x-pack/plugins/uptime/server/rest_api/monitors/monitor_status.ts
index 9cf1340fb94090..bb002f8a8c286c 100644
--- a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_status.ts
+++ b/x-pack/plugins/uptime/server/rest_api/monitors/monitor_status.ts
@@ -7,7 +7,7 @@
import { schema } from '@kbn/config-schema';
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
+import { API_URLS } from '../../../common/constants';
export const createGetStatusBarRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts b/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts
index 1cc010781457e2..69e719efb0719d 100644
--- a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts
+++ b/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts
@@ -7,7 +7,7 @@
import { schema } from '@kbn/config-schema';
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
+import { API_URLS } from '../../../common/constants';
export const createGetMonitorDetailsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts b/x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts
index 9743ced13350a4..34313211061b08 100644
--- a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts
+++ b/x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts
@@ -7,7 +7,7 @@
import { schema } from '@kbn/config-schema';
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
+import { API_URLS } from '../../../common/constants';
export const createGetMonitorDurationRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/overview_filters/get_overview_filters.ts b/x-pack/plugins/uptime/server/rest_api/overview_filters/get_overview_filters.ts
index deac05f36c8dc9..00cbaf0d16723c 100644
--- a/x-pack/plugins/uptime/server/rest_api/overview_filters/get_overview_filters.ts
+++ b/x-pack/plugins/uptime/server/rest_api/overview_filters/get_overview_filters.ts
@@ -8,7 +8,7 @@ import { schema } from '@kbn/config-schema';
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
import { objectValuesToArrays } from '../../lib/helper';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
+import { API_URLS } from '../../../common/constants';
const arrayOrStringType = schema.maybe(
schema.oneOf([schema.string(), schema.arrayOf(schema.string())])
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts b/x-pack/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts
index dceef5ecb78486..41078f735920b8 100644
--- a/x-pack/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts
+++ b/x-pack/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts
@@ -7,7 +7,7 @@
import { schema } from '@kbn/config-schema';
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
+import { API_URLS } from '../../../common/constants';
export const createGetPingHistogramRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts b/x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts
index 80a887a7f64a9d..d97195a7fe2b17 100644
--- a/x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts
+++ b/x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts
@@ -9,8 +9,8 @@ import { isLeft } from 'fp-ts/lib/Either';
import { PathReporter } from 'io-ts/lib/PathReporter';
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
-import { GetPingsParamsType } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { API_URLS } from '../../../common/constants';
+import { GetPingsParamsType } from '../../../common/runtime_types';
export const createGetPingsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts b/x-pack/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
index d870f492801171..7809e102a499f8 100644
--- a/x-pack/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
+++ b/x-pack/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
@@ -7,7 +7,7 @@
import { schema } from '@kbn/config-schema';
import { UMServerLibs } from '../../lib/lib';
import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
+import { API_URLS } from '../../../common/constants';
export const createGetSnapshotCount: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
method: 'GET',
diff --git a/x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts b/x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts
index 4b2db71037071e..d8387e79e9089b 100644
--- a/x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts
+++ b/x-pack/plugins/uptime/server/rest_api/telemetry/log_page_view.ts
@@ -8,7 +8,7 @@ import { schema } from '@kbn/config-schema';
import { KibanaTelemetryAdapter } from '../../lib/adapters/telemetry';
import { UMRestApiRouteFactory } from '../types';
import { PageViewParams } from '../../lib/adapters/telemetry/types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
+import { API_URLS } from '../../../common/constants';
export const createLogPageViewRoute: UMRestApiRouteFactory = () => ({
method: 'POST',
diff --git a/x-pack/plugins/uptime/server/rest_api/types.ts b/x-pack/plugins/uptime/server/rest_api/types.ts
index e05e7a4d7faf1a..8720b9dc60b12a 100644
--- a/x-pack/plugins/uptime/server/rest_api/types.ts
+++ b/x-pack/plugins/uptime/server/rest_api/types.ts
@@ -15,8 +15,8 @@ import {
KibanaRequest,
KibanaResponseFactory,
IKibanaResponse,
-} from 'src/core/server';
-import { DynamicSettings } from '../../../../legacy/plugins/uptime/common/runtime_types';
+} from 'kibana/server';
+import { DynamicSettings } from '../../common/runtime_types';
import { UMServerLibs } from '../lib/lib';
/**
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/servicenow.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/servicenow.ts
index a7551ad7e2fadd..1244657ed99889 100644
--- a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/servicenow.ts
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/servicenow.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../../../common/ftr_provider_context';
import {
getExternalServiceSimulatorPath,
ExternalServiceSimulator,
-} from '../../../../common/fixtures/plugins/actions';
+} from '../../../../common/fixtures/plugins/actions_simulators';
// node ../scripts/functional_test_runner.js --grep "Actions.servicenddd" --config=test/alerting_api_integration/security_and_spaces/config.ts
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/slack.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/slack.ts
index 46258e41d5d69d..4151deab45213d 100644
--- a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/slack.ts
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/slack.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../../../common/ftr_provider_context';
import {
getExternalServiceSimulatorPath,
ExternalServiceSimulator,
-} from '../../../../common/fixtures/plugins/actions';
+} from '../../../../common/fixtures/plugins/actions_simulators';
// eslint-disable-next-line import/no-default-export
export default function slackTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/webhook.ts
index 338610e9243a40..bae6dada48fb7e 100644
--- a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/webhook.ts
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/webhook.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../../common/ftr_provider_context';
import {
getExternalServiceSimulatorPath,
ExternalServiceSimulator,
-} from '../../../../common/fixtures/plugins/actions';
+} from '../../../../common/fixtures/plugins/actions_simulators';
// eslint-disable-next-line import/no-default-export
export default function webhookTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 457b7621e84bd6..870ed3cf0cc0fc 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -8,7 +8,7 @@ import path from 'path';
import { CA_CERT_PATH } from '@kbn/dev-utils';
import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
import { services } from './services';
-import { getAllExternalServiceSimulatorPaths } from './fixtures/plugins/actions';
+import { getAllExternalServiceSimulatorPaths } from './fixtures/plugins/actions_simulators';
interface CreateTestConfigOptions {
license: string;
@@ -75,7 +75,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
'some.non.existent.com',
])}`,
`--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
- '--xpack.alerting.enabled=true',
'--xpack.eventLog.logEntries=true',
`--xpack.actions.preconfigured=${JSON.stringify([
{
@@ -124,7 +123,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
])}`,
...disabledPlugins.map(key => `--xpack.${key}.enabled=false`),
`--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'alerts')}`,
- `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'actions')}`,
+ `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'actions_simulators')}`,
`--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'task_manager')}`,
`--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'aad')}`,
`--server.xsrf.whitelist=${JSON.stringify(getAllExternalServiceSimulatorPaths())}`,
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/index.ts
index 05139213b76b9c..400aec7e11c8de 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/index.ts
@@ -21,7 +21,7 @@ interface CheckAADRequest extends Hapi.Request {
// eslint-disable-next-line import/no-default-export
export default function(kibana: any) {
return new kibana.Plugin({
- require: ['actions', 'alerting', 'encryptedSavedObjects'],
+ require: ['encryptedSavedObjects'],
name: 'aad-fixtures',
init(server: Legacy.Server) {
const newPlatform = ((server as unknown) as KbnServer).newPlatform;
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/README.md b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/README.md
similarity index 100%
rename from x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/README.md
rename to x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/README.md
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/index.ts
similarity index 98%
rename from x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts
rename to x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/index.ts
index 019b15cc1862a4..45edd4c092da97 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/index.ts
@@ -36,7 +36,7 @@ export function getAllExternalServiceSimulatorPaths(): string[] {
// eslint-disable-next-line import/no-default-export
export default function(kibana: any) {
return new kibana.Plugin({
- require: ['xpack_main', 'actions'],
+ require: ['xpack_main'],
name: NAME,
init: (server: Hapi.Server) => {
// this action is specifically NOT enabled in ../../config.ts
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/package.json b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/package.json
similarity index 100%
rename from x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/package.json
rename to x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/package.json
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/pagerduty_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/pagerduty_simulation.ts
similarity index 100%
rename from x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/pagerduty_simulation.ts
rename to x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/pagerduty_simulation.ts
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/servicenow_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/servicenow_simulation.ts
similarity index 100%
rename from x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/servicenow_simulation.ts
rename to x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/servicenow_simulation.ts
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/slack_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/slack_simulation.ts
similarity index 100%
rename from x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/slack_simulation.ts
rename to x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/slack_simulation.ts
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/webhook_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/webhook_simulation.ts
similarity index 100%
rename from x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/webhook_simulation.ts
rename to x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/webhook_simulation.ts
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
index 43d533ad3ae14d..1a47addf36ab33 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
@@ -11,8 +11,8 @@ import { ActionTypeExecutorOptions, ActionType } from '../../../../../../plugins
// eslint-disable-next-line import/no-default-export
export default function(kibana: any) {
return new kibana.Plugin({
- require: ['xpack_main', 'actions', 'alerting', 'elasticsearch'],
- name: 'alerts',
+ require: ['xpack_main', 'elasticsearch'],
+ name: 'alerts-fixture',
init(server: any) {
const clusterClient = server.newPlatform.start.core.elasticsearch.legacy.client;
server.plugins.xpack_main.registerFeature({
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/index.ts
index 29708f86b0a9b0..ac32f05805e4a3 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/index.ts
@@ -31,7 +31,7 @@ const taskByIdQuery = (id: string) => ({
export default function(kibana: any) {
return new kibana.Plugin({
name: 'taskManagerHelpers',
- require: ['elasticsearch', 'task_manager'],
+ require: ['elasticsearch'],
config(Joi: any) {
return Joi.object({
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
index eeb0818b5fbabd..4c76ebfb93b0bd 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../../common/ftr_provider_context';
import {
getExternalServiceSimulatorPath,
ExternalServiceSimulator,
-} from '../../../../common/fixtures/plugins/actions';
+} from '../../../../common/fixtures/plugins/actions_simulators';
// eslint-disable-next-line import/no-default-export
export default function pagerdutyTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
index 054f8f6141817e..399ae0f27f5b1a 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../../common/ftr_provider_context';
import {
getExternalServiceSimulatorPath,
ExternalServiceSimulator,
-} from '../../../../common/fixtures/plugins/actions';
+} from '../../../../common/fixtures/plugins/actions_simulators';
// node ../scripts/functional_test_runner.js --grep "servicenow" --config=test/alerting_api_integration/security_and_spaces/config.ts
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
index e00589b7e85b7b..386254e49c19c8 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../../common/ftr_provider_context';
import {
getExternalServiceSimulatorPath,
ExternalServiceSimulator,
-} from '../../../../common/fixtures/plugins/actions';
+} from '../../../../common/fixtures/plugins/actions_simulators';
// eslint-disable-next-line import/no-default-export
export default function slackTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
index fd996ea4507bab..9b66326fa6157a 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
@@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../../../common/ftr_provider_context';
import {
getExternalServiceSimulatorPath,
ExternalServiceSimulator,
-} from '../../../../common/fixtures/plugins/actions';
+} from '../../../../common/fixtures/plugins/actions_simulators';
const defaultValues: Record = {
headers: null,
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/webhook.ts
index 5122a74d53b725..112149a32649a2 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/webhook.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/webhook.ts
@@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../../../common/ftr_provider_context';
import {
getExternalServiceSimulatorPath,
ExternalServiceSimulator,
-} from '../../../../common/fixtures/plugins/actions';
+} from '../../../../common/fixtures/plugins/actions_simulators';
// eslint-disable-next-line import/no-default-export
export default function webhookTest({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/infra/metrics_alerting.ts b/x-pack/test/api_integration/apis/infra/metrics_alerting.ts
index 4f17f9db674839..19879f5761ab2c 100644
--- a/x-pack/test/api_integration/apis/infra/metrics_alerting.ts
+++ b/x-pack/test/api_integration/apis/infra/metrics_alerting.ts
@@ -39,6 +39,7 @@ export default function({ getService }: FtrProviderContext) {
});
expect(result.error).to.not.be.ok();
expect(result.hits).to.be.ok();
+ expect(result.aggregations).to.be.ok();
});
}
it('should work with a filterQuery', async () => {
@@ -53,6 +54,21 @@ export default function({ getService }: FtrProviderContext) {
});
expect(result.error).to.not.be.ok();
expect(result.hits).to.be.ok();
+ expect(result.aggregations).to.be.ok();
+ });
+ it('should work with a filterQuery in KQL format', async () => {
+ const searchBody = getElasticsearchMetricQuery(
+ getSearchParams('avg'),
+ undefined,
+ '"agent.hostname":"foo"'
+ );
+ const result = await client.search({
+ index,
+ body: searchBody,
+ });
+ expect(result.error).to.not.be.ok();
+ expect(result.hits).to.be.ok();
+ expect(result.aggregations).to.be.ok();
});
});
describe('querying with a groupBy parameter', () => {
@@ -65,6 +81,7 @@ export default function({ getService }: FtrProviderContext) {
});
expect(result.error).to.not.be.ok();
expect(result.hits).to.be.ok();
+ expect(result.aggregations).to.be.ok();
});
}
it('should work with a filterQuery', async () => {
@@ -79,6 +96,7 @@ export default function({ getService }: FtrProviderContext) {
});
expect(result.error).to.not.be.ok();
expect(result.hits).to.be.ok();
+ expect(result.aggregations).to.be.ok();
});
});
});
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
index bbc766df34dcfe..10857caab98e27 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
@@ -91,12 +91,11 @@ export default ({ getService }: FtrProviderContext) => {
model_plot_config: { enabled: true },
},
expected: {
- responseCode: 403,
+ responseCode: 404,
responseBody: {
- statusCode: 403,
- error: 'Forbidden',
- message:
- '[security_exception] action [cluster:admin/xpack/ml/job/put] is unauthorized for user [ml_viewer]',
+ statusCode: 404,
+ error: 'Not Found',
+ message: 'Not Found',
},
},
},
diff --git a/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts b/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
index 6a57db1687868f..a5cb68d7821267 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
@@ -197,8 +197,8 @@ export default ({ getService }: FtrProviderContext) => {
requestBody: {},
// Note that the jobs and datafeeds are loaded async so the actual error message is not deterministic.
expected: {
- responseCode: 403,
- error: 'Forbidden',
+ responseCode: 404,
+ error: 'Not Found',
},
},
];
diff --git a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
index 23ddd3b63a2eff..c42fc95c1bc7f2 100644
--- a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts
@@ -84,10 +84,9 @@ export default ({ getService }: FtrProviderContext) => {
startDatafeed: false,
},
expected: {
- responseCode: 403,
- error: 'Forbidden',
- message:
- '[security_exception] action [cluster:monitor/xpack/ml/info/get] is unauthorized for user [ml_unauthorized]',
+ responseCode: 404,
+ error: 'Not Found',
+ message: 'Not Found',
},
},
];
diff --git a/x-pack/test/api_integration/apis/uptime/feature_controls.ts b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
index 6d125807e169d1..6c566ec7cb23b8 100644
--- a/x-pack/test/api_integration/apis/uptime/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
@@ -7,7 +7,7 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../ftr_provider_context';
import { PINGS_DATE_RANGE_END, PINGS_DATE_RANGE_START } from './constants';
-import { API_URLS } from '../../../../legacy/plugins/uptime/common/constants';
+import { API_URLS } from '../../../../plugins/uptime/common/constants';
export default function featureControlsTests({ getService }: FtrProviderContext) {
const supertest = getService('supertestWithoutAuth');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/certs.ts b/x-pack/test/api_integration/apis/uptime/rest/certs.ts
index 7510ea3f34d282..a3a15d8f8b0143 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/certs.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/certs.ts
@@ -8,8 +8,8 @@ import expect from '@kbn/expect';
import moment from 'moment';
import { isRight } from 'fp-ts/lib/Either';
import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
-import { CertType } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { API_URLS } from '../../../../../plugins/uptime/common/constants';
+import { CertType } from '../../../../../plugins/uptime/common/runtime_types';
import { makeChecksWithStatus } from './helper/make_checks';
export default function({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/doc_count.ts b/x-pack/test/api_integration/apis/uptime/rest/doc_count.ts
index 5258426cf193c1..f343cd1da8788b 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/doc_count.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/doc_count.ts
@@ -5,7 +5,7 @@
*/
import { FtrProviderContext } from '../../../ftr_provider_context';
import { expectFixtureEql } from './helper/expect_fixture_eql';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
+import { API_URLS } from '../../../../../plugins/uptime/common/constants';
export default function({ getService }: FtrProviderContext) {
describe('docCount query', () => {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
index ea980721b831bb..95caf50d1ca7a4 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
@@ -7,9 +7,8 @@
import expect from '@kbn/expect';
import { isRight } from 'fp-ts/lib/Either';
import { FtrProviderContext } from '../../../ftr_provider_context';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../legacy/plugins/uptime/common/constants';
-import { DynamicSettingsType } from '../../../../../legacy/plugins/uptime/common/runtime_types';
-
+import { DynamicSettingsType } from '../../../../../plugins/uptime/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../plugins/uptime/common/constants';
export default function({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
index 3c17370532f915..c3d5849e028ab0 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_generated.ts
@@ -7,8 +7,8 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { makeChecksWithStatus } from './helper/make_checks';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
-import { MonitorSummary } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { MonitorSummary } from '../../../../../plugins/uptime/common/runtime_types';
+import { API_URLS } from '../../../../../plugins/uptime/common/constants';
export default function({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
index f1e37bff405fd3..c5a691312f5250 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
@@ -7,8 +7,8 @@
import expect from '@kbn/expect';
import { isRight } from 'fp-ts/lib/Either';
import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
-import { MonitorSummaryResultType } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { MonitorSummaryResultType } from '../../../../../plugins/uptime/common/runtime_types';
+import { API_URLS } from '../../../../../plugins/uptime/common/constants';
interface ExpectedMonitorStatesPage {
response: any;
diff --git a/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
index a261763d5991f9..3d754d89cf9be0 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
@@ -7,7 +7,7 @@
import expect from '@kbn/expect';
import { isLeft } from 'fp-ts/lib/Either';
import { PathReporter } from 'io-ts/lib/PathReporter';
-import { PingsResponseType } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { PingsResponseType } from '../../../../../plugins/uptime/common/runtime_types';
import { FtrProviderContext } from '../../../ftr_provider_context';
function decodePingsResponseData(response: any) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts
index 017ef02afe5ea7..99e09aa5ce886a 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/telemetry_collectors.ts
@@ -6,7 +6,7 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
+import { API_URLS } from '../../../../../plugins/uptime/common/constants';
import { makeChecksWithStatus } from './helper/make_checks';
export default function({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/detection_engine_api_integration/common/config.ts b/x-pack/test/detection_engine_api_integration/common/config.ts
index e89352118990a1..1e6600c7cd2c0d 100644
--- a/x-pack/test/detection_engine_api_integration/common/config.ts
+++ b/x-pack/test/detection_engine_api_integration/common/config.ts
@@ -78,7 +78,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
'some.non.existent.com',
])}`,
`--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
- '--xpack.alerting.enabled=true',
'--xpack.eventLog.logEntries=true',
...disabledPlugins.map(key => `--xpack.${key}.enabled=false`),
`--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'alerts')}`,
diff --git a/x-pack/test/functional/apps/dashboard/reporting/index.js b/x-pack/test/functional/apps/dashboard/reporting/index.ts
similarity index 94%
rename from x-pack/test/functional/apps/dashboard/reporting/index.js
rename to x-pack/test/functional/apps/dashboard/reporting/index.ts
index 99be084d80d74c..796e15b4e270f4 100644
--- a/x-pack/test/functional/apps/dashboard/reporting/index.js
+++ b/x-pack/test/functional/apps/dashboard/reporting/index.ts
@@ -5,9 +5,10 @@
*/
import expect from '@kbn/expect';
-import path from 'path';
import fs from 'fs';
+import path from 'path';
import { promisify } from 'util';
+import { FtrProviderContext } from '../../../ftr_provider_context';
import { checkIfPngsMatch } from './lib/compare_pngs';
const writeFileAsync = promisify(fs.writeFile);
@@ -15,7 +16,7 @@ const mkdirAsync = promisify(fs.mkdir);
const REPORTS_FOLDER = path.resolve(__dirname, 'reports');
-export default function({ getService, getPageObjects }) {
+export default function({ getService, getPageObjects }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const browser = getService('browser');
const log = getService('log');
@@ -85,14 +86,14 @@ export default function({ getService, getPageObjects }) {
describe('Preserve Layout', () => {
it('matches baseline report', async function() {
- const writeSessionReport = async (name, rawPdf, reportExt) => {
+ const writeSessionReport = async (name: string, rawPdf: Buffer, reportExt: string) => {
const sessionDirectory = path.resolve(REPORTS_FOLDER, 'session');
await mkdirAsync(sessionDirectory, { recursive: true });
const sessionReportPath = path.resolve(sessionDirectory, `${name}.${reportExt}`);
await writeFileAsync(sessionReportPath, rawPdf);
return sessionReportPath;
};
- const getBaselineReportPath = (fileName, reportExt) => {
+ const getBaselineReportPath = (fileName: string, reportExt: string) => {
const baselineFolder = path.resolve(REPORTS_FOLDER, 'baseline');
const fullPath = path.resolve(baselineFolder, `${fileName}.${reportExt}`);
log.debug(`getBaselineReportPath (${fullPath})`);
diff --git a/x-pack/test/functional/apps/dashboard/reporting/lib/compare_pngs.js b/x-pack/test/functional/apps/dashboard/reporting/lib/compare_pngs.ts
similarity index 90%
rename from x-pack/test/functional/apps/dashboard/reporting/lib/compare_pngs.js
rename to x-pack/test/functional/apps/dashboard/reporting/lib/compare_pngs.ts
index 13c97a7fce7858..b2eb645c8372c0 100644
--- a/x-pack/test/functional/apps/dashboard/reporting/lib/compare_pngs.js
+++ b/x-pack/test/functional/apps/dashboard/reporting/lib/compare_pngs.ts
@@ -4,14 +4,19 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import path from 'path';
-import fs from 'fs';
import { promisify } from 'bluebird';
+import fs from 'fs';
+import path from 'path';
import { comparePngs } from '../../../../../../../test/functional/services/lib/compare_pngs';
-const mkdirAsync = promisify(fs.mkdir);
+const mkdirAsync = promisify(fs.mkdir);
-export async function checkIfPngsMatch(actualpngPath, baselinepngPath, screenshotsDirectory, log) {
+export async function checkIfPngsMatch(
+ actualpngPath: string,
+ baselinepngPath: string,
+ screenshotsDirectory: string,
+ log: any
+) {
log.debug(`checkIfpngsMatch: ${actualpngPath} vs ${baselinepngPath}`);
// Copy the pngs into the screenshot session directory, as that's where the generated pngs will automatically be
// stored.
diff --git a/x-pack/test/functional/apps/discover/reporting.js b/x-pack/test/functional/apps/discover/reporting.ts
similarity index 96%
rename from x-pack/test/functional/apps/discover/reporting.js
rename to x-pack/test/functional/apps/discover/reporting.ts
index 4aa005fc2db553..7a33e7f5135d48 100644
--- a/x-pack/test/functional/apps/discover/reporting.js
+++ b/x-pack/test/functional/apps/discover/reporting.ts
@@ -5,8 +5,9 @@
*/
import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
-export default function({ getService, getPageObjects }) {
+export default function({ getService, getPageObjects }: FtrProviderContext) {
const log = getService('log');
const esArchiver = getService('esArchiver');
const browser = getService('browser');
diff --git a/x-pack/test/functional/apps/uptime/settings.ts b/x-pack/test/functional/apps/uptime/settings.ts
index 64b6300e0df631..7a813a5cdfb526 100644
--- a/x-pack/test/functional/apps/uptime/settings.ts
+++ b/x-pack/test/functional/apps/uptime/settings.ts
@@ -6,8 +6,8 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../ftr_provider_context';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../legacy/plugins/uptime/common/constants';
-import { DynamicSettings } from '../../../../legacy/plugins/uptime/common/runtime_types';
+import { DynamicSettings } from '../../../../plugins/uptime/common/runtime_types';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../plugins/uptime/common/constants';
import { makeChecks } from '../../../api_integration/apis/uptime/rest/helper/make_checks';
export default ({ getPageObjects, getService }: FtrProviderContext) => {
diff --git a/x-pack/test/functional/apps/visualize/reporting.js b/x-pack/test/functional/apps/visualize/reporting.ts
similarity index 94%
rename from x-pack/test/functional/apps/visualize/reporting.js
rename to x-pack/test/functional/apps/visualize/reporting.ts
index bc252e1ad4134b..5ef954e334d815 100644
--- a/x-pack/test/functional/apps/visualize/reporting.js
+++ b/x-pack/test/functional/apps/visualize/reporting.ts
@@ -5,8 +5,9 @@
*/
import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
-export default function({ getService, getPageObjects }) {
+export default function({ getService, getPageObjects }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const browser = getService('browser');
const log = getService('log');
diff --git a/x-pack/test/functional/page_objects/index.ts b/x-pack/test/functional/page_objects/index.ts
index 782d57adea7707..4b8c2944ef190f 100644
--- a/x-pack/test/functional/page_objects/index.ts
+++ b/x-pack/test/functional/page_objects/index.ts
@@ -19,7 +19,6 @@ import { GraphPageProvider } from './graph_page';
import { GrokDebuggerPageProvider } from './grok_debugger_page';
// @ts-ignore not ts yet
import { WatcherPageProvider } from './watcher_page';
-// @ts-ignore not ts yet
import { ReportingPageProvider } from './reporting_page';
// @ts-ignore not ts yet
import { AccountSettingProvider } from './accountsetting_page';
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index 1bf637c50b0ba4..57b2847cc2e500 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -12,6 +12,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
const testSubjects = getService('testSubjects');
const retry = getService('retry');
const find = getService('find');
+ const comboBox = getService('comboBox');
const PageObjects = getPageObjects([
'header',
'common',
@@ -107,20 +108,17 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
* @param opts.operation - the desired operation ID for the dimension
* @param opts.field - the desired field for the dimension
*/
- async configureDimension(opts: { dimension: string; operation?: string; field?: string }) {
+ async configureDimension(opts: { dimension: string; operation: string; field: string }) {
await find.clickByCssSelector(opts.dimension);
- if (opts.operation) {
- await find.clickByCssSelector(
- `[data-test-subj="lns-indexPatternDimensionIncompatible-${opts.operation}"],
- [data-test-subj="lns-indexPatternDimension-${opts.operation}"]`
- );
- }
+ await find.clickByCssSelector(
+ `[data-test-subj="lns-indexPatternDimensionIncompatible-${opts.operation}"],
+ [data-test-subj="lns-indexPatternDimension-${opts.operation}"]`
+ );
- if (opts.field) {
- await testSubjects.click('indexPattern-dimension-field');
- await testSubjects.click(`lns-fieldOption-${opts.field}`);
- }
+ const target = await testSubjects.find('indexPattern-dimension-field');
+ await comboBox.openOptionsList(target);
+ await comboBox.setElement(target, opts.field);
},
/**
diff --git a/x-pack/test/functional/page_objects/reporting_page.js b/x-pack/test/functional/page_objects/reporting_page.ts
similarity index 84%
rename from x-pack/test/functional/page_objects/reporting_page.js
rename to x-pack/test/functional/page_objects/reporting_page.ts
index b24ba8cf95d1ce..2c20519a8d2140 100644
--- a/x-pack/test/functional/page_objects/reporting_page.js
+++ b/x-pack/test/functional/page_objects/reporting_page.ts
@@ -4,25 +4,19 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import http, { IncomingMessage } from 'http';
+import { FtrProviderContext } from 'test/functional/ftr_provider_context';
import { parse } from 'url';
-import http from 'http';
-/*
- * NOTE: Reporting is a service, not an app. The page objects that are
- * important for generating reports belong to the apps that integrate with the
- * Reporting service. Eventually, this file should be dissolved across the
- * apps that need it for testing their integration.
- * Issue: https://github.com/elastic/kibana/issues/52927
- */
-export function ReportingPageProvider({ getService, getPageObjects }) {
+export function ReportingPageProvider({ getService, getPageObjects }: FtrProviderContext) {
const retry = getService('retry');
const log = getService('log');
const testSubjects = getService('testSubjects');
const browser = getService('browser');
- const PageObjects = getPageObjects(['common', 'security', 'share', 'timePicker']);
+ const PageObjects = getPageObjects(['common', 'security' as any, 'share', 'timePicker']); // FIXME: Security PageObject is not Typescript
class ReportingPage {
- async forceSharedItemsContainerSize({ width }) {
+ async forceSharedItemsContainerSize({ width }: { width: number }) {
await browser.execute(`
var el = document.querySelector('[data-shared-items-container]');
el.style.flex="none";
@@ -30,7 +24,7 @@ export function ReportingPageProvider({ getService, getPageObjects }) {
`);
}
- async getReportURL(timeout) {
+ async getReportURL(timeout: number) {
log.debug('getReportURL');
const url = await testSubjects.getAttribute('downloadCompletedReportButton', 'href', timeout);
@@ -48,7 +42,7 @@ export function ReportingPageProvider({ getService, getPageObjects }) {
`);
}
- getResponse(url) {
+ getResponse(url: string): Promise {
log.debug(`getResponse for ${url}`);
const auth = 'test_user:changeme'; // FIXME not sure why there is no config that can be read for this
const headers = {
@@ -62,29 +56,30 @@ export function ReportingPageProvider({ getService, getPageObjects }) {
hostname: parsedUrl.hostname,
path: parsedUrl.path,
port: parsedUrl.port,
- responseType: 'arraybuffer',
headers,
},
- res => {
+ (res: IncomingMessage) => {
resolve(res);
}
)
- .on('error', e => {
+ .on('error', (e: Error) => {
log.error(e);
reject(e);
});
});
}
- async getRawPdfReportData(url) {
- const data = []; // List of Buffer objects
+ async getRawPdfReportData(url: string): Promise {
+ const data: Buffer[] = []; // List of Buffer objects
log.debug(`getRawPdfReportData for ${url}`);
return new Promise(async (resolve, reject) => {
const response = await this.getResponse(url).catch(reject);
- response.on('data', chunk => data.push(chunk));
- response.on('end', () => resolve(Buffer.concat(data)));
+ if (response) {
+ response.on('data', (chunk: Buffer) => data.push(chunk));
+ response.on('end', () => resolve(Buffer.concat(data)));
+ }
});
}
diff --git a/x-pack/test/functional/services/uptime/settings.ts b/x-pack/test/functional/services/uptime/settings.ts
index 9719152b62d354..96f5e45ce2ca47 100644
--- a/x-pack/test/functional/services/uptime/settings.ts
+++ b/x-pack/test/functional/services/uptime/settings.ts
@@ -5,7 +5,7 @@
*/
import { FtrProviderContext } from '../../ftr_provider_context';
-import { DynamicSettings } from '../../../../legacy/plugins/uptime/common/runtime_types';
+import { DynamicSettings } from '../../../../plugins/uptime/common/runtime_types';
export function UptimeSettingsProvider({ getService }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
diff --git a/x-pack/test/functional_with_es_ssl/config.ts b/x-pack/test/functional_with_es_ssl/config.ts
index a620b1d9533767..71b22a336f6b92 100644
--- a/x-pack/test/functional_with_es_ssl/config.ts
+++ b/x-pack/test/functional_with_es_ssl/config.ts
@@ -50,8 +50,6 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
`--elasticsearch.hosts=https://${servers.elasticsearch.hostname}:${servers.elasticsearch.port}`,
`--elasticsearch.ssl.certificateAuthorities=${CA_CERT_PATH}`,
`--plugin-path=${join(__dirname, 'fixtures', 'plugins', 'alerts')}`,
- '--xpack.actions.enabled=true',
- '--xpack.alerting.enabled=true',
`--xpack.actions.preconfigured=${JSON.stringify([
{
id: 'my-slack1',
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts b/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
index c5f3e65581df97..9622715e87e55f 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
@@ -40,7 +40,7 @@ export const logEventRoute = (router: IRouter, eventLogger: IEventLogger, logger
} catch (ex) {
logger.info(`log event error: ${ex}`);
await context.core.savedObjects.client.create('event_log_test', {}, { id });
- logger.info(`created saved object`);
+ logger.info(`created saved object ${id}`);
}
eventLogger.logEvent(event);
logger.info(`logged`);
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/kibana.json b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/kibana.json
new file mode 100644
index 00000000000000..416ef7fa345919
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/kibana.json
@@ -0,0 +1,9 @@
+{
+ "id": "sample_task_plugin",
+ "version": "1.0.0",
+ "kibanaVersion": "kibana",
+ "configPath": ["xpack"],
+ "requiredPlugins": ["taskManager"],
+ "server": true,
+ "ui": false
+}
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/package.json b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/package.json
new file mode 100644
index 00000000000000..c8d47decd94c1c
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/package.json
@@ -0,0 +1,18 @@
+{
+ "name": "sample_task_plugin",
+ "version": "1.0.0",
+ "kibana": {
+ "version": "kibana",
+ "templateVersion": "1.0.0"
+ },
+ "main": "target/test/plugin_api_integration/plugins/sample_task_plugin",
+ "scripts": {
+ "kbn": "node ../../../../../scripts/kbn.js",
+ "build": "rm -rf './target' && tsc"
+ },
+ "devDependencies": {
+ "typescript": "3.7.2"
+ },
+ "license": "Apache-2.0",
+ "dependencies": {}
+}
diff --git a/x-pack/legacy/plugins/alerting/index.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/index.ts
similarity index 65%
rename from x-pack/legacy/plugins/alerting/index.ts
rename to x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/index.ts
index 0d0a698841269f..77233f463734a1 100644
--- a/x-pack/legacy/plugins/alerting/index.ts
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/index.ts
@@ -4,4 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export * from './server';
+import { SampleTaskManagerFixturePlugin } from './plugin';
+
+export const plugin = () => new SampleTaskManagerFixturePlugin();
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
new file mode 100644
index 00000000000000..1fee2decbcba94
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/init_routes.ts
@@ -0,0 +1,252 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import {
+ RequestHandlerContext,
+ KibanaRequest,
+ KibanaResponseFactory,
+ IKibanaResponse,
+ IRouter,
+ CoreSetup,
+} from 'kibana/server';
+import { EventEmitter } from 'events';
+import { TaskManagerStartContract } from '../../../../../plugins/task_manager/server';
+
+const scope = 'testing';
+const taskManagerQuery = {
+ bool: {
+ filter: {
+ bool: {
+ must: [
+ {
+ term: {
+ 'task.scope': scope,
+ },
+ },
+ ],
+ },
+ },
+ },
+};
+
+export function initRoutes(
+ router: IRouter,
+ core: CoreSetup,
+ taskManagerStart: Promise,
+ taskTestingEvents: EventEmitter
+) {
+ async function ensureIndexIsRefreshed() {
+ return await core.elasticsearch.adminClient.callAsInternalUser('indices.refresh', {
+ index: '.kibana_task_manager',
+ });
+ }
+
+ router.post(
+ {
+ path: `/api/sample_tasks/schedule`,
+ validate: {
+ body: schema.object({
+ task: schema.object({
+ taskType: schema.string(),
+ schedule: schema.maybe(
+ schema.object({
+ interval: schema.string(),
+ })
+ ),
+ interval: schema.maybe(schema.string()),
+ params: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
+ state: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
+ id: schema.maybe(schema.string()),
+ }),
+ }),
+ },
+ },
+ async function(
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ try {
+ const taskManager = await taskManagerStart;
+ const { task: taskFields } = req.body;
+ const task = {
+ ...taskFields,
+ scope: [scope],
+ };
+
+ const taskResult = await taskManager.schedule(task, { req });
+
+ return res.ok({ body: taskResult });
+ } catch (err) {
+ return res.internalError({ body: err });
+ }
+ }
+ );
+
+ router.post(
+ {
+ path: `/api/sample_tasks/run_now`,
+ validate: {
+ body: schema.object({
+ task: schema.object({
+ id: schema.string({}),
+ }),
+ }),
+ },
+ },
+ async function(
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ const {
+ task: { id },
+ } = req.body;
+ try {
+ const taskManager = await taskManagerStart;
+ return res.ok({ body: await taskManager.runNow(id) });
+ } catch (err) {
+ return res.ok({ body: { id, error: `${err}` } });
+ }
+ }
+ );
+
+ router.post(
+ {
+ path: `/api/sample_tasks/ensure_scheduled`,
+ validate: {
+ body: schema.object({
+ task: schema.object({
+ taskType: schema.string(),
+ params: schema.object({}),
+ state: schema.maybe(schema.object({})),
+ id: schema.maybe(schema.string()),
+ }),
+ }),
+ },
+ },
+ async function(
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ try {
+ const { task: taskFields } = req.body;
+ const task = {
+ ...taskFields,
+ scope: [scope],
+ };
+
+ const taskManager = await taskManagerStart;
+ const taskResult = await taskManager.ensureScheduled(task, { req });
+
+ return res.ok({ body: taskResult });
+ } catch (err) {
+ return res.ok({ body: err });
+ }
+ }
+ );
+
+ router.post(
+ {
+ path: `/api/sample_tasks/event`,
+ validate: {
+ body: schema.object({
+ event: schema.string(),
+ data: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
+ }),
+ },
+ },
+ async function(
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ try {
+ const { event, data } = req.body;
+ taskTestingEvents.emit(event, data);
+ return res.ok({ body: event });
+ } catch (err) {
+ return res.ok({ body: err });
+ }
+ }
+ );
+
+ router.get(
+ {
+ path: `/api/sample_tasks`,
+ validate: {},
+ },
+ async function(
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ try {
+ const taskManager = await taskManagerStart;
+ return res.ok({
+ body: await taskManager.fetch({
+ query: taskManagerQuery,
+ }),
+ });
+ } catch (err) {
+ return res.ok({ body: err });
+ }
+ }
+ );
+
+ router.get(
+ {
+ path: `/api/sample_tasks/task/{taskId}`,
+ validate: {
+ params: schema.object({
+ taskId: schema.string(),
+ }),
+ },
+ },
+ async function(
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ try {
+ await ensureIndexIsRefreshed();
+ const taskManager = await taskManagerStart;
+ return res.ok({ body: await taskManager.get(req.params.taskId) });
+ } catch (err) {
+ return res.ok({ body: err });
+ }
+ return res.ok({ body: {} });
+ }
+ );
+
+ router.delete(
+ {
+ path: `/api/sample_tasks`,
+ validate: {},
+ },
+ async function(
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ try {
+ let tasksFound = 0;
+ const taskManager = await taskManagerStart;
+ do {
+ const { docs: tasks } = await taskManager.fetch({
+ query: taskManagerQuery,
+ });
+ tasksFound = tasks.length;
+ await Promise.all(tasks.map(task => taskManager.remove(task.id)));
+ } while (tasksFound > 0);
+ return res.ok({ body: 'OK' });
+ } catch (err) {
+ return res.ok({ body: err });
+ }
+ }
+ );
+}
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
new file mode 100644
index 00000000000000..508d58b8f0ca96
--- /dev/null
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/server/plugin.ts
@@ -0,0 +1,164 @@
+/*
+ * 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 { Plugin, CoreSetup, CoreStart } from 'kibana/server';
+import { EventEmitter } from 'events';
+import { Subject } from 'rxjs';
+import { first } from 'rxjs/operators';
+import { initRoutes } from './init_routes';
+import {
+ TaskManagerSetupContract,
+ TaskManagerStartContract,
+ ConcreteTaskInstance,
+} from '../../../../../plugins/task_manager/server';
+import { DEFAULT_MAX_WORKERS } from '../../../../../plugins/task_manager/server/config';
+
+// this plugin's dependendencies
+export interface SampleTaskManagerFixtureSetupDeps {
+ taskManager: TaskManagerSetupContract;
+}
+export interface SampleTaskManagerFixtureStartDeps {
+ taskManager: TaskManagerStartContract;
+}
+
+export class SampleTaskManagerFixturePlugin
+ implements
+ Plugin {
+ taskManagerStart$: Subject = new Subject();
+ taskManagerStart: Promise = this.taskManagerStart$
+ .pipe(first())
+ .toPromise();
+
+ public setup(core: CoreSetup, { taskManager }: SampleTaskManagerFixtureSetupDeps) {
+ const taskTestingEvents = new EventEmitter();
+ taskTestingEvents.setMaxListeners(DEFAULT_MAX_WORKERS * 2);
+
+ const defaultSampleTaskConfig = {
+ timeout: '1m',
+ // This task allows tests to specify its behavior (whether it reschedules itself, whether it errors, etc)
+ // taskInstance.params has the following optional fields:
+ // nextRunMilliseconds: number - If specified, the run method will return a runAt that is now + nextRunMilliseconds
+ // failWith: string - If specified, the task will throw an error with the specified message
+ // failOn: number - If specified, the task will only throw the `failWith` error when `count` equals to the failOn value
+ // waitForParams : boolean - should the task stall ands wait to receive params asynchronously before using the default params
+ // waitForEvent : string - if provided, the task will stall (after completing the run) and wait for an asyn event before completing
+ createTaskRunner: ({ taskInstance }: { taskInstance: ConcreteTaskInstance }) => ({
+ async run() {
+ const { params, state, id } = taskInstance;
+ const prevState = state || { count: 0 };
+
+ const count = (prevState.count || 0) + 1;
+
+ const runParams = {
+ ...params,
+ // if this task requires custom params provided async - wait for them
+ ...(params.waitForParams ? await once(taskTestingEvents, id) : {}),
+ };
+
+ if (runParams.failWith) {
+ if (!runParams.failOn || (runParams.failOn && count === runParams.failOn)) {
+ throw new Error(runParams.failWith);
+ }
+ }
+
+ await core.elasticsearch.adminClient.callAsInternalUser('index', {
+ index: '.kibana_task_manager_test_result',
+ body: {
+ type: 'task',
+ taskId: taskInstance.id,
+ params: JSON.stringify(runParams),
+ state: JSON.stringify(state),
+ ranAt: new Date(),
+ },
+ refresh: true,
+ });
+
+ // Stall task run until a certain event is triggered
+ if (runParams.waitForEvent) {
+ await once(taskTestingEvents, runParams.waitForEvent);
+ }
+
+ return {
+ state: { count },
+ runAt: millisecondsFromNow(runParams.nextRunMilliseconds),
+ };
+ },
+ }),
+ };
+
+ taskManager.registerTaskDefinitions({
+ sampleTask: {
+ ...defaultSampleTaskConfig,
+ type: 'sampleTask',
+ title: 'Sample Task',
+ description: 'A sample task for testing the task_manager.',
+ },
+ singleAttemptSampleTask: {
+ ...defaultSampleTaskConfig,
+ type: 'singleAttemptSampleTask',
+ title: 'Failing Sample Task',
+ description:
+ 'A sample task for testing the task_manager that fails on the first attempt to run.',
+ // fail after the first failed run
+ maxAttempts: 1,
+ },
+ });
+
+ taskManager.addMiddleware({
+ async beforeSave({ taskInstance, ...opts }) {
+ const modifiedInstance = {
+ ...taskInstance,
+ params: {
+ originalParams: taskInstance.params,
+ superFly: 'My middleware param!',
+ },
+ };
+
+ return {
+ ...opts,
+ taskInstance: modifiedInstance,
+ };
+ },
+
+ async beforeRun({ taskInstance, ...opts }) {
+ return {
+ ...opts,
+ taskInstance: {
+ ...taskInstance,
+ params: taskInstance.params.originalParams,
+ },
+ };
+ },
+
+ async beforeMarkRunning(context) {
+ return context;
+ },
+ });
+ initRoutes(core.http.createRouter(), core, this.taskManagerStart, taskTestingEvents);
+ }
+
+ public start(core: CoreStart, { taskManager }: SampleTaskManagerFixtureStartDeps) {
+ this.taskManagerStart$.next(taskManager);
+ this.taskManagerStart$.complete();
+ }
+ public stop() {}
+}
+
+function millisecondsFromNow(ms: number) {
+ if (!ms) {
+ return;
+ }
+
+ const dt = new Date();
+ dt.setTime(dt.getTime() + ms);
+ return dt;
+}
+
+const once = function(emitter: EventEmitter, event: string): Promise> {
+ return new Promise(resolve => {
+ emitter.once(event, data => resolve(data || {}));
+ });
+};
diff --git a/x-pack/test/plugin_api_integration/plugins/task_manager/index.js b/x-pack/test/plugin_api_integration/plugins/task_manager/index.js
deleted file mode 100644
index e5b645367b8b71..00000000000000
--- a/x-pack/test/plugin_api_integration/plugins/task_manager/index.js
+++ /dev/null
@@ -1,150 +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.
- */
-
-const { DEFAULT_MAX_WORKERS } = require('../../../../plugins/task_manager/server/config.ts');
-const { EventEmitter } = require('events');
-
-import { initRoutes } from './init_routes';
-
-const once = function(emitter, event) {
- return new Promise(resolve => {
- emitter.once(event, data => resolve(data || {}));
- });
-};
-
-export default function TaskTestingAPI(kibana) {
- const taskTestingEvents = new EventEmitter();
- taskTestingEvents.setMaxListeners(DEFAULT_MAX_WORKERS * 2);
-
- return new kibana.Plugin({
- name: 'sampleTask',
- require: ['elasticsearch', 'task_manager'],
-
- config(Joi) {
- return Joi.object({
- enabled: Joi.boolean().default(true),
- }).default();
- },
-
- init(server) {
- const taskManager = {
- ...server.newPlatform.setup.plugins.taskManager,
- ...server.newPlatform.start.plugins.taskManager,
- };
- const legacyTaskManager = server.plugins.task_manager;
-
- const defaultSampleTaskConfig = {
- timeout: '1m',
- // This task allows tests to specify its behavior (whether it reschedules itself, whether it errors, etc)
- // taskInstance.params has the following optional fields:
- // nextRunMilliseconds: number - If specified, the run method will return a runAt that is now + nextRunMilliseconds
- // failWith: string - If specified, the task will throw an error with the specified message
- // failOn: number - If specified, the task will only throw the `failWith` error when `count` equals to the failOn value
- // waitForParams : boolean - should the task stall ands wait to receive params asynchronously before using the default params
- // waitForEvent : string - if provided, the task will stall (after completing the run) and wait for an asyn event before completing
- createTaskRunner: ({ taskInstance }) => ({
- async run() {
- const { params, state, id } = taskInstance;
- const prevState = state || { count: 0 };
-
- const count = (prevState.count || 0) + 1;
-
- const runParams = {
- ...params,
- // if this task requires custom params provided async - wait for them
- ...(params.waitForParams ? await once(taskTestingEvents, id) : {}),
- };
-
- if (runParams.failWith) {
- if (!runParams.failOn || (runParams.failOn && count === runParams.failOn)) {
- throw new Error(runParams.failWith);
- }
- }
-
- const callCluster = server.plugins.elasticsearch.getCluster('admin')
- .callWithInternalUser;
- await callCluster('index', {
- index: '.kibana_task_manager_test_result',
- body: {
- type: 'task',
- taskId: taskInstance.id,
- params: JSON.stringify(runParams),
- state: JSON.stringify(state),
- ranAt: new Date(),
- },
- refresh: true,
- });
-
- // Stall task run until a certain event is triggered
- if (runParams.waitForEvent) {
- await once(taskTestingEvents, runParams.waitForEvent);
- }
-
- return {
- state: { count },
- runAt: millisecondsFromNow(runParams.nextRunMilliseconds),
- };
- },
- }),
- };
-
- taskManager.registerTaskDefinitions({
- sampleTask: {
- ...defaultSampleTaskConfig,
- title: 'Sample Task',
- description: 'A sample task for testing the task_manager.',
- },
- singleAttemptSampleTask: {
- ...defaultSampleTaskConfig,
- title: 'Failing Sample Task',
- description:
- 'A sample task for testing the task_manager that fails on the first attempt to run.',
- // fail after the first failed run
- maxAttempts: 1,
- },
- });
-
- taskManager.addMiddleware({
- async beforeSave({ taskInstance, ...opts }) {
- const modifiedInstance = {
- ...taskInstance,
- params: {
- originalParams: taskInstance.params,
- superFly: 'My middleware param!',
- },
- };
-
- return {
- ...opts,
- taskInstance: modifiedInstance,
- };
- },
-
- async beforeRun({ taskInstance, ...opts }) {
- return {
- ...opts,
- taskInstance: {
- ...taskInstance,
- params: taskInstance.params.originalParams,
- },
- };
- },
- });
-
- initRoutes(server, taskManager, legacyTaskManager, taskTestingEvents);
- },
- });
-}
-
-function millisecondsFromNow(ms) {
- if (!ms) {
- return;
- }
-
- const dt = new Date();
- dt.setTime(dt.getTime() + ms);
- return dt;
-}
diff --git a/x-pack/test/plugin_api_integration/plugins/task_manager/init_routes.js b/x-pack/test/plugin_api_integration/plugins/task_manager/init_routes.js
deleted file mode 100644
index 785fbed3414237..00000000000000
--- a/x-pack/test/plugin_api_integration/plugins/task_manager/init_routes.js
+++ /dev/null
@@ -1,236 +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 Joi from 'joi';
-
-const scope = 'testing';
-const taskManagerQuery = {
- bool: {
- filter: {
- bool: {
- must: [
- {
- term: {
- 'task.scope': scope,
- },
- },
- ],
- },
- },
- },
-};
-
-export function initRoutes(server, taskManager, legacyTaskManager, taskTestingEvents) {
- const callCluster = server.plugins.elasticsearch.getCluster('admin').callWithInternalUser;
-
- async function ensureIndexIsRefreshed() {
- return await callCluster('indices.refresh', {
- index: '.kibana_task_manager',
- });
- }
-
- server.route({
- path: '/api/sample_tasks/schedule',
- method: 'POST',
- config: {
- validate: {
- payload: Joi.object({
- task: Joi.object({
- taskType: Joi.string().required(),
- schedule: Joi.object({
- interval: Joi.string(),
- }).optional(),
- interval: Joi.string().optional(),
- params: Joi.object().required(),
- state: Joi.object().optional(),
- id: Joi.string().optional(),
- }),
- }),
- },
- },
- async handler(request) {
- try {
- const { task: taskFields } = request.payload;
- const task = {
- ...taskFields,
- scope: [scope],
- };
-
- const taskResult = await taskManager.schedule(task, { request });
-
- return taskResult;
- } catch (err) {
- return err;
- }
- },
- });
-
- /*
- Schedule using legacy Api
- */
- server.route({
- path: '/api/sample_tasks/schedule_legacy',
- method: 'POST',
- config: {
- validate: {
- payload: Joi.object({
- task: Joi.object({
- taskType: Joi.string().required(),
- schedule: Joi.object({
- interval: Joi.string(),
- }).optional(),
- interval: Joi.string().optional(),
- params: Joi.object().required(),
- state: Joi.object().optional(),
- id: Joi.string().optional(),
- }),
- }),
- },
- },
- async handler(request) {
- try {
- const { task: taskFields } = request.payload;
- const task = {
- ...taskFields,
- scope: [scope],
- };
-
- const taskResult = await legacyTaskManager.schedule(task, { request });
-
- return taskResult;
- } catch (err) {
- return err;
- }
- },
- });
-
- server.route({
- path: '/api/sample_tasks/run_now',
- method: 'POST',
- config: {
- validate: {
- payload: Joi.object({
- task: Joi.object({
- id: Joi.string().optional(),
- }),
- }),
- },
- },
- async handler(request) {
- const {
- task: { id },
- } = request.payload;
- try {
- return await taskManager.runNow(id);
- } catch (err) {
- return { id, error: `${err}` };
- }
- },
- });
-
- server.route({
- path: '/api/sample_tasks/ensure_scheduled',
- method: 'POST',
- config: {
- validate: {
- payload: Joi.object({
- task: Joi.object({
- taskType: Joi.string().required(),
- params: Joi.object().required(),
- state: Joi.object().optional(),
- id: Joi.string().optional(),
- }),
- }),
- },
- },
- async handler(request) {
- try {
- const { task: taskFields } = request.payload;
- const task = {
- ...taskFields,
- scope: [scope],
- };
-
- const taskResult = await taskManager.ensureScheduled(task, { request });
-
- return taskResult;
- } catch (err) {
- return err;
- }
- },
- });
-
- server.route({
- path: '/api/sample_tasks/event',
- method: 'POST',
- config: {
- validate: {
- payload: Joi.object({
- event: Joi.string().required(),
- data: Joi.object()
- .optional()
- .default({}),
- }),
- },
- },
- async handler(request) {
- try {
- const { event, data } = request.payload;
- taskTestingEvents.emit(event, data);
- return { event };
- } catch (err) {
- return err;
- }
- },
- });
-
- server.route({
- path: '/api/sample_tasks',
- method: 'GET',
- async handler() {
- try {
- return taskManager.fetch({
- query: taskManagerQuery,
- });
- } catch (err) {
- return err;
- }
- },
- });
-
- server.route({
- path: '/api/sample_tasks/task/{taskId}',
- method: 'GET',
- async handler(request) {
- try {
- await ensureIndexIsRefreshed();
- return await taskManager.get(request.params.taskId);
- } catch (err) {
- return err;
- }
- },
- });
-
- server.route({
- path: '/api/sample_tasks',
- method: 'DELETE',
- async handler() {
- try {
- let tasksFound = 0;
- do {
- const { docs: tasks } = await taskManager.fetch({
- query: taskManagerQuery,
- });
- tasksFound = tasks.length;
- await Promise.all(tasks.map(task => taskManager.remove(task.id)));
- } while (tasksFound > 0);
- return 'OK';
- } catch (err) {
- return err;
- }
- },
- });
-}
diff --git a/x-pack/test/plugin_api_integration/plugins/task_manager/package.json b/x-pack/test/plugin_api_integration/plugins/task_manager/package.json
deleted file mode 100644
index ec63c512e9cd79..00000000000000
--- a/x-pack/test/plugin_api_integration/plugins/task_manager/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "sample_task_plugin",
- "version": "1.0.0",
- "kibana": {
- "version": "kibana",
- "templateVersion": "1.0.0"
- },
- "license": "Apache-2.0",
- "dependencies": {
- "joi": "^13.5.2"
- }
-}
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
index e5b840b335846f..f3a3d58336b1db 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
@@ -19,7 +19,9 @@ export default function({ getService }: FtrProviderContext) {
const log = getService('log');
const retry = getService('retry');
- describe('Event Log public API', () => {
+ // FLAKY: https://github.com/elastic/kibana/issues/64723
+ // FLAKY: https://github.com/elastic/kibana/issues/64812
+ describe.skip('Event Log public API', () => {
it('should allow querying for events by Saved Object', async () => {
const id = uuid.v4();
@@ -203,6 +205,7 @@ export default function({ getService }: FtrProviderContext) {
kibana: {
saved_objects: [
{
+ rel: 'primary',
namespace: 'default',
type: 'event_log_test',
id,
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
index 31668e8345275e..361d80aaedd419 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
@@ -101,7 +101,7 @@ export default function({ getService }: FtrProviderContext) {
const eventId = uuid.v4();
const event: IEvent = {
event: { action: 'action1', provider: 'provider4' },
- kibana: { saved_objects: [{ type: 'event_log_test', id: eventId }] },
+ kibana: { saved_objects: [{ rel: 'primary', type: 'event_log_test', id: eventId }] },
};
await logTestEvent(eventId, event);
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js
index e8f976d5ae6e30..00cefa42711c9c 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js
@@ -11,7 +11,7 @@ import supertestAsPromised from 'supertest-as-promised';
const {
task: { properties: taskManagerIndexMapping },
-} = require('../../../../legacy/plugins/task_manager/server/mappings.json');
+} = require('../../../../plugins/task_manager/server/saved_objects/mappings.json');
const {
DEFAULT_MAX_WORKERS,
@@ -90,15 +90,6 @@ export default function({ getService }) {
.then(response => response.body);
}
- function scheduleTaskUsingLegacyApi(task) {
- return supertest
- .post('/api/sample_tasks/schedule_legacy')
- .set('kbn-xsrf', 'xxx')
- .send({ task })
- .expect(200)
- .then(response => response.body);
- }
-
function runTaskNow(task) {
return supertest
.post('/api/sample_tasks/run_now')
@@ -587,15 +578,5 @@ export default function({ getService }) {
expect(getTaskById(tasks, longRunningTask.id).state.count).to.eql(1);
});
});
-
- it('should retain the legacy api until v8.0.0', async () => {
- const result = await scheduleTaskUsingLegacyApi({
- id: 'task-with-legacy-api',
- taskType: 'sampleTask',
- params: {},
- });
-
- expect(result.id).to.be('task-with-legacy-api');
- });
});
}
diff --git a/yarn.lock b/yarn.lock
index ee00ef283f07c0..94e6a0a11aa993 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4798,6 +4798,11 @@
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
+"@types/set-value@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@types/set-value/-/set-value-2.0.0.tgz#63d386b103926dcf49b50e16e0f6dd49983046be"
+ integrity sha512-k8dCJEC80F/mbsIOZ5Hj3YSzTVVVBwMdtP/M9Rtc2TM4F5etVd+2UG8QUiAUfbXm4fABedL2tBZnrBheY7UwpA==
+
"@types/shot@*":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@types/shot/-/shot-4.0.0.tgz#7545500c489b65c69b5bc5446ba4fef3bd26af92"
@@ -26910,6 +26915,13 @@ set-value@^2.0.0, set-value@^2.0.1:
is-plain-object "^2.0.3"
split-string "^3.0.1"
+set-value@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/set-value/-/set-value-3.0.2.tgz#74e8ecd023c33d0f77199d415409a40f21e61b90"
+ integrity sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==
+ dependencies:
+ is-plain-object "^2.0.4"
+
setimmediate@^1.0.4, setimmediate@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"