[Uptime] Migrate server to new platform (#53939) (#58527)

* Move uptime legacy server to plugins directory. * Re-add feature registration code. * Move feature registration back to kibana bootstrap file. * Delete obsolete test file. * Remove i18n call from untracked file. * Implement feedback. Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Feb 26, 2020 · 4bc787d · 4bc787d
1 parent 650a317
commit 4bc787d
Show file tree

Hide file tree

Showing 119 changed files with 204 additions and 134 deletions.
diff --git a/x-pack/legacy/plugins/uptime/common/constants/plugin.ts b/x-pack/legacy/plugins/uptime/common/constants/plugin.ts
@@ -4,11 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { i18n } from '@kbn/i18n';
+
 export const PLUGIN = {
   APP_ROOT_ID: 'react-uptime-root',
   DESCRIPTION: 'Uptime monitoring',
   ID: 'uptime',
-  ROUTER_BASE_NAME: '/app/uptime#',
   LOCAL_STORAGE_KEY: 'xpack.uptime',
+  NAME: i18n.translate('xpack.uptime.featureRegistry.uptimeFeatureName', {
+    defaultMessage: 'Uptime',
+  }),
+  ROUTER_BASE_NAME: '/app/uptime#',
   TITLE: 'uptime',
 };
diff --git a/x-pack/legacy/plugins/uptime/index.ts b/x-pack/legacy/plugins/uptime/index.ts
@@ -6,9 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { resolve } from 'path';
-import { PluginInitializerContext } from 'src/core/server';
 import { PLUGIN } from './common/constants';
-import { KibanaServer, plugin } from './server';
 import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/utils';
 
 export const uptime = (kibana: any) =>
@@ -35,21 +33,4 @@ export const uptime = (kibana: any) =>
       },
       home: ['plugins/uptime/register_feature'],
     },
-    init(server: KibanaServer) {
-      const initializerContext = {} as PluginInitializerContext;
-      const { savedObjects } = server;
-      const { xpack_main } = server.plugins;
-      const { usageCollection } = server.newPlatform.setup.plugins;
-
-      plugin(initializerContext).setup(
-        {
-          route: server.newPlatform.setup.core.http.createRouter(),
-        },
-        {
-          savedObjects,
-          usageCollection,
-          xpack: xpack_main,
-        }
-      );
-    },
   });
diff --git a/x-pack/legacy/plugins/uptime/scripts/graphql_schemas.ts b/x-pack/legacy/plugins/uptime/scripts/graphql_schemas.ts
diff --git a/...legacy/plugins/uptime/server/lib/requests/search/__tests__/find_potential_matches_test.ts b/...legacy/plugins/uptime/server/lib/requests/search/__tests__/find_potential_matches_test.ts
diff --git a/x-pack/legacy/plugins/uptime/server/plugin.ts b/x-pack/legacy/plugins/uptime/server/plugin.ts
diff --git a/x-pack/plugins/uptime/kibana.json b/x-pack/plugins/uptime/kibana.json
@@ -0,0 +1,9 @@
+{
+  "configPath": ["xpack"],
+  "id": "uptime",
+  "kibanaVersion": "kibana",
+  "requiredPlugins": ["features", "licensing", "usageCollection"],
+  "server": true,
+  "ui": false,
+  "version": "8.0.0"
+}
diff --git a/...lugins/uptime/server/graphql/constants.ts → ...lugins/uptime/server/graphql/constants.ts b/...lugins/uptime/server/graphql/constants.ts → ...lugins/uptime/server/graphql/constants.ts
diff --git a/...cy/plugins/uptime/server/graphql/index.ts → ...ck/plugins/uptime/server/graphql/index.ts b/...cy/plugins/uptime/server/graphql/index.ts → ...ck/plugins/uptime/server/graphql/index.ts
diff --git a/...me/server/graphql/monitor_states/index.ts → ...me/server/graphql/monitor_states/index.ts b/...me/server/graphql/monitor_states/index.ts → ...me/server/graphql/monitor_states/index.ts
diff --git a/...erver/graphql/monitor_states/resolvers.ts → ...erver/graphql/monitor_states/resolvers.ts b/...erver/graphql/monitor_states/resolvers.ts → ...erver/graphql/monitor_states/resolvers.ts
@@ -6,13 +6,13 @@
 
 import { CreateUMGraphQLResolvers, UMContext } from '../types';
 import { UMServerLibs } from '../../lib/lib';
-import { UMResolver } from '../../../common/graphql/resolver_types';
+import { UMResolver } from '../../../../../legacy/plugins/uptime/common/graphql/resolver_types';
 import {
   GetMonitorStatesQueryArgs,
   MonitorSummaryResult,
   StatesIndexStatus,
-} from '../../../common/graphql/types';
-import { CONTEXT_DEFAULTS } from '../../../common/constants/context_defaults';
+} from '../../../../../legacy/plugins/uptime/common/graphql/types';
+import { CONTEXT_DEFAULTS } from '../../../../../legacy/plugins/uptime/common/constants/context_defaults';
 
 export type UMGetMonitorStatesResolver = UMResolver<
   MonitorSummaryResult | Promise<MonitorSummaryResult>,

diff --git a/...rver/graphql/monitor_states/schema.gql.ts → ...rver/graphql/monitor_states/schema.gql.ts b/...rver/graphql/monitor_states/schema.gql.ts → ...rver/graphql/monitor_states/schema.gql.ts
diff --git a/...s/uptime/server/graphql/monitors/index.ts → ...s/uptime/server/graphql/monitors/index.ts b/...s/uptime/server/graphql/monitors/index.ts → ...s/uptime/server/graphql/monitors/index.ts
diff --git a/...time/server/graphql/monitors/resolvers.ts → ...time/server/graphql/monitors/resolvers.ts b/...time/server/graphql/monitors/resolvers.ts → ...time/server/graphql/monitors/resolvers.ts
@@ -4,11 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UMResolver } from '../../../common/graphql/resolver_types';
-import { GetMonitorChartsDataQueryArgs, MonitorChart } from '../../../common/graphql/types';
+import { UMGqlRange } from '../../../../../legacy/plugins/uptime/common/domain_types';
+import { UMResolver } from '../../../../../legacy/plugins/uptime/common/graphql/resolver_types';
+import {
+  GetMonitorChartsDataQueryArgs,
+  MonitorChart,
+} from '../../../../../legacy/plugins/uptime/common/graphql/types';
 import { UMServerLibs } from '../../lib/lib';
 import { CreateUMGraphQLResolvers, UMContext } from '../types';
 
+export type UMMonitorsResolver = UMResolver<any | Promise<any>, any, UMGqlRange, UMContext>;
+
 export type UMGetMonitorChartsResolver = UMResolver<
   any | Promise<any>,
   any,

diff --git a/...ime/server/graphql/monitors/schema.gql.ts → ...ime/server/graphql/monitors/schema.gql.ts b/...ime/server/graphql/monitors/schema.gql.ts → ...ime/server/graphql/monitors/schema.gql.ts
diff --git a/...gins/uptime/server/graphql/pings/index.ts → ...gins/uptime/server/graphql/pings/index.ts b/...gins/uptime/server/graphql/pings/index.ts → ...gins/uptime/server/graphql/pings/index.ts
diff --git a/.../uptime/server/graphql/pings/resolvers.ts → .../uptime/server/graphql/pings/resolvers.ts b/.../uptime/server/graphql/pings/resolvers.ts → .../uptime/server/graphql/pings/resolvers.ts
@@ -4,8 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UMResolver } from '../../../common/graphql/resolver_types';
-import { AllPingsQueryArgs, PingResults } from '../../../common/graphql/types';
+import { UMResolver } from '../../../../../legacy/plugins/uptime/common/graphql/resolver_types';
+import {
+  AllPingsQueryArgs,
+  PingResults,
+} from '../../../../../legacy/plugins/uptime/common/graphql/types';
 import { UMServerLibs } from '../../lib/lib';
 import { UMContext } from '../types';
 import { CreateUMGraphQLResolvers } from '../types';

diff --git a/...uptime/server/graphql/pings/schema.gql.ts → ...uptime/server/graphql/pings/schema.gql.ts b/...uptime/server/graphql/pings/schema.gql.ts → ...uptime/server/graphql/pings/schema.gql.ts
diff --git a/...cy/plugins/uptime/server/graphql/types.ts → ...ck/plugins/uptime/server/graphql/types.ts b/...cy/plugins/uptime/server/graphql/types.ts → ...ck/plugins/uptime/server/graphql/types.ts
diff --git a/...nt_scalar/__tests__/parse_literal.test.ts → ...nt_scalar/__tests__/parse_literal.test.ts b/...nt_scalar/__tests__/parse_literal.test.ts → ...nt_scalar/__tests__/parse_literal.test.ts
diff --git a/..._int_scalar/__tests__/parse_value.test.ts → ..._int_scalar/__tests__/parse_value.test.ts b/..._int_scalar/__tests__/parse_value.test.ts → ..._int_scalar/__tests__/parse_value.test.ts
diff --git a/...ed_int_scalar/__tests__/serialize.test.ts → ...ed_int_scalar/__tests__/serialize.test.ts b/...ed_int_scalar/__tests__/serialize.test.ts → ...ed_int_scalar/__tests__/serialize.test.ts
diff --git a/...rver/graphql/unsigned_int_scalar/index.ts → ...rver/graphql/unsigned_int_scalar/index.ts b/...rver/graphql/unsigned_int_scalar/index.ts → ...rver/graphql/unsigned_int_scalar/index.ts
diff --git a/.../graphql/unsigned_int_scalar/resolvers.ts → .../graphql/unsigned_int_scalar/resolvers.ts b/.../graphql/unsigned_int_scalar/resolvers.ts → .../graphql/unsigned_int_scalar/resolvers.ts
diff --git a/...graphql/unsigned_int_scalar/schema.gql.ts → ...graphql/unsigned_int_scalar/schema.gql.ts b/...graphql/unsigned_int_scalar/schema.gql.ts → ...graphql/unsigned_int_scalar/schema.gql.ts
diff --git a/x-pack/legacy/plugins/uptime/server/index.ts → x-pack/plugins/uptime/server/index.ts b/x-pack/legacy/plugins/uptime/server/index.ts → x-pack/plugins/uptime/server/index.ts
@@ -4,5 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { PluginInitializerContext } from '../../../../src/core/server';
+import { Plugin } from './plugin';
+
 export { initServerWithKibana, KibanaServer } from './kibana.index';
-export { plugin } from './plugin';
+export const plugin = (initializerContext: PluginInitializerContext) =>
+  new Plugin(initializerContext);
diff --git a/...acy/plugins/uptime/server/kibana.index.ts → x-pack/plugins/uptime/server/kibana.index.ts b/...acy/plugins/uptime/server/kibana.index.ts → x-pack/plugins/uptime/server/kibana.index.ts
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { i18n } from '@kbn/i18n';
 import { Request, Server } from 'hapi';
-import { PLUGIN } from '../common/constants';
+import { PLUGIN } from '../../../legacy/plugins/uptime/common/constants';
 import { KibanaTelemetryAdapter } from './lib/adapters/telemetry';
 import { compose } from './lib/compose/kibana';
 import { initUptimeServer } from './uptime_server';
@@ -25,17 +24,13 @@ export interface KibanaServer extends Server {
 }
 
 export const initServerWithKibana = (server: UptimeCoreSetup, plugins: UptimeCorePlugins) => {
-  const { usageCollection, xpack } = plugins;
-  const libs = compose(server, plugins);
+  const { features, usageCollection } = plugins;
+  const libs = compose(server);
   KibanaTelemetryAdapter.registerUsageCollector(usageCollection);
 
-  initUptimeServer(libs);
-
-  xpack.registerFeature({
+  features.registerFeature({
     id: PLUGIN.ID,
-    name: i18n.translate('xpack.uptime.featureRegistry.uptimeFeatureName', {
-      defaultMessage: 'Uptime',
-    }),
+    name: PLUGIN.NAME,
     navLinkId: PLUGIN.ID,
     icon: 'uptimeApp',
     app: ['uptime', 'kibana'],
@@ -59,4 +54,6 @@ export const initServerWithKibana = (server: UptimeCoreSetup, plugins: UptimeCor
       },
     },
   });
+
+  initUptimeServer(libs);
 };
diff --git a/...r/lib/adapters/framework/adapter_types.ts → ...r/lib/adapters/framework/adapter_types.ts b/...r/lib/adapters/framework/adapter_types.ts → ...r/lib/adapters/framework/adapter_types.ts
@@ -6,13 +6,9 @@
 
 import { GraphQLSchema } from 'graphql';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import {
-  SavedObjectsLegacyService,
-  IRouter,
-  CallAPIOptions,
-  SavedObjectsClientContract,
-} from 'src/core/server';
+import { IRouter, CallAPIOptions, SavedObjectsClientContract } from 'src/core/server';
 import { UMKibanaRoute } from '../../../rest_api';
+import { PluginSetupContract } from '../../../../../features/server';
 
 type APICaller = (
   endpoint: string,
@@ -34,9 +30,8 @@ export interface UptimeCoreSetup {
 }
 
 export interface UptimeCorePlugins {
-  savedObjects: SavedObjectsLegacyService;
+  features: PluginSetupContract;
   usageCollection: UsageCollectionSetup;
-  xpack: any;
 }
 
 export interface UMBackendFrameworkAdapter {

diff --git a/...me/server/lib/adapters/framework/index.ts → ...me/server/lib/adapters/framework/index.ts b/...me/server/lib/adapters/framework/index.ts → ...me/server/lib/adapters/framework/index.ts
diff --git a/...ers/framework/kibana_framework_adapter.ts → ...ers/framework/kibana_framework_adapter.ts b/...ers/framework/kibana_framework_adapter.ts → ...ers/framework/kibana_framework_adapter.ts
diff --git a/...ugins/uptime/server/lib/adapters/index.ts → ...ugins/uptime/server/lib/adapters/index.ts b/...ugins/uptime/server/lib/adapters/index.ts → ...ugins/uptime/server/lib/adapters/index.ts
diff --git a/...s__/kibana_telemetry_adapter.test.ts.snap → ...s__/kibana_telemetry_adapter.test.ts.snap b/...s__/kibana_telemetry_adapter.test.ts.snap → ...s__/kibana_telemetry_adapter.test.ts.snap
diff --git a/..._tests__/kibana_telemetry_adapter.test.ts → ..._tests__/kibana_telemetry_adapter.test.ts b/..._tests__/kibana_telemetry_adapter.test.ts → ..._tests__/kibana_telemetry_adapter.test.ts
diff --git a/...me/server/lib/adapters/telemetry/index.ts → ...me/server/lib/adapters/telemetry/index.ts b/...me/server/lib/adapters/telemetry/index.ts → ...me/server/lib/adapters/telemetry/index.ts
diff --git a/...ers/telemetry/kibana_telemetry_adapter.ts → ...ers/telemetry/kibana_telemetry_adapter.ts b/...ers/telemetry/kibana_telemetry_adapter.ts → ...ers/telemetry/kibana_telemetry_adapter.ts
diff --git a/...ugins/uptime/server/lib/compose/kibana.ts → ...ugins/uptime/server/lib/compose/kibana.ts b/...ugins/uptime/server/lib/compose/kibana.ts → ...ugins/uptime/server/lib/compose/kibana.ts
@@ -8,9 +8,9 @@ import { UMKibanaBackendFrameworkAdapter } from '../adapters/framework';
 import * as requests from '../requests';
 import { licenseCheck } from '../domains';
 import { UMDomainLibs, UMServerLibs } from '../lib';
-import { UptimeCorePlugins, UptimeCoreSetup } from '../adapters/framework';
+import { UptimeCoreSetup } from '../adapters/framework';
 
-export function compose(server: UptimeCoreSetup, plugins: UptimeCorePlugins): UMServerLibs {
+export function compose(server: UptimeCoreSetup): UMServerLibs {
   const framework = new UMKibanaBackendFrameworkAdapter(server);
 
   const domainLibs: UMDomainLibs = {

diff --git a/...ests__/__snapshots__/license.test.ts.snap → ...ests__/__snapshots__/license.test.ts.snap b/...ests__/__snapshots__/license.test.ts.snap → ...ests__/__snapshots__/license.test.ts.snap
diff --git a/...ver/lib/domains/__tests__/license.test.ts → ...ver/lib/domains/__tests__/license.test.ts b/...ver/lib/domains/__tests__/license.test.ts → ...ver/lib/domains/__tests__/license.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILicense } from '../../../../../../../plugins/licensing/server';
+import { ILicense } from '../../../../../licensing/server';
 import { licenseCheck } from '../license';
 
 describe('license check', () => {

diff --git a/...lugins/uptime/server/lib/domains/index.ts → ...lugins/uptime/server/lib/domains/index.ts b/...lugins/uptime/server/lib/domains/index.ts → ...lugins/uptime/server/lib/domains/index.ts
diff --git a/...gins/uptime/server/lib/domains/license.ts → ...gins/uptime/server/lib/domains/license.ts b/...gins/uptime/server/lib/domains/license.ts → ...gins/uptime/server/lib/domains/license.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILicense } from '../../../../../../plugins/licensing/server';
+import { ILicense } from '../../../../licensing/server';
 
 export interface UMLicenseStatusResponse {
   statusCode: number;

diff --git a/..._snapshots__/assert_close_to.test.ts.snap → ..._snapshots__/assert_close_to.test.ts.snap b/..._snapshots__/assert_close_to.test.ts.snap → ..._snapshots__/assert_close_to.test.ts.snap
diff --git a/...napshots__/get_filter_clause.test.ts.snap → ...napshots__/get_filter_clause.test.ts.snap b/...napshots__/get_filter_clause.test.ts.snap → ...napshots__/get_filter_clause.test.ts.snap
diff --git a/...b/helper/__test__/assert_close_to.test.ts → ...b/helper/__test__/assert_close_to.test.ts b/...b/helper/__test__/assert_close_to.test.ts → ...b/helper/__test__/assert_close_to.test.ts
diff --git a/...helper/__test__/get_filter_clause.test.ts → ...helper/__test__/get_filter_clause.test.ts b/...helper/__test__/get_filter_clause.test.ts → ...helper/__test__/get_filter_clause.test.ts
diff --git a/...r/__test__/get_histogram_interval.test.ts → ...r/__test__/get_histogram_interval.test.ts b/...r/__test__/get_histogram_interval.test.ts → ...r/__test__/get_histogram_interval.test.ts
diff --git a/.../get_histogram_interval_formatted.test.ts → .../get_histogram_interval_formatted.test.ts b/.../get_histogram_interval_formatted.test.ts → .../get_histogram_interval_formatted.test.ts
diff --git a/...lper/__test__/parse_relative_date.test.ts → ...lper/__test__/parse_relative_date.test.ts b/...lper/__test__/parse_relative_date.test.ts → ...lper/__test__/parse_relative_date.test.ts
diff --git a/...time/server/lib/helper/assert_close_to.ts → ...time/server/lib/helper/assert_close_to.ts b/...time/server/lib/helper/assert_close_to.ts → ...time/server/lib/helper/assert_close_to.ts
diff --git a/...me/server/lib/helper/get_filter_clause.ts → ...me/server/lib/helper/get_filter_clause.ts b/...me/server/lib/helper/get_filter_clause.ts → ...me/server/lib/helper/get_filter_clause.ts
diff --git a/...rver/lib/helper/get_histogram_interval.ts → ...rver/lib/helper/get_histogram_interval.ts b/...rver/lib/helper/get_histogram_interval.ts → ...rver/lib/helper/get_histogram_interval.ts
@@ -5,7 +5,7 @@
  */
 
 import DateMath from '@elastic/datemath';
-import { QUERY } from '../../../common/constants';
+import { QUERY } from '../../../../../legacy/plugins/uptime/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/...elper/get_histogram_interval_formatted.ts → ...elper/get_histogram_interval_formatted.ts b/...elper/get_histogram_interval_formatted.ts → ...elper/get_histogram_interval_formatted.ts
diff --git a/...plugins/uptime/server/lib/helper/index.ts → ...plugins/uptime/server/lib/helper/index.ts b/...plugins/uptime/server/lib/helper/index.ts → ...plugins/uptime/server/lib/helper/index.ts
diff --git a/...erver/lib/helper/make_date_rate_filter.ts → ...erver/lib/helper/make_date_rate_filter.ts b/...erver/lib/helper/make_date_rate_filter.ts → ...erver/lib/helper/make_date_rate_filter.ts
diff --git a/...time/server/lib/helper/object_to_array.ts → ...time/server/lib/helper/object_to_array.ts b/...time/server/lib/helper/object_to_array.ts → ...time/server/lib/helper/object_to_array.ts
diff --git a/...k/legacy/plugins/uptime/server/lib/lib.ts → x-pack/plugins/uptime/server/lib/lib.ts b/...k/legacy/plugins/uptime/server/lib/lib.ts → x-pack/plugins/uptime/server/lib/lib.ts
diff --git a/.../extract_filter_aggs_results.test.ts.snap → .../extract_filter_aggs_results.test.ts.snap b/.../extract_filter_aggs_results.test.ts.snap → .../extract_filter_aggs_results.test.ts.snap
diff --git a/...shots__/generate_filter_aggs.test.ts.snap → ...shots__/generate_filter_aggs.test.ts.snap b/...shots__/generate_filter_aggs.test.ts.snap → ...shots__/generate_filter_aggs.test.ts.snap
diff --git a/...apshots__/get_monitor_charts.test.ts.snap → ...apshots__/get_monitor_charts.test.ts.snap b/...apshots__/get_monitor_charts.test.ts.snap → ...apshots__/get_monitor_charts.test.ts.snap
diff --git a/...apshots__/get_ping_histogram.test.ts.snap → ...apshots__/get_ping_histogram.test.ts.snap b/...apshots__/get_ping_histogram.test.ts.snap → ...apshots__/get_ping_histogram.test.ts.snap
diff --git a/...ests__/combine_range_with_filters.test.ts → ...ests__/combine_range_with_filters.test.ts b/...ests__/combine_range_with_filters.test.ts → ...ests__/combine_range_with_filters.test.ts
diff --git a/...sts__/extract_filter_aggs_results.test.ts → ...sts__/extract_filter_aggs_results.test.ts b/...sts__/extract_filter_aggs_results.test.ts → ...sts__/extract_filter_aggs_results.test.ts
diff --git a/...ts/__tests__/generate_filter_aggs.test.ts → ...ts/__tests__/generate_filter_aggs.test.ts b/...ts/__tests__/generate_filter_aggs.test.ts → ...ts/__tests__/generate_filter_aggs.test.ts
diff --git a/...ests/__tests__/get_latest_monitor.test.ts → ...ests/__tests__/get_latest_monitor.test.ts b/...ests/__tests__/get_latest_monitor.test.ts → ...ests/__tests__/get_latest_monitor.test.ts
diff --git a/...ests/__tests__/get_monitor_charts.test.ts → ...ests/__tests__/get_monitor_charts.test.ts b/...ests/__tests__/get_monitor_charts.test.ts → ...ests/__tests__/get_monitor_charts.test.ts
diff --git a/...ests/__tests__/get_ping_histogram.test.ts → ...ests/__tests__/get_ping_histogram.test.ts b/...ests/__tests__/get_ping_histogram.test.ts → ...ests/__tests__/get_ping_histogram.test.ts
diff --git a/.../lib/requests/__tests__/get_pings.test.ts → .../lib/requests/__tests__/get_pings.test.ts b/.../lib/requests/__tests__/get_pings.test.ts → .../lib/requests/__tests__/get_pings.test.ts
diff --git a/...quests/__tests__/monitor_charts_mock.json → ...quests/__tests__/monitor_charts_mock.json b/...quests/__tests__/monitor_charts_mock.json → ...quests/__tests__/monitor_charts_mock.json
diff --git a/...rver/lib/requests/generate_filter_aggs.ts → ...rver/lib/requests/generate_filter_aggs.ts b/...rver/lib/requests/generate_filter_aggs.ts → ...rver/lib/requests/generate_filter_aggs.ts
diff --git a/...ime/server/lib/requests/get_filter_bar.ts → ...ime/server/lib/requests/get_filter_bar.ts b/...ime/server/lib/requests/get_filter_bar.ts → ...ime/server/lib/requests/get_filter_bar.ts
@@ -5,9 +5,9 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { OverviewFilters } from '../../../common/runtime_types';
+import { OverviewFilters } from '../../../../../legacy/plugins/uptime/common/runtime_types';
 import { generateFilterAggs } from './generate_filter_aggs';
-import { INDEX_NAMES } from '../../../common/constants';
+import { INDEX_NAMES } from '../../../../../legacy/plugins/uptime/common/constants';
 
 export interface GetFilterBarParams {
   /** @param dateRangeStart timestamp bounds */

diff --git a/.../server/lib/requests/get_index_pattern.ts → .../server/lib/requests/get_index_pattern.ts b/.../server/lib/requests/get_index_pattern.ts → .../server/lib/requests/get_index_pattern.ts
@@ -6,8 +6,8 @@
 
 import { APICaller } from 'src/core/server';
 import { UMElasticsearchQueryFn } from '../adapters';
-import { IndexPatternsFetcher, IIndexPattern } from '../../../../../../../src/plugins/data/server';
-import { INDEX_NAMES } from '../../../common/constants';
+import { IndexPatternsFetcher, IIndexPattern } from '../../../../../../src/plugins/data/server';
+import { INDEX_NAMES } from '../../../../../legacy/plugins/uptime/common/constants';
 
 export const getUptimeIndexPattern: UMElasticsearchQueryFn<any, {}> = async callES => {
   const indexPatternsFetcher = new IndexPatternsFetcher((...rest: Parameters<APICaller>) =>

diff --git a/...e/server/lib/requests/get_index_status.ts → ...e/server/lib/requests/get_index_status.ts b/...e/server/lib/requests/get_index_status.ts → ...e/server/lib/requests/get_index_status.ts
@@ -5,8 +5,8 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { StatesIndexStatus } from '../../../common/graphql/types';
-import { INDEX_NAMES } from '../../../common/constants';
+import { StatesIndexStatus } from '../../../../../legacy/plugins/uptime/common/graphql/types';
+import { INDEX_NAMES } from '../../../../../legacy/plugins/uptime/common/constants';
 
 export const getIndexStatus: UMElasticsearchQueryFn<{}, StatesIndexStatus> = async ({ callES }) => {
   const {

diff --git a/...server/lib/requests/get_latest_monitor.ts → ...server/lib/requests/get_latest_monitor.ts b/...server/lib/requests/get_latest_monitor.ts → ...server/lib/requests/get_latest_monitor.ts
@@ -5,8 +5,8 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { Ping } from '../../../common/graphql/types';
-import { INDEX_NAMES } from '../../../common/constants';
+import { Ping } from '../../../../../legacy/plugins/uptime/common/graphql/types';
+import { INDEX_NAMES } from '../../../../../legacy/plugins/uptime/common/constants';
 
 export interface GetLatestMonitorParams {
   /** @member dateRangeStart timestamp bounds */

diff --git a/...uptime/server/lib/requests/get_monitor.ts → ...uptime/server/lib/requests/get_monitor.ts b/...uptime/server/lib/requests/get_monitor.ts → ...uptime/server/lib/requests/get_monitor.ts
@@ -5,8 +5,8 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { Ping } from '../../../common/graphql/types';
-import { INDEX_NAMES } from '../../../common/constants';
+import { Ping } from '../../../../../legacy/plugins/uptime/common/graphql/types';
+import { INDEX_NAMES } from '../../../../../legacy/plugins/uptime/common/constants';
 
 export interface GetMonitorParams {
   /** @member monitorId optional limit to monitorId */

diff --git a/...server/lib/requests/get_monitor_charts.ts → ...server/lib/requests/get_monitor_charts.ts b/...server/lib/requests/get_monitor_charts.ts → ...server/lib/requests/get_monitor_charts.ts
@@ -5,9 +5,12 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { INDEX_NAMES } from '../../../common/constants';
+import { INDEX_NAMES } from '../../../../../legacy/plugins/uptime/common/constants';
 import { getHistogramIntervalFormatted } from '../helper';
-import { MonitorChart, LocationDurationLine } from '../../../common/graphql/types';
+import {
+  MonitorChart,
+  LocationDurationLine,
+} from '../../../../../legacy/plugins/uptime/common/graphql/types';
 
 export interface GetMonitorChartsParams {
   /** @member monitorId ID value for the selected monitor */

diff --git a/...erver/lib/requests/get_monitor_details.ts → ...erver/lib/requests/get_monitor_details.ts b/...erver/lib/requests/get_monitor_details.ts → ...erver/lib/requests/get_monitor_details.ts
@@ -5,8 +5,11 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { MonitorDetails, MonitorError } from '../../../common/runtime_types';
-import { INDEX_NAMES } from '../../../common/constants';
+import {
+  MonitorDetails,
+  MonitorError,
+} from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { INDEX_NAMES } from '../../../../../legacy/plugins/uptime/common/constants';
 
 export interface GetMonitorDetailsParams {
   monitorId: string;

diff --git a/...ver/lib/requests/get_monitor_locations.ts → ...ver/lib/requests/get_monitor_locations.ts b/...ver/lib/requests/get_monitor_locations.ts → ...ver/lib/requests/get_monitor_locations.ts
@@ -5,8 +5,14 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { INDEX_NAMES, UNNAMED_LOCATION } from '../../../common/constants';
-import { MonitorLocations, MonitorLocation } from '../../../common/runtime_types';
+import {
+  INDEX_NAMES,
+  UNNAMED_LOCATION,
+} from '../../../../../legacy/plugins/uptime/common/constants';
+import {
+  MonitorLocations,
+  MonitorLocation,
+} from '../../../../../legacy/plugins/uptime/common/runtime_types';
 
 /**
  * Fetch data for the monitor page title.

diff --git a/...server/lib/requests/get_monitor_states.ts → ...server/lib/requests/get_monitor_states.ts b/...server/lib/requests/get_monitor_states.ts → ...server/lib/requests/get_monitor_states.ts
@@ -4,10 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CONTEXT_DEFAULTS } from '../../../common/constants';
+import { CONTEXT_DEFAULTS } from '../../../../../legacy/plugins/uptime/common/constants';
 import { fetchPage } from './search';
 import { UMElasticsearchQueryFn } from '../adapters';
-import { MonitorSummary, SortOrder, CursorDirection } from '../../../common/graphql/types';
+import {
+  MonitorSummary,
+  SortOrder,
+  CursorDirection,
+} from '../../../../../legacy/plugins/uptime/common/graphql/types';
 import { QueryContext } from './search';
 
 export interface CursorPagination {