-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix-suppression-max-signals
- Loading branch information
Showing
34 changed files
with
258 additions
and
2,567 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
x-pack/plugins/synthetics/e2e/journeys/synthetics/management_list.journey.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * 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 { journey, step, expect, before, after } from '@elastic/synthetics'; | ||
| import { | ||
| addTestMonitor, | ||
| cleanTestMonitors, | ||
| enableMonitorManagedViaApi, | ||
| } from './services/add_monitor'; | ||
| import { syntheticsAppPageProvider } from '../../page_objects/synthetics_app'; | ||
|
|
||
| journey(`MonitorManagementList`, async ({ page, params }) => { | ||
| const syntheticsApp = syntheticsAppPageProvider({ page, kibanaUrl: params.kibanaUrl }); | ||
| const testMonitor1 = 'Test monitor 1'; | ||
| const testMonitor2 = 'Test monitor 2'; | ||
| const testMonitor3 = 'Test monitor 3'; | ||
|
|
||
| page.setDefaultTimeout(60 * 1000); | ||
|
|
||
| before(async () => { | ||
| await enableMonitorManagedViaApi(params.kibanaUrl); | ||
| await cleanTestMonitors(params); | ||
|
|
||
| await addTestMonitor(params.kibanaUrl, testMonitor1); | ||
| await addTestMonitor(params.kibanaUrl, testMonitor2); | ||
| await addTestMonitor(params.kibanaUrl, testMonitor3); | ||
| }); | ||
|
|
||
| after(async () => { | ||
| await cleanTestMonitors(params); | ||
| }); | ||
|
|
||
| step('Go to monitor-management', async () => { | ||
| await syntheticsApp.navigateToMonitorManagement(); | ||
| }); | ||
|
|
||
| step('login to Kibana', async () => { | ||
| await syntheticsApp.loginToKibana(); | ||
| const invalid = await page.locator(`text=Username or password is incorrect. Please try again.`); | ||
| expect(await invalid.isVisible()).toBeFalsy(); | ||
| }); | ||
|
|
||
| step('shows the count', async () => { | ||
| await page.locator('text=Monitors'); | ||
| await page.click('text=1-3'); | ||
| }); | ||
|
|
||
| step( | ||
| 'Click text=Showing 1-3 of 3 MonitorsSortingThis table contains 3 rows out of 3 rows; Page 1', | ||
| async () => { | ||
| await page.click( | ||
| 'text=Showing 1-3 of 3 MonitorsSortingThis table contains 3 rows out of 3 rows; Page 1' | ||
| ); | ||
| await page.click('[aria-label="expands filter group for Type filter"]'); | ||
| } | ||
| ); | ||
|
|
||
| step( | ||
| 'Click [aria-label="Use up and down arrows to move focus over options. Enter to select. Escape to collapse options."] >> text=browser', | ||
| async () => { | ||
| await page.click( | ||
| '[aria-label="Use up and down arrows to move focus over options. Enter to select. Escape to collapse options."] >> text=browser' | ||
| ); | ||
| await page.click('[aria-label="Apply the selected filters for Type"]'); | ||
| expect(page.url()).toBe( | ||
| 'http://localhost:5620/app/synthetics/monitors?monitorType=%5B%22browser%22%5D' | ||
| ); | ||
| await page.click('[placeholder="Search by name, url, host, tag, project or location"]'); | ||
| await Promise.all([ | ||
| page.waitForNavigation({ | ||
| url: 'http://localhost:5620/app/synthetics/monitors?monitorType=%5B%22browser%22%5D&query=3', | ||
| }), | ||
| page.fill('[placeholder="Search by name, url, host, tag, project or location"]', '3'), | ||
| ]); | ||
| await page.click('text=1-1'); | ||
| await page.click( | ||
| 'text=Showing 1-1 of 1 MonitorSortingThis table contains 1 rows out of 1 rows; Page 1 ' | ||
| ); | ||
| } | ||
| ); | ||
|
|
||
| step('when no results appears', async () => { | ||
| await page.click('[placeholder="Search by name, url, host, tag, project or location"]'); | ||
| await page.fill('[placeholder="Search by name, url, host, tag, project or location"]', '5553'); | ||
|
|
||
| await page.click('text=0-0'); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
...ugins/synthetics/public/legacy_uptime/components/fleet_package/deprecate_notice_modal.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * 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 React from 'react'; | ||
| import { EuiConfirmModal, EuiIcon, EuiLink } from '@elastic/eui'; | ||
| import { useKibana } from '@kbn/kibana-react-plugin/public'; | ||
| import { i18n } from '@kbn/i18n'; | ||
| import { FormattedMessage } from '@kbn/i18n-react'; | ||
|
|
||
| export const DeprecateNoticeModal = ({ onCancel }: { onCancel: () => void }) => { | ||
| const { application } = useKibana().services; | ||
|
|
||
| return ( | ||
| <EuiConfirmModal | ||
| title={ | ||
| <> | ||
| {HEADER_TEXT} <EuiIcon type="cheer" /> | ||
| </> | ||
| } | ||
| onCancel={onCancel} | ||
| onConfirm={() => { | ||
| application?.navigateToApp('uptime', { path: '/manage-monitors' }); | ||
| }} | ||
| confirmButtonText={GO_MONITOR_MANAGEMENT_TEXT} | ||
| cancelButtonText={GO_BACK_TEXT} | ||
| > | ||
| <p> | ||
| <FormattedMessage | ||
| id="xpack.synthetics.deprecateNoticeModal.description" | ||
| defaultMessage="The Elastic Synthetics integration is deprecated. Instead, you can now monitor endpoints, | ||
| pages, and user journeys directly from Uptime much more efficiently:" | ||
| /> | ||
| </p> | ||
| <p> | ||
| <li> | ||
| <FormattedMessage | ||
| id="xpack.synthetics.deprecateNoticeModal.addPrivateLocations" | ||
| defaultMessage="Add private locations against your fleet policies" | ||
| /> | ||
| </li> | ||
| <li> | ||
| <FormattedMessage | ||
| id="xpack.synthetics.deprecateNoticeModal.manageMonitors" | ||
| defaultMessage="Manage lightweight and browser monitors from a single place" | ||
| /> | ||
| </li> | ||
| <li> | ||
| <FormattedMessage | ||
| id="xpack.synthetics.deprecateNoticeModal.elasticManagedLocations" | ||
| defaultMessage="Run monitors in multiple locations managed by Elastic, or from your own private locations" | ||
| /> | ||
| </li> | ||
| <li> | ||
| <FormattedMessage | ||
| id="xpack.synthetics.deprecateNoticeModal.automateMonitors" | ||
| defaultMessage="Automate the creation of your monitors using project monitors" | ||
| /> | ||
| </li> | ||
| </p> | ||
| <p> | ||
| <FormattedMessage | ||
| id="xpack.synthetics.deprecateNoticeModal.forMoreInformation" | ||
| defaultMessage="For more information, {docsLink}" | ||
| values={{ | ||
| docsLink: ( | ||
| <EuiLink | ||
| target="_blank" | ||
| href="https://www.elastic.co/guide/en/observability/current/monitor-uptime-synthetics.html" | ||
| > | ||
| {READ_DOCS_TEXT} | ||
| </EuiLink> | ||
| ), | ||
| }} | ||
| /> | ||
| </p> | ||
| </EuiConfirmModal> | ||
| ); | ||
| }; | ||
|
|
||
| const HEADER_TEXT = i18n.translate('xpack.synthetics.deprecateNoticeModal.headerText', { | ||
| defaultMessage: 'Synthetic Monitoring is now available out of the box in Uptime', | ||
| }); | ||
|
|
||
| const GO_BACK_TEXT = i18n.translate('xpack.synthetics.deprecateNoticeModal.goBack', { | ||
| defaultMessage: 'Go back', | ||
| }); | ||
|
|
||
| const READ_DOCS_TEXT = i18n.translate('xpack.synthetics.deprecateNoticeModal.readDocs', { | ||
| defaultMessage: 'read docs.', | ||
| }); | ||
|
|
||
| const GO_MONITOR_MANAGEMENT_TEXT = i18n.translate( | ||
| 'xpack.synthetics.deprecateNoticeModal.goToMonitorManagement', | ||
| { | ||
| defaultMessage: 'Go to Monitor Management', | ||
| } | ||
| ); |
Oops, something went wrong.