[Synthetics] Clean up server side of things between uptime and synthe…

…tics feature (#131619) Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
elastic · May 16, 2022 · 6ed28ac · 6ed28ac
1 parent 8e33d5d
commit 6ed28ac
Show file tree

Hide file tree

Showing 186 changed files with 547 additions and 486 deletions.
diff --git a/x-pack/plugins/synthetics/common/requests/get_certs_request_body.ts b/x-pack/plugins/synthetics/common/requests/get_certs_request_body.ts
@@ -9,7 +9,7 @@ import { CertResult, GetCertsParams, Ping } from '../runtime_types';
 import { createEsQuery } from '../utils/es_search';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { CertificatesResults } from '../../server/lib/requests/get_certs';
+import { CertificatesResults } from '../../server/legacy_uptime/lib/requests/get_certs';
 import { asMutableArray } from '../utils/as_mutable_array';
 
 enum SortFields {

diff --git a/x-pack/plugins/synthetics/server/feature.ts b/x-pack/plugins/synthetics/server/feature.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { PLUGIN } from '../common/constants/plugin';
+import { UPTIME_RULE_TYPES } from '../common/constants/alerts';
+import { umDynamicSettings } from './legacy_uptime/lib/saved_objects/uptime_settings';
+import { syntheticsMonitorType } from './legacy_uptime/lib/saved_objects/synthetics_monitor';
+import { syntheticsApiKeyObjectType } from './legacy_uptime/lib/saved_objects/service_api_key';
+
+export const uptimeFeature = {
+  id: PLUGIN.ID,
+  name: PLUGIN.NAME,
+  order: 1000,
+  category: DEFAULT_APP_CATEGORIES.observability,
+  app: ['uptime', 'kibana', 'synthetics'],
+  catalogue: ['uptime'],
+  management: {
+    insightsAndAlerting: ['triggersActions'],
+  },
+  alerting: UPTIME_RULE_TYPES,
+  privileges: {
+    all: {
+      app: ['uptime', 'kibana', 'synthetics'],
+      catalogue: ['uptime'],
+      api: ['uptime-read', 'uptime-write', 'lists-all'],
+      savedObject: {
+        all: [umDynamicSettings.name, syntheticsMonitorType, syntheticsApiKeyObjectType],
+        read: [],
+      },
+      alerting: {
+        rule: {
+          all: UPTIME_RULE_TYPES,
+        },
+        alert: {
+          all: UPTIME_RULE_TYPES,
+        },
+      },
+      management: {
+        insightsAndAlerting: ['triggersActions'],
+      },
+      ui: ['save', 'configureSettings', 'show', 'alerting:save'],
+    },
+    read: {
+      app: ['uptime', 'kibana', 'synthetics'],
+      catalogue: ['uptime'],
+      api: ['uptime-read', 'lists-read'],
+      savedObject: {
+        all: [],
+        read: [umDynamicSettings.name, syntheticsMonitorType, syntheticsApiKeyObjectType],
+      },
+      alerting: {
+        rule: {
+          read: UPTIME_RULE_TYPES,
+        },
+        alert: {
+          read: UPTIME_RULE_TYPES,
+        },
+      },
+      management: {
+        insightsAndAlerting: ['triggersActions'],
+      },
+      ui: ['show', 'alerting:save'],
+    },
+  },
+};
diff --git a/x-pack/plugins/synthetics/server/kibana.index.ts b/x-pack/plugins/synthetics/server/kibana.index.ts
diff --git a/...r/lib/adapters/framework/adapter_types.ts → ...e/lib/adapters/framework/adapter_types.ts b/...r/lib/adapters/framework/adapter_types.ts → ...e/lib/adapters/framework/adapter_types.ts
@@ -30,10 +30,9 @@ import { CloudSetup } from '@kbn/cloud-plugin/server';
 import { FleetStartContract } from '@kbn/fleet-plugin/server';
 import { UptimeESClient } from '../../lib';
 import type { TelemetryEventsSender } from '../../telemetry/sender';
-import type { UptimeRouter } from '../../../types';
-import { UMKibanaRoute } from '../../../rest_api';
-import { UptimeConfig } from '../../../../common/config';
-import { SyntheticsService } from '../../synthetics_service/synthetics_service';
+import type { UptimeRouter } from '../../../../types';
+import { UptimeConfig } from '../../../../../common/config';
+import { SyntheticsService } from '../../../../synthetics_service/synthetics_service';
 
 export type UMElasticsearchQueryFn<P, R = any> = (
   params: {
@@ -85,7 +84,3 @@ export interface UptimeCorePluginsStart {
   taskManager: TaskManagerStartContract;
   telemetry: TelemetryPluginStart;
 }
-
-export interface UMBackendFrameworkAdapter {
-  registerRoute(route: UMKibanaRoute): void;
-}
diff --git a/...cs/server/lib/adapters/framework/index.ts → ...cy_uptime/lib/adapters/framework/index.ts b/...cs/server/lib/adapters/framework/index.ts → ...cy_uptime/lib/adapters/framework/index.ts
@@ -6,4 +6,3 @@
  */
 
 export * from './adapter_types';
-export { UMKibanaBackendFrameworkAdapter } from './kibana_framework_adapter';
diff --git a/...s/synthetics/server/lib/adapters/index.ts → ...erver/legacy_uptime/lib/adapters/index.ts b/...s/synthetics/server/lib/adapters/index.ts → ...erver/legacy_uptime/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/...cs/server/lib/adapters/telemetry/index.ts → ...cy_uptime/lib/adapters/telemetry/index.ts b/...cs/server/lib/adapters/telemetry/index.ts → ...cy_uptime/lib/adapters/telemetry/index.ts
diff --git a/...elemetry/kibana_telemetry_adapter.test.ts → ...elemetry/kibana_telemetry_adapter.test.ts b/...elemetry/kibana_telemetry_adapter.test.ts → ...elemetry/kibana_telemetry_adapter.test.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
@@ -11,7 +11,7 @@ import { CollectorFetchContext, UsageCollectionSetup } from '@kbn/usage-collecti
 import { PageViewParams, UptimeTelemetry, Usage } from './types';
 import { savedObjectsAdapter } from '../../saved_objects/saved_objects';
 import { UptimeESClient, createUptimeESClient } from '../../lib';
-import { createEsQuery } from '../../../../common/utils/es_search';
+import { createEsQuery } from '../../../../../common/utils/es_search';
 
 interface UptimeTelemetryCollector {
   [key: number]: UptimeTelemetry;

diff --git a/...cs/server/lib/adapters/telemetry/types.ts → ...cy_uptime/lib/adapters/telemetry/types.ts b/...cs/server/lib/adapters/telemetry/types.ts → ...cy_uptime/lib/adapters/telemetry/types.ts
diff --git a/...ics/server/lib/alerts/action_variables.ts → ...acy_uptime/lib/alerts/action_variables.ts b/...ics/server/lib/alerts/action_variables.ts → ...acy_uptime/lib/alerts/action_variables.ts
diff --git a/...nthetics/server/lib/alerts/common.test.ts → ...r/legacy_uptime/lib/alerts/common.test.ts b/...nthetics/server/lib/alerts/common.test.ts → ...r/legacy_uptime/lib/alerts/common.test.ts
diff --git a/...ns/synthetics/server/lib/alerts/common.ts → ...server/legacy_uptime/lib/alerts/common.ts b/...ns/synthetics/server/lib/alerts/common.ts → ...server/legacy_uptime/lib/alerts/common.ts
@@ -9,7 +9,7 @@ import { isRight } from 'fp-ts/lib/Either';
 import Mustache from 'mustache';
 import { IBasePath } from '@kbn/core/server';
 import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
-import { UptimeCommonState, UptimeCommonStateType } from '../../../common/runtime_types';
+import { UptimeCommonState, UptimeCommonStateType } from '../../../../common/runtime_types';
 
 export type UpdateUptimeAlertState = (
   state: Record<string, any>,

diff --git a/...erver/lib/alerts/duration_anomaly.test.ts → ...ptime/lib/alerts/duration_anomaly.test.ts b/...erver/lib/alerts/duration_anomaly.test.ts → ...ptime/lib/alerts/duration_anomaly.test.ts
@@ -10,11 +10,11 @@ import {
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
 import { durationAnomalyAlertFactory } from './duration_anomaly';
-import { DURATION_ANOMALY } from '../../../common/constants/alerts';
+import { DURATION_ANOMALY } from '../../../../common/constants/alerts';
 import { AnomaliesTableRecord, AnomalyRecordDoc } from '@kbn/ml-plugin/common/types/anomalies';
 import { createRuleTypeMocks, bootstrapDependencies } from './test_utils';
 import { getSeverityType } from '@kbn/ml-plugin/common/util/anomaly_utils';
-import { Ping } from '../../../common/runtime_types/ping';
+import { Ping } from '../../../../common/runtime_types/ping';
 import { ALERT_REASON_MSG, VIEW_IN_APP_URL } from './action_variables';
 
 interface MockAnomaly {

diff --git a/...ics/server/lib/alerts/duration_anomaly.ts → ...acy_uptime/lib/alerts/duration_anomaly.ts b/...ics/server/lib/alerts/duration_anomaly.ts → ...acy_uptime/lib/alerts/duration_anomaly.ts
@@ -21,15 +21,15 @@ import {
   getViewInAppUrl,
   setRecoveredAlertsContext,
 } from './common';
-import { CLIENT_ALERT_TYPES, DURATION_ANOMALY } from '../../../common/constants/alerts';
+import { CLIENT_ALERT_TYPES, DURATION_ANOMALY } from '../../../../common/constants/alerts';
 import { commonStateTranslations, durationAnomalyTranslations } from './translations';
 import { UptimeCorePluginsSetup } from '../adapters/framework';
 import { UptimeAlertTypeFactory } from './types';
-import { Ping } from '../../../common/runtime_types/ping';
-import { getMLJobId } from '../../../common/lib';
+import { Ping } from '../../../../common/runtime_types/ping';
+import { getMLJobId } from '../../../../common/lib';
 
-import { DurationAnomalyTranslations as CommonDurationAnomalyTranslations } from '../../../common/translations';
-import { getMonitorRouteFromMonitorId } from '../../../common/utils/get_monitor_url';
+import { DurationAnomalyTranslations as CommonDurationAnomalyTranslations } from '../../../../common/translations';
+import { getMonitorRouteFromMonitorId } from '../../../../common/utils/get_monitor_url';
 
 import { createUptimeESClient } from '../lib';
 import { ALERT_REASON_MSG, ACTION_VARIABLES, VIEW_IN_APP_URL } from './action_variables';

diff --git a/...ins/synthetics/server/lib/alerts/index.ts → .../server/legacy_uptime/lib/alerts/index.ts b/...ins/synthetics/server/lib/alerts/index.ts → .../server/legacy_uptime/lib/alerts/index.ts
diff --git a/...cs/server/lib/alerts/status_check.test.ts → ...cy_uptime/lib/alerts/status_check.test.ts b/...cs/server/lib/alerts/status_check.test.ts → ...cy_uptime/lib/alerts/status_check.test.ts
@@ -14,7 +14,7 @@ import {
   getInstanceId,
 } from './status_check';
 import { GetMonitorStatusResult } from '../requests/get_monitor_status';
-import { makePing } from '../../../common/runtime_types/ping';
+import { makePing } from '../../../../common/runtime_types/ping';
 import { GetMonitorAvailabilityResult } from '../requests/get_monitor_availability';
 import { DefaultUptimeAlertInstance } from './types';
 import { createRuleTypeMocks, bootstrapDependencies } from './test_utils';

diff --git a/...thetics/server/lib/alerts/status_check.ts → .../legacy_uptime/lib/alerts/status_check.ts b/...thetics/server/lib/alerts/status_check.ts → .../legacy_uptime/lib/alerts/status_check.ts
@@ -19,22 +19,22 @@ import {
   StatusCheckFilters,
   Ping,
   GetMonitorAvailabilityParams,
-} from '../../../common/runtime_types';
-import { CLIENT_ALERT_TYPES, MONITOR_STATUS } from '../../../common/constants/alerts';
+} from '../../../../common/runtime_types';
+import { CLIENT_ALERT_TYPES, MONITOR_STATUS } from '../../../../common/constants/alerts';
 import { updateState, getViewInAppUrl, setRecoveredAlertsContext } from './common';
 import {
   commonMonitorStateI18,
   commonStateTranslations,
   statusCheckTranslations,
 } from './translations';
-import { stringifyKueries, combineFiltersAndUserSearch } from '../../../common/lib';
+import { stringifyKueries, combineFiltersAndUserSearch } from '../../../../common/lib';
 import { GetMonitorAvailabilityResult } from '../requests/get_monitor_availability';
 import {
   GetMonitorStatusResult,
   GetMonitorDownStatusMessageParams,
   getMonitorDownStatusMessageParams,
 } from '../requests/get_monitor_status';
-import { UNNAMED_LOCATION } from '../../../common/constants';
+import { UNNAMED_LOCATION } from '../../../../common/constants';
 import { getUptimeIndexPattern, IndexPatternTitleAndFields } from '../requests/get_index_pattern';
 import { UMServerLibs, UptimeESClient, createUptimeESClient } from '../lib';
 import {
@@ -44,7 +44,7 @@ import {
   ACTION_VARIABLES,
   VIEW_IN_APP_URL,
 } from './action_variables';
-import { getMonitorRouteFromMonitorId } from '../../../common/utils/get_monitor_url';
+import { getMonitorRouteFromMonitorId } from '../../../../common/utils/get_monitor_url';
 
 export type ActionGroupIds = ActionGroupIdsOf<typeof MONITOR_STATUS>;
 

diff --git a/...ics/server/lib/alerts/test_utils/index.ts → ...acy_uptime/lib/alerts/test_utils/index.ts b/...ics/server/lib/alerts/test_utils/index.ts → ...acy_uptime/lib/alerts/test_utils/index.ts
@@ -11,7 +11,7 @@ import { ruleRegistryMocks } from '@kbn/rule-registry-plugin/server/mocks';
 import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
 import { UMServerLibs } from '../../lib';
 import { UptimeCorePluginsSetup, UptimeServerSetup } from '../../adapters';
-import type { UptimeRouter } from '../../../types';
+import type { UptimeRouter } from '../../../../types';
 import { getUptimeESMockClient } from '../../requests/helper';
 
 /**

diff --git a/.../synthetics/server/lib/alerts/tls.test.ts → ...rver/legacy_uptime/lib/alerts/tls.test.ts b/.../synthetics/server/lib/alerts/tls.test.ts → ...rver/legacy_uptime/lib/alerts/tls.test.ts
@@ -6,10 +6,10 @@
  */
 import moment from 'moment';
 import { tlsAlertFactory, getCertSummary } from './tls';
-import { TLS } from '../../../common/constants/alerts';
-import { CertResult } from '../../../common/runtime_types';
+import { TLS } from '../../../../common/constants/alerts';
+import { CertResult } from '../../../../common/runtime_types';
 import { createRuleTypeMocks, bootstrapDependencies } from './test_utils';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
 
 import { savedObjectsAdapter, UMSavedObjectsAdapter } from '../saved_objects/saved_objects';
 

diff --git a/...ugins/synthetics/server/lib/alerts/tls.ts → ...cs/server/legacy_uptime/lib/alerts/tls.ts b/...ugins/synthetics/server/lib/alerts/tls.ts → ...cs/server/legacy_uptime/lib/alerts/tls.ts
@@ -10,11 +10,11 @@ import { ALERT_REASON } from '@kbn/rule-data-utils';
 import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
 import { UptimeAlertTypeFactory } from './types';
 import { updateState, generateAlertMessage, setRecoveredAlertsContext } from './common';
-import { CLIENT_ALERT_TYPES, TLS } from '../../../common/constants/alerts';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
-import { Cert, CertResult } from '../../../common/runtime_types';
+import { CLIENT_ALERT_TYPES, TLS } from '../../../../common/constants/alerts';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
+import { Cert, CertResult } from '../../../../common/runtime_types';
 import { commonStateTranslations, tlsTranslations } from './translations';
-import { TlsTranslations } from '../../../common/translations';
+import { TlsTranslations } from '../../../../common/translations';
 
 import { savedObjectsAdapter } from '../saved_objects/saved_objects';
 import { createUptimeESClient } from '../lib';

diff --git a/...tics/server/lib/alerts/tls_legacy.test.ts → ...gacy_uptime/lib/alerts/tls_legacy.test.ts b/...tics/server/lib/alerts/tls_legacy.test.ts → ...gacy_uptime/lib/alerts/tls_legacy.test.ts
@@ -7,7 +7,7 @@
 
 import moment from 'moment';
 import { getCertSummary } from './tls_legacy';
-import { Cert } from '../../../common/runtime_types';
+import { Cert } from '../../../../common/runtime_types';
 
 describe('tls alert', () => {
   describe('getCertSummary', () => {

diff --git a/...ynthetics/server/lib/alerts/tls_legacy.ts → ...er/legacy_uptime/lib/alerts/tls_legacy.ts b/...ynthetics/server/lib/alerts/tls_legacy.ts → ...er/legacy_uptime/lib/alerts/tls_legacy.ts
@@ -12,9 +12,9 @@ import { AlertInstanceContext } from '@kbn/alerting-plugin/common';
 import { Alert } from '@kbn/alerting-plugin/server';
 import { UptimeAlertTypeFactory } from './types';
 import { updateState } from './common';
-import { CLIENT_ALERT_TYPES, TLS_LEGACY } from '../../../common/constants/alerts';
-import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
-import { Cert, CertResult } from '../../../common/runtime_types';
+import { CLIENT_ALERT_TYPES, TLS_LEGACY } from '../../../../common/constants/alerts';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
+import { Cert, CertResult } from '../../../../common/runtime_types';
 import { commonStateTranslations, tlsTranslations } from './translations';
 
 import { savedObjectsAdapter } from '../saved_objects/saved_objects';
@@ -23,7 +23,7 @@ import {
   DEFAULT_FROM,
   DEFAULT_SIZE,
   DEFAULT_TO,
-} from '../../../common/requests/get_certs_request_body';
+} from '../../../../common/requests/get_certs_request_body';
 
 export type ActionGroupIds = ActionGroupIdsOf<typeof TLS_LEGACY>;
 

diff --git a/...thetics/server/lib/alerts/translations.ts → .../legacy_uptime/lib/alerts/translations.ts b/...thetics/server/lib/alerts/translations.ts → .../legacy_uptime/lib/alerts/translations.ts
diff --git a/...ins/synthetics/server/lib/alerts/types.ts → .../server/legacy_uptime/lib/alerts/types.ts b/...ins/synthetics/server/lib/alerts/types.ts → .../server/legacy_uptime/lib/alerts/types.ts
diff --git a/...omains/__snapshots__/license.test.ts.snap → ...omains/__snapshots__/license.test.ts.snap b/...omains/__snapshots__/license.test.ts.snap → ...omains/__snapshots__/license.test.ts.snap
diff --git a/...ns/synthetics/server/lib/domains/index.ts → ...server/legacy_uptime/lib/domains/index.ts b/...ns/synthetics/server/lib/domains/index.ts → ...server/legacy_uptime/lib/domains/index.ts
@@ -7,3 +7,4 @@
 
 export type { UMLicenseCheck } from './license';
 export { licenseCheck } from './license';
+export type { UMServerLibs } from '../../uptime_server';
diff --git a/...hetics/server/lib/domains/license.test.ts → ...legacy_uptime/lib/domains/license.test.ts b/...hetics/server/lib/domains/license.test.ts → ...legacy_uptime/lib/domains/license.test.ts
diff --git a/.../synthetics/server/lib/domains/license.ts → ...rver/legacy_uptime/lib/domains/license.ts b/.../synthetics/server/lib/domains/license.ts → ...rver/legacy_uptime/lib/domains/license.ts
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/...rver/lib/helper/get_filter_clause.test.ts → ...time/lib/helper/get_filter_clause.test.ts b/...rver/lib/helper/get_filter_clause.test.ts → ...time/lib/helper/get_filter_clause.test.ts
diff --git a/...cs/server/lib/helper/get_filter_clause.ts → ...cy_uptime/lib/helper/get_filter_clause.ts b/...cs/server/lib/helper/get_filter_clause.ts → ...cy_uptime/lib/helper/get_filter_clause.ts
diff --git a/...ins/synthetics/server/lib/helper/index.ts → .../server/legacy_uptime/lib/helper/index.ts b/...ins/synthetics/server/lib/helper/index.ts → .../server/legacy_uptime/lib/helper/index.ts
diff --git a/...erver/lib/helper/make_date_rate_filter.ts → ...ptime/lib/helper/make_date_rate_filter.ts b/...erver/lib/helper/make_date_rate_filter.ts → ...ptime/lib/helper/make_date_rate_filter.ts
diff --git a/...tics/server/lib/helper/object_to_array.ts → ...gacy_uptime/lib/helper/object_to_array.ts b/...tics/server/lib/helper/object_to_array.ts → ...gacy_uptime/lib/helper/object_to_array.ts
diff --git a/...er/lib/helper/parse_relative_date.test.ts → ...me/lib/helper/parse_relative_date.test.ts b/...er/lib/helper/parse_relative_date.test.ts → ...me/lib/helper/parse_relative_date.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Moment } from 'moment';
-import { parseRelativeDate } from '../../../common/lib/get_histogram_interval';
+import { parseRelativeDate } from '../../../../common/lib/get_histogram_interval';
 
 describe('Parsing a relative end date properly', () => {
   it('converts the upper range of relative end dates to now', async () => {