[Synthetics] Add push monitor api

x-pack/plugins/synthetics/common/constants/monitor_defaults.ts

@@ -18,6 +18,7 @@ import {
   ResponseBodyIndexPolicy,
   ScheduleUnit,
   ScreenshotOption,
+  SourceType,
   TCPAdvancedFields,
   TCPSimpleFields,
   TLSFields,
@@ -41,6 +42,7 @@ export const DEFAULT_COMMON_FIELDS: CommonFields = {
   [ConfigKey.NAME]: '',
   [ConfigKey.LOCATIONS]: [],
   [ConfigKey.NAMESPACE]: DEFAULT_NAMESPACE_STRING,
+  [ConfigKey.MONITOR_SOURCE_TYPE]: SourceType.UI,
 };
 
 export const DEFAULT_BROWSER_ADVANCED_FIELDS: BrowserAdvancedFields = {
@@ -58,10 +60,9 @@ export const DEFAULT_BROWSER_ADVANCED_FIELDS: BrowserAdvancedFields = {
 
 export const DEFAULT_BROWSER_SIMPLE_FIELDS: BrowserSimpleFields = {
   ...DEFAULT_COMMON_FIELDS,
-  [ConfigKey.SCHEDULE]: {
-    unit: ScheduleUnit.MINUTES,
-    number: '10',
-  },
+  [ConfigKey.JOURNEY_ID]: '',
+  [ConfigKey.PROJECT_ID]: '',
+  [ConfigKey.PLAYWRIGHT_OPTIONS]: '',
   [ConfigKey.METADATA]: {
     script_source: {
       is_generated_script: false,
@@ -70,21 +71,26 @@ export const DEFAULT_BROWSER_SIMPLE_FIELDS: BrowserSimpleFields = {
     is_zip_url_tls_enabled: false,
   },
   [ConfigKey.MONITOR_TYPE]: DataStream.BROWSER,
+  [ConfigKey.PARAMS]: '',
+  [ConfigKey.PORT]: undefined,
+  [ConfigKey.SCHEDULE]: {
+    unit: ScheduleUnit.MINUTES,
+    number: '10',
+  },
   [ConfigKey.SOURCE_INLINE]: '',
+  [ConfigKey.SOURCE_PROJECT_CONTENT]: '',
   [ConfigKey.SOURCE_ZIP_URL]: '',
   [ConfigKey.SOURCE_ZIP_USERNAME]: '',
   [ConfigKey.SOURCE_ZIP_PASSWORD]: '',
   [ConfigKey.SOURCE_ZIP_FOLDER]: '',
   [ConfigKey.SOURCE_ZIP_PROXY_URL]: '',
-  [ConfigKey.PARAMS]: '',
   [ConfigKey.ZIP_URL_TLS_CERTIFICATE_AUTHORITIES]: undefined,
   [ConfigKey.ZIP_URL_TLS_CERTIFICATE]: undefined,
   [ConfigKey.ZIP_URL_TLS_KEY]: undefined,
   [ConfigKey.ZIP_URL_TLS_KEY_PASSPHRASE]: undefined,
   [ConfigKey.ZIP_URL_TLS_VERIFICATION_MODE]: undefined,
   [ConfigKey.ZIP_URL_TLS_VERSION]: undefined,
-  [ConfigKey.URLS]: undefined,
-  [ConfigKey.PORT]: undefined,
+  [ConfigKey.URLS]: '',
 };
 
 export const DEFAULT_HTTP_SIMPLE_FIELDS: HTTPSimpleFields = {

x-pack/plugins/synthetics/common/constants/monitor_management.ts

@@ -8,11 +8,14 @@
 // values must match keys in the integration package
 export enum ConfigKey {
   APM_SERVICE_NAME = 'service.name',
+  CUSTOM_HEARTBEAT_ID = 'custom_heartbeat_id',
   ENABLED = 'enabled',
   HOSTS = 'hosts',
   IGNORE_HTTPS_ERRORS = 'ignore_https_errors',
+  MONITOR_SOURCE_TYPE = 'monitor.origin',
   JOURNEY_FILTERS_MATCH = 'filter_journeys.match',
   JOURNEY_FILTERS_TAGS = 'filter_journeys.tags',
+  JOURNEY_ID = 'journey_id',
   MAX_REDIRECTS = 'max_redirects',
   METADATA = '__ui',
   MONITOR_TYPE = 'type',
@@ -21,6 +24,9 @@ export enum ConfigKey {
   LOCATIONS = 'locations',
   PARAMS = 'params',
   PASSWORD = 'password',
+  PLAYWRIGHT_OPTIONS = 'playwright_options',
+  ORIGINAL_SPACE = 'original_space', // the original space the montior was saved in. Used by push monitors to ensure uniqueness of monitor id sent to heartbeat and prevent data collisions
+  PORT = 'url.port',
   PROXY_URL = 'proxy_url',
   PROXY_USE_LOCAL_RESOLVER = 'proxy_use_local_resolver',
   RESPONSE_BODY_CHECK_NEGATIVE = 'check.response.body.negative',
@@ -37,12 +43,14 @@ export enum ConfigKey {
   REVISION = 'revision',
   SCHEDULE = 'schedule',
   SCREENSHOTS = 'screenshots',
+  SOURCE_PROJECT_CONTENT = 'source.project.content',
   SOURCE_INLINE = 'source.inline.script',
   SOURCE_ZIP_URL = 'source.zip_url.url',
   SOURCE_ZIP_USERNAME = 'source.zip_url.username',
   SOURCE_ZIP_PASSWORD = 'source.zip_url.password',
   SOURCE_ZIP_FOLDER = 'source.zip_url.folder',
   SOURCE_ZIP_PROXY_URL = 'source.zip_url.proxy_url',
+  PROJECT_ID = 'project_id',
   SYNTHETICS_ARGS = 'synthetics_args',
   TLS_CERTIFICATE_AUTHORITIES = 'ssl.certificate_authorities',
   TLS_CERTIFICATE = 'ssl.certificate',
@@ -58,7 +66,6 @@ export enum ConfigKey {
   UPLOAD_SPEED = 'throttling.upload_speed',
   LATENCY = 'throttling.latency',
   URLS = 'urls',
-  PORT = 'url.port',
   USERNAME = 'username',
   WAIT = 'wait',
   ZIP_URL_TLS_CERTIFICATE_AUTHORITIES = 'source.zip_url.ssl.certificate_authorities',
@@ -80,6 +87,7 @@ export const secretKeys = [
   ConfigKey.RESPONSE_HEADERS_CHECK,
   ConfigKey.RESPONSE_RECEIVE_CHECK,
   ConfigKey.SOURCE_INLINE,
+  ConfigKey.SOURCE_PROJECT_CONTENT,
   ConfigKey.SOURCE_ZIP_USERNAME,
   ConfigKey.SOURCE_ZIP_PASSWORD,
   ConfigKey.SYNTHETICS_ARGS,

x-pack/plugins/synthetics/common/constants/rest_api.ts

@@ -44,4 +44,7 @@ export enum API_URLS {
   RUN_ONCE_MONITOR = '/internal/uptime/service/monitors/run_once',
   TRIGGER_MONITOR = '/internal/uptime/service/monitors/trigger',
   SERVICE_ALLOWED = '/internal/uptime/service/allowed',
+
+  // Project monitor public endpoint
+  SYNTHETICS_MONITORS_PROJECT = '/api/synthetics/service/project/monitors',
 }

x-pack/plugins/synthetics/common/runtime_types/monitor_management/index.ts

@@ -10,4 +10,5 @@ export * from './config_key';
 export * from './monitor_configs';
 export * from './monitor_meta_data';
 export * from './monitor_types';
+export * from './monitor_types_project';
 export * from './locations';

x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_configs.ts

@@ -119,3 +119,10 @@ export enum ThrottlingSuffix {
 
 export const ThrottlingSuffixCodec = tEnum<ThrottlingSuffix>('ThrottlingSuffix', ThrottlingSuffix);
 export type ThrottlingSuffixType = t.TypeOf<typeof ThrottlingSuffixCodec>;
+
+export enum SourceType {
+  UI = 'ui',
+  PROJECT = 'project',
+}
+
+export const SourceTypeCodec = tEnum<SourceType>('SourceType', SourceType);

x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts

@@ -15,6 +15,7 @@ import {
   ModeCodec,
   ResponseBodyIndexPolicyCodec,
   ScheduleUnitCodec,
+  SourceTypeCodec,
   TLSVersionCodec,
   VerificationModeCodec,
 } from './monitor_configs';
@@ -76,6 +77,7 @@ export const CommonFieldsCodec = t.intersection([
   t.partial({
     [ConfigKey.TIMEOUT]: t.union([t.string, t.null]),
     [ConfigKey.REVISION]: t.number,
+    [ConfigKey.MONITOR_SOURCE_TYPE]: SourceTypeCodec,
   }),
 ]);
 
@@ -200,12 +202,21 @@ export const ThrottlingConfigKeyCodec = t.union([
 export type ThrottlingConfigKey = t.TypeOf<typeof ThrottlingConfigKeyCodec>;
 
 export const EncryptedBrowserSimpleFieldsCodec = t.intersection([
-  t.interface({
-    [ConfigKey.METADATA]: MetadataCodec,
-    [ConfigKey.SOURCE_ZIP_URL]: t.string,
-    [ConfigKey.SOURCE_ZIP_FOLDER]: t.string,
-    [ConfigKey.SOURCE_ZIP_PROXY_URL]: t.string,
-  }),
+  t.intersection([
+    t.interface({
+      [ConfigKey.METADATA]: MetadataCodec,
+      [ConfigKey.SOURCE_ZIP_URL]: t.string,
+      [ConfigKey.SOURCE_ZIP_FOLDER]: t.string,
+      [ConfigKey.SOURCE_ZIP_PROXY_URL]: t.string,
+    }),
+    t.partial({
+      [ConfigKey.PLAYWRIGHT_OPTIONS]: t.string,
+      [ConfigKey.JOURNEY_ID]: t.string,
+      [ConfigKey.PROJECT_ID]: t.string,
+      [ConfigKey.ORIGINAL_SPACE]: t.string,
+      [ConfigKey.CUSTOM_HEARTBEAT_ID]: t.string,
+    }),
+  ]),
   ZipUrlTLSFieldsCodec,
   ZipUrlTLSSensitiveFieldsCodec,
   CommonFieldsCodec,
@@ -214,6 +225,7 @@ export const EncryptedBrowserSimpleFieldsCodec = t.intersection([
 export const BrowserSensitiveSimpleFieldsCodec = t.intersection([
   t.interface({
     [ConfigKey.SOURCE_INLINE]: t.string,
+    [ConfigKey.SOURCE_PROJECT_CONTENT]: t.string,
     [ConfigKey.SOURCE_ZIP_USERNAME]: t.string,
     [ConfigKey.SOURCE_ZIP_PASSWORD]: t.string,
     [ConfigKey.PARAMS]: t.string,

x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types_project.ts

@@ -0,0 +1,50 @@
+/*
+ * 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 * as t from 'io-ts';
+import { ScreenshotOptionCodec } from './monitor_configs';
+
+export const ProjectMonitorThrottlingConfigCodec = t.interface({
+  download: t.number,
+  upload: t.number,
+  latency: t.number,
+});
+
+export const ProjectBrowserMonitorCodec = t.intersection([
+  t.interface({
+    id: t.string,
+    name: t.string,
+    schedule: t.number,
+    content: t.string,
+    locations: t.array(t.string),
+  }),
+  t.partial({
+    throttling: ProjectMonitorThrottlingConfigCodec,
+    screenshot: ScreenshotOptionCodec,
+    tags: t.array(t.string),
+    ignoreHTTPSErrors: t.boolean,
+    apmServiceName: t.string,
+    playwrightOptions: t.record(t.string, t.unknown),
+    filter: t.interface({
+      match: t.string,
+    }),
+    params: t.record(t.string, t.unknown),
+    enabled: t.boolean,
+  }),
+]);
+
+export const ProjectMonitorsRequestCodec = t.interface({
+  project: t.string,
+  keep_stale: t.boolean,
+  monitors: t.array(ProjectBrowserMonitorCodec),
+});
+
+export type ProjectMonitorThrottlingConfig = t.TypeOf<typeof ProjectMonitorThrottlingConfigCodec>;
+
+export type ProjectBrowserMonitor = t.TypeOf<typeof ProjectBrowserMonitorCodec>;
+
+export type ProjectMonitorsRequest = t.TypeOf<typeof ProjectMonitorsRequestCodec>;

x-pack/plugins/synthetics/kibana.json

@@ -20,7 +20,8 @@
     "taskManager",
     "triggersActionsUi",
     "usageCollection",
-    "unifiedSearch"
+    "unifiedSearch",
+    "spaces"
   ],
   "server": true,
   "ui": true,

x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/browser/formatters.ts

@@ -45,6 +45,7 @@ export const browserFormatters: BrowserFormatMap = {
   [ConfigKey.SOURCE_ZIP_PASSWORD]: null,
   [ConfigKey.SOURCE_ZIP_FOLDER]: null,
   [ConfigKey.SOURCE_ZIP_PROXY_URL]: null,
+  [ConfigKey.SOURCE_PROJECT_CONTENT]: null,
   [ConfigKey.SOURCE_INLINE]: (fields) => stringToJsonFormatter(fields[ConfigKey.SOURCE_INLINE]),
   [ConfigKey.PARAMS]: null,
   [ConfigKey.SCREENSHOTS]: null,
@@ -71,5 +72,10 @@ export const browserFormatters: BrowserFormatMap = {
     arrayToJsonFormatter(fields[ConfigKey.JOURNEY_FILTERS_TAGS]),
   [ConfigKey.THROTTLING_CONFIG]: throttlingFormatter,
   [ConfigKey.IGNORE_HTTPS_ERRORS]: null,
+  [ConfigKey.JOURNEY_ID]: null,
+  [ConfigKey.PROJECT_ID]: null,
+  [ConfigKey.PLAYWRIGHT_OPTIONS]: null,
+  [ConfigKey.CUSTOM_HEARTBEAT_ID]: null,
+  [ConfigKey.ORIGINAL_SPACE]: null,
   ...commonFormatters,
 };

x-pack/plugins/synthetics/public/legacy_uptime/components/fleet_package/browser/normalizers.ts

@@ -73,6 +73,7 @@ export const browserNormalizers: BrowserNormalizerMap = {
   [ConfigKey.SOURCE_ZIP_USERNAME]: getBrowserNormalizer(ConfigKey.SOURCE_ZIP_USERNAME),
   [ConfigKey.SOURCE_ZIP_PASSWORD]: getBrowserNormalizer(ConfigKey.SOURCE_ZIP_PASSWORD),
   [ConfigKey.SOURCE_ZIP_FOLDER]: getBrowserNormalizer(ConfigKey.SOURCE_ZIP_FOLDER),
+  [ConfigKey.SOURCE_PROJECT_CONTENT]: getBrowserNormalizer(ConfigKey.SOURCE_PROJECT_CONTENT),
   [ConfigKey.SOURCE_INLINE]: getBrowserJsonToJavascriptNormalizer(ConfigKey.SOURCE_INLINE),
   [ConfigKey.SOURCE_ZIP_PROXY_URL]: getBrowserNormalizer(ConfigKey.SOURCE_ZIP_PROXY_URL),
   [ConfigKey.PARAMS]: getBrowserNormalizer(ConfigKey.PARAMS),
@@ -106,5 +107,10 @@ export const browserNormalizers: BrowserNormalizerMap = {
     ConfigKey.JOURNEY_FILTERS_TAGS
   ),
   [ConfigKey.IGNORE_HTTPS_ERRORS]: getBrowserNormalizer(ConfigKey.IGNORE_HTTPS_ERRORS),
+  [ConfigKey.JOURNEY_ID]: getBrowserNormalizer(ConfigKey.JOURNEY_ID),
+  [ConfigKey.PROJECT_ID]: getBrowserNormalizer(ConfigKey.PROJECT_ID),
+  [ConfigKey.PLAYWRIGHT_OPTIONS]: getBrowserNormalizer(ConfigKey.PLAYWRIGHT_OPTIONS),
+  [ConfigKey.CUSTOM_HEARTBEAT_ID]: getBrowserNormalizer(ConfigKey.CUSTOM_HEARTBEAT_ID),
+  [ConfigKey.ORIGINAL_SPACE]: getBrowserNormalizer(ConfigKey.ORIGINAL_SPACE),
   ...commonNormalizers,
 };