elastic · shahzad31 · Jun 7, 2023 · Jun 7, 2023 · Jun 7, 2023 · Jun 7, 2023
@@ -57,7 +57,8 @@ disabled:
 
   # Elastic Synthetics configs
   - x-pack/plugins/synthetics/e2e/config.ts
-  - x-pack/plugins/synthetics/e2e/synthetics_run.ts
+  - x-pack/plugins/synthetics/e2e/uptime/synthetics_run.ts
+  - x-pack/plugins/synthetics/e2e/synthetics/synthetics_run.ts
   - x-pack/plugins/ux/e2e/synthetics_run.ts
   - x-pack/plugins/exploratory_view/e2e/synthetics_run.ts
 

@@ -4,7 +4,7 @@ steps:
     agents:
       queue: n2-4-spot
     depends_on: build
-    timeout_in_minutes: 120
+    timeout_in_minutes: 60
     artifact_paths:
       - 'x-pack/plugins/exploratory_view/e2e/.journeys/**/*'
     retry:

@@ -4,9 +4,9 @@ steps:
     agents:
       queue: n2-4-spot
     depends_on: build
-    timeout_in_minutes: 120
+    timeout_in_minutes: 60
     artifact_paths:
-      - 'x-pack/plugins/synthetics/e2e/.journeys/**/*'
+      - 'x-pack/plugins/synthetics/e2e/synthetics/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

@@ -0,0 +1,15 @@
+steps:
+  - command: .buildkite/scripts/steps/functional/uptime_plugin.sh
+    label: 'Uptime @elastic/synthetics Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 60
+    artifact_paths:
+      - 'x-pack/plugins/synthetics/e2e/uptime/.journeys/**/*'
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '*'
+          limit: 1
@@ -4,7 +4,7 @@ steps:
     agents:
       queue: n2-4-spot
     depends_on: build
-    timeout_in_minutes: 120
+    timeout_in_minutes: 60
     artifact_paths:
       - 'x-pack/plugins/ux/e2e/.journeys/**/*'
     retry:

@@ -152,6 +152,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
       ])
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml'));
+      pipeline.push(getPipeline('.buildkite/pipelines/pull_request/uptime_plugin.yml'));
     }
 
     if (await doAnyChangesMatch([/^x-pack\/plugins\/ux/, /^x-pack\/plugins\/exploratory_view/])) {

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common/util.sh
+
+.buildkite/scripts/bootstrap.sh
+.buildkite/scripts/download_build_artifacts.sh
+
+export JOB=kibana-uptime-plugin
+
+echo "--- Uptime plugin @elastic/synthetics Tests"
+
+cd "$XPACK_DIR"
+
+node plugins/synthetics/scripts/uptime_e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
@@ -19,9 +19,6 @@ export const TS_PROJECTS = TsProject.loadAll({
     // type check is explicitly disabled in this project for now
     '.buildkite/tsconfig.json',
 
-    'x-pack/plugins/synthetics/e2e/tsconfig.json',
-    'x-pack/plugins/ux/e2e/tsconfig.json',
-    'x-pack/plugins/exploratory_view/e2e/tsconfig.json',
     'x-pack/plugins/threat_intelligence/cypress/tsconfig.json',
   ],
 });
diff --git a/x-pack/plugins/exploratory_view/e2e/tsconfig.json b/x-pack/plugins/exploratory_view/e2e/tsconfig.json
@@ -6,4 +6,9 @@
     "outDir": "target/types",
     "types": [ "node"],
   },
+  "kbn_references": [
+    "@kbn/test",
+    "@kbn/apm-plugin",
+    "@kbn/es-archiver",
+  ],
 }
diff --git a/...gins/exploratory_view/public/components/shared/exploratory_view/obsv_exploratory_view.tsx b/...gins/exploratory_view/public/components/shared/exploratory_view/obsv_exploratory_view.tsx
@@ -46,6 +46,10 @@ export const dataTypes: Array<{ id: AppDataType; label: string }> = [
     id: DataTypes.SYNTHETICS,
     label: DataTypesLabels[DataTypes.SYNTHETICS],
   },
+  {
+    id: DataTypes.UPTIME,
+    label: DataTypesLabels[DataTypes.UPTIME],
+  },
   {
     id: DataTypes.UX,
     label: DataTypesLabels[DataTypes.UX],

diff --git a/x-pack/plugins/synthetics/e2e/README.md b/x-pack/plugins/synthetics/e2e/README.md
@@ -10,6 +10,23 @@ with an example run command when it finishes.
 
 ### Run the tests
 
-From this directory, `~/x-pack/plugins/synthetics/e2e`, you can now run `node ../../../../scripts/functional_test_runner --config synthetics_run.ts`.
+From the same directory you can now run `node node e2e.js --runner`.
+
+In addition to the usual flags like `--grep`, you can also specify `--no-headless` in order to view your tests as you debug/develop.
+
+
+## Uptime App Tests
+
+These tests rely on the Kibana functional test runner. There is a Kibana config in this directory, and a dedicated
+script for standing up the test server.
+
+### Start the server
+
+From `~/x-pack/plugins/synthetics/scripts`, run `node uptime_e2e.js --server`. Wait for the server to startup. It will provide you
+with an example run command when it finishes.
+
+### Run the tests
+
+From the same directory you can now run `node node uptime_e2e.js --runner`.
 
 In addition to the usual flags like `--grep`, you can also specify `--no-headless` in order to view your tests as you debug/develop.
diff --git a/x-pack/plugins/synthetics/e2e/config.ts b/x-pack/plugins/synthetics/e2e/config.ts
@@ -7,14 +7,11 @@
 
 import { FtrConfigProviderContext } from '@kbn/test';
 import { CA_CERT_PATH } from '@kbn/dev-utils';
-import { argv } from './helpers/parse_args_params';
 import { readKibanaConfig } from './tasks/read_kibana_config';
 const MANIFEST_KEY = 'xpack.uptime.service.manifestUrl';
 const SERVICE_PASSWORD = 'xpack.uptime.service.password';
 const SERVICE_USERNAME = 'xpack.uptime.service.username';
 
-const { watch } = argv;
-
 async function config({ readConfigFile }: FtrConfigProviderContext) {
   const kibanaCommonTestsConfig = await readConfigFile(
     require.resolve('../../../../test/common/config.js')
@@ -44,7 +41,7 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
 
     kbnTestServer: {
       ...xpackFunctionalTestsConfig.get('kbnTestServer'),
-      sourceArgs: watch
+      sourceArgs: process.env.WATCH_ENABLED
         ? []
         : [...xpackFunctionalTestsConfig.get('kbnTestServer.sourceArgs'), '--no-watch'],
       serverArgs: [
@@ -54,7 +51,7 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
         '--csp.warnLegacyBrowsers=false',
         // define custom kibana server args here
         `--elasticsearch.ssl.certificateAuthorities=${CA_CERT_PATH}`,
-        `--elasticsearch.ignoreVersionMismatch=${process.env.CI ? 'false' : 'true'}`,
+        // `--elasticsearch.ignoreVersionMismatch=${process.env.CI ? 'false' : 'true'}`,
         `--elasticsearch.username=kibana_system`,
         `--elasticsearch.password=changeme`,
         '--xpack.reporting.enabled=false',

diff --git a/x-pack/plugins/synthetics/e2e/helpers/parse_args_params.ts b/x-pack/plugins/synthetics/e2e/helpers/parse_args_params.ts
@@ -18,11 +18,6 @@ const { argv } = yargs(process.argv.slice(2))
     type: 'boolean',
     description: 'Pause on error',
   })
-  .option('watch', {
-    default: false,
-    type: 'boolean',
-    description: 'Runs the server in watch mode, restarting on changes',
-  })
   .option('grep', {
     default: undefined,
     type: 'string',

diff --git a/...ourneys/synthetics/add_monitor.journey.ts → ...ynthetics/journeys/add_monitor.journey.ts b/...ourneys/synthetics/add_monitor.journey.ts → ...ynthetics/journeys/add_monitor.journey.ts
@@ -8,7 +8,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { journey, step, expect, Page } from '@elastic/synthetics';
 import { recordVideo } from '../../helpers/record_video';
 import { FormMonitorType } from '../../../common/runtime_types';
-import { syntheticsAppPageProvider } from '../../page_objects/synthetics/synthetics_app';
+import { syntheticsAppPageProvider } from '../page_objects/synthetics_app';
 
 const customLocation = process.env.SYNTHETICS_TEST_LOCATION;
 

diff --git a/...ert_rules/default_status_alert.journey.ts → ...ert_rules/default_status_alert.journey.ts b/...ert_rules/default_status_alert.journey.ts → ...ert_rules/default_status_alert.journey.ts
@@ -11,7 +11,7 @@ import { RetryService } from '@kbn/ftr-common-functional-services';
 import { v4 as uuidv4 } from 'uuid';
 import { recordVideo } from '../../../helpers/record_video';
 import { getReasonMessage } from '../../../../server/legacy_uptime/lib/alerts/status_check';
-import { syntheticsAppPageProvider } from '../../../page_objects/synthetics/synthetics_app';
+import { syntheticsAppPageProvider } from '../../page_objects/synthetics_app';
 import { SyntheticsServices } from '../services/synthetics_services';
 
 journey(`DefaultStatusAlert`, async ({ page, params }) => {

diff --git a/...cs/alert_rules/sample_docs/sample_docs.ts → ...ys/alert_rules/sample_docs/sample_docs.ts b/...cs/alert_rules/sample_docs/sample_docs.ts → ...ys/alert_rules/sample_docs/sample_docs.ts
@@ -258,159 +258,3 @@ export const firstDownHit = ({
     dataset: 'http',
   },
 });
-
-const sampleHits = {
-  took: 1,
-  timed_out: false,
-  _shards: {
-    total: 1,
-    successful: 1,
-    skipped: 0,
-    failed: 0,
-  },
-  hits: {
-    total: {
-      value: 3,
-      relation: 'eq',
-    },
-    max_score: null,
-    hits: [
-      firstUpHit,
-      {
-        _index: '.ds-synthetics-http-default-2022.12.18-000001',
-        _id: 'TfCjJIUB1hhCUz-n3bWY',
-        _score: null,
-        _ignored: ['http.response.body.content'],
-        _source: firstDownHit,
-        sort: [1671356989976],
-      },
-      {
-        _index: '.ds-synthetics-http-default-2022.12.18-000001',
-        _id: 'fPCiJIUB1hhCUz-nVbMK',
-        _score: null,
-        _source: {
-          summary: {
-            up: 1,
-            down: 0,
-          },
-          tcp: {
-            rtt: {
-              connect: {
-                us: 26843,
-              },
-            },
-          },
-          agent: {
-            name: 'docker-fleet-server',
-            id: 'dd39a87d-a1e5-45a1-8dd9-e78d6a1391c6',
-            ephemeral_id: '264bb432-93f6-4aa6-a14d-266c53b9e7c7',
-            type: 'heartbeat',
-            version: '8.7.0',
-          },
-          resolve: {
-            rtt: {
-              us: 18153,
-            },
-            ip: '142.250.181.196',
-          },
-          elastic_agent: {
-            id: 'dd39a87d-a1e5-45a1-8dd9-e78d6a1391c6',
-            version: '8.7.0',
-            snapshot: true,
-          },
-          monitor: {
-            duration: {
-              us: 179022,
-            },
-            ip: '142.250.181.196',
-            origin: 'ui',
-            name: 'Test Monitor',
-            id: 'b9d9e146-746f-427f-bbf5-6e786b5b4e73',
-            timespan: {
-              lt: '2022-12-18T09:51:09.403Z',
-              gte: '2022-12-18T09:48:09.403Z',
-            },
-            check_group: '144186b2-7eb9-11ed-8949-0242ac120006',
-            fleet_managed: true,
-            type: 'http',
-            status: 'up',
-          },
-          url: {
-            scheme: 'https',
-            port: 443,
-            domain: 'www.google.com',
-            full: 'https://www.google.com',
-          },
-          observer: {
-            geo: {
-              name: 'Test private location',
-            },
-            name: 'Test private location',
-          },
-          '@timestamp': '2022-12-18T09:48:09.224Z',
-          ecs: {
-            version: '8.0.0',
-          },
-          config_id: 'b9d9e146-746f-427f-bbf5-6e786b5b4e73',
-          data_stream: {
-            namespace: 'default',
-            type: 'synthetics',
-            dataset: 'http',
-          },
-          tls: {
-            cipher: 'TLS-AES-128-GCM-SHA256',
-            certificate_not_valid_before: '2022-11-28T08:19:01.000Z',
-            established: true,
-            server: {
-              x509: {
-                not_after: '2023-02-20T08:19:00.000Z',
-                subject: {
-                  distinguished_name: 'CN=www.google.com',
-                  common_name: 'www.google.com',
-                },
-                not_before: '2022-11-28T08:19:01.000Z',
-                public_key_curve: 'P-256',
-                public_key_algorithm: 'ECDSA',
-                signature_algorithm: 'SHA256-RSA',
-                serial_number: '173037077033925240295268439311466214245',
-                issuer: {
-                  distinguished_name: 'CN=GTS CA 1C3,O=Google Trust Services LLC,C=US',
-                  common_name: 'GTS CA 1C3',
-                },
-              },
-              hash: {
-                sha1: 'ea1b44061b864526c45619230b3299117d11bf4e',
-                sha256: 'a5686448de09cc82b9cdad1e96357f919552ab14244da7948dd412ec0fc37d2b',
-              },
-            },
-            rtt: {
-              handshake: {
-                us: 34230,
-              },
-            },
-            version: '1.3',
-            certificate_not_valid_after: '2023-02-20T08:19:00.000Z',
-            version_protocol: 'tls',
-          },
-          state: {
-            duration_ms: 0,
-            checks: 1,
-            ends: null,
-            started_at: '2022-12-18T09:48:15.335017193Z',
-            id: 'Test private location-18524a25067-0',
-            up: 1,
-            down: 0,
-            flap_history: [],
-            status: 'up',
-          },
-          event: {
-            agent_id_status: 'verified',
-            ingested: '2022-12-18T09:48:16Z',
-            dataset: 'http',
-          },
-        },
-        sort: [1671356889224],
-      },
-    ],
-  },
-};
diff --git a/...ys/synthetics/alerting_default.journey.ts → ...tics/journeys/alerting_default.journey.ts b/...ys/synthetics/alerting_default.journey.ts → ...tics/journeys/alerting_default.journey.ts
@@ -6,9 +6,9 @@
  */
 
 import { journey, step, expect, before, after } from '@elastic/synthetics';
-import { byTestId } from '../../helpers/utils';
 import { recordVideo } from '../../helpers/record_video';
-import { syntheticsAppPageProvider } from '../../page_objects/synthetics/synthetics_app';
+import { byTestId } from '../../helpers/utils';
+import { syntheticsAppPageProvider } from '../page_objects/synthetics_app';
 import { cleanSettings } from './services/settings';
 
 journey('AlertingDefaults', async ({ page, params }) => {

diff --git a/...neys/synthetics/data_retention.journey.ts → ...hetics/journeys/data_retention.journey.ts b/...neys/synthetics/data_retention.journey.ts → ...hetics/journeys/data_retention.journey.ts
@@ -7,9 +7,9 @@
 
 import { journey, step, expect, Page } from '@elastic/synthetics';
 import { RetryService } from '@kbn/ftr-common-functional-services';
-import { byTestId, assertText } from '../../helpers/utils';
 import { recordVideo } from '../../helpers/record_video';
-import { syntheticsAppPageProvider } from '../../page_objects/synthetics/synthetics_app';
+import { syntheticsAppPageProvider } from '../page_objects/synthetics_app';
+import { byTestId, assertText } from '../../helpers/utils';
 
 let page1: Page;
 journey(`DataRetentionPage`, async ({ page, params }) => {

diff --git a/.../e2e/journeys/synthetics/detail_flyout.ts → .../e2e/synthetics/journeys/detail_flyout.ts b/.../e2e/journeys/synthetics/detail_flyout.ts → .../e2e/synthetics/journeys/detail_flyout.ts
@@ -7,7 +7,7 @@
 
 import { expect, journey, step } from '@elastic/synthetics';
 import { recordVideo } from '../../helpers/record_video';
-import { syntheticsAppPageProvider } from '../../page_objects/synthetics/synthetics_app';
+import { syntheticsAppPageProvider } from '../page_objects/synthetics_app';
 
 journey('TestMonitorDetailFlyout', async ({ page, params }) => {
   recordVideo(page);
-Original file line number
+Diff line change
@@ Expand Up @@
           ])
         ) {
           pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml'));
+          pipeline.push(getPipeline('.buildkite/pipelines/pull_request/uptime_plugin.yml'));
         }
         if (await doAnyChangesMatch([/^x-pack\/plugins\/ux/, /^x-pack\/plugins\/exploratory_view/])) {
@@ Expand Down @@