[Synthetics UI] Correct link in the integration deprecation callout (#…

…150879) Closes #150872
elastic · Feb 21, 2023 · f1fa5d7 · f1fa5d7
1 parent 17ab3a3
commit f1fa5d7
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 19 deletions.
diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -473,6 +473,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       createAlerts: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/create-alerts.html`,
       syntheticsCommandReference: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/synthetics-configuration.html#synthetics-configuration-playwright-options`,
       syntheticsProjectMonitors: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/synthetic-run-tests.html#synthetic-monitor-choose-project`,
+      syntheticsMigrateFromIntegration: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/synthetics-migrate-from-integration.html`,
     },
     alerting: {
       guide: `${KIBANA_DOCS}create-and-manage-rules.html`,

diff --git a/packages/kbn-doc-links/src/types.ts b/packages/kbn-doc-links/src/types.ts
@@ -355,6 +355,7 @@ export interface DocLinks {
     createAlerts: string;
     syntheticsCommandReference: string;
     syntheticsProjectMonitors: string;
+    syntheticsMigrateFromIntegration: string;
   }>;
   readonly alerting: Readonly<{
     guide: string;

diff --git a/.../plugins/synthetics/e2e/journeys/uptime/private_locations/add_monitor_private_location.ts b/.../plugins/synthetics/e2e/journeys/uptime/private_locations/add_monitor_private_location.ts
@@ -7,15 +7,34 @@
 import { journey, step, expect, before } from '@elastic/synthetics';
 import { assertText, byTestId, TIMEOUT_60_SEC } from '@kbn/observability-plugin/e2e/utils';
 import { recordVideo } from '@kbn/observability-plugin/e2e/record_video';
+import { cleanTestMonitors } from '../../synthetics/services/add_monitor';
 import { monitorManagementPageProvider } from '../../../page_objects/uptime/monitor_management';
 
-journey('AddPrivateLocationMonitor', async ({ page, params: { kibanaUrl } }) => {
+journey('AddPrivateLocationMonitor', async ({ page, params }) => {
   recordVideo(page);
 
+  page.setDefaultTimeout(TIMEOUT_60_SEC.timeout);
+  const kibanaUrl = params.kibanaUrl;
+
   const uptime = monitorManagementPageProvider({ page, kibanaUrl });
 
+  let monitorId: string;
+
   before(async () => {
-    await uptime.waitForLoadingToFinish();
+    await cleanTestMonitors(params);
+    page.on('request', (evt) => {
+      if (
+        evt.resourceType() === 'fetch' &&
+        evt.url().includes('/internal/uptime/service/monitors?preserve_namespace=true')
+      ) {
+        evt
+          .response()
+          ?.then((res) => res?.json())
+          .then((res) => {
+            monitorId = res.id;
+          });
+      }
+    });
   });
 
   step('Go to monitor-management', async () => {
@@ -39,7 +58,7 @@ journey('AddPrivateLocationMonitor', async ({ page, params: { kibanaUrl } }) =>
 
     await page.click('input[name="name"]');
     await page.fill('input[name="name"]', 'Private location monitor');
-    await page.click('label:has-text("Test private location Private")', TIMEOUT_60_SEC);
+    await page.click('label:has-text("Test private location Private")');
     await page.selectOption('select', 'http');
     await page.click(byTestId('syntheticsUrlField'));
     await page.fill(byTestId('syntheticsUrlField'), 'https://www.google.com');
@@ -66,7 +85,9 @@ journey('AddPrivateLocationMonitor', async ({ page, params: { kibanaUrl } }) =>
   step('Click text=Edit Elastic Synthetics integration', async () => {
     await assertText({ page, text: 'This table contains 1 rows out of 1 rows; Page 1 of 1.' });
     await page.click('[data-test-subj="integrationNameLink"]');
-    await page.click('text=Edit in uptime');
+    const btn = await page.locator(byTestId('syntheticsEditMonitorButton'));
+    expect(await btn.getAttribute('href')).toBe(`/app/synthetics/edit-monitor/${monitorId}`);
+    await btn.click();
     await page.click('text=Private location monitor');
   });
 });
diff --git a/...ublic/legacy_uptime/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx b/...ublic/legacy_uptime/components/fleet_package/synthetics_policy_edit_extension_wrapper.tsx
@@ -104,10 +104,15 @@ export const SyntheticsPolicyEditExtensionWrapper = memo<PackagePolicyEditExtens
     if (currentPolicy.is_managed) {
       return (
         <EuiCallOut>
-          <p>{EDIT_IN_UPTIME_DESC}</p>
+          <p>{EDIT_IN_SYNTHETICS_DESC}</p>
           {/* TODO Add a link to exact monitor*/}
-          <EuiButton href={`${http?.basePath.get()}/app/uptime/manage-monitors/all`}>
-            {EDIT_IN_UPTIME_LABEL}
+          <EuiButton
+            data-test-subj="syntheticsEditMonitorButton"
+            href={`${http?.basePath.get()}/app/synthetics/edit-monitor/${
+              defaultConfig[ConfigKey.CONFIG_ID]
+            }`}
+          >
+            {EDIT_IN_SYNTHETICS_LABEL}
           </EuiButton>
         </EuiCallOut>
       );
@@ -143,10 +148,13 @@ export const SyntheticsPolicyEditExtensionWrapper = memo<PackagePolicyEditExtens
 );
 SyntheticsPolicyEditExtensionWrapper.displayName = 'SyntheticsPolicyEditExtensionWrapper';
 
-const EDIT_IN_UPTIME_LABEL = i18n.translate('xpack.synthetics.editPackagePolicy.inUptime', {
-  defaultMessage: 'Edit in uptime',
+const EDIT_IN_SYNTHETICS_LABEL = i18n.translate('xpack.synthetics.editPackagePolicy.inSynthetics', {
+  defaultMessage: 'Edit in synthetics',
 });
 
-const EDIT_IN_UPTIME_DESC = i18n.translate('xpack.synthetics.editPackagePolicy.inUptimeDesc', {
-  defaultMessage: 'This package policy is managed by uptime app.',
-});
+const EDIT_IN_SYNTHETICS_DESC = i18n.translate(
+  'xpack.synthetics.editPackagePolicy.inSyntheticsDesc',
+  {
+    defaultMessage: 'This package policy is managed by synthetics app.',
+  }
+);
diff --git a/...cy_uptime/components/overview/integration_deprecation/integration_deprecation_callout.tsx b/...cy_uptime/components/overview/integration_deprecation/integration_deprecation_callout.tsx
@@ -37,7 +37,7 @@ export function IntegrationDeprecationCallout({
                 link: (
                   <EuiLink
                     target="_blank"
-                    href={getDocLinks()?.links?.observability?.syntheticsProjectMonitors}
+                    href={getDocLinks()?.links?.observability?.syntheticsMigrateFromIntegration}
                     external
                   >
                     <FormattedMessage

diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
@@ -33240,8 +33240,6 @@
     "xpack.synthetics.durationTrend.percentile75": "75e",
     "xpack.synthetics.editMonitor.errorDetailsRoute.title": "Détails de l'erreur",
     "xpack.synthetics.editMonitor.pageHeader.title": "Modifier le moniteur",
-    "xpack.synthetics.editPackagePolicy.inUptime": "Modifier dans Uptime",
-    "xpack.synthetics.editPackagePolicy.inUptimeDesc": "Cette politique de package est gérée par l’application Uptime.",
     "xpack.synthetics.emptyState.loadingMessage": "Chargement…",
     "xpack.synthetics.emptyStateError.notAuthorized": "Vous n'êtes pas autorisé à afficher les données Uptime, veuillez contacter votre administrateur système.",
     "xpack.synthetics.emptyStateError.notFoundPage": "Page introuvable",

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -33211,8 +33211,6 @@
     "xpack.synthetics.durationTrend.percentile75": "75番目",
     "xpack.synthetics.editMonitor.errorDetailsRoute.title": "詳細を入力",
     "xpack.synthetics.editMonitor.pageHeader.title": "モニターを編集",
-    "xpack.synthetics.editPackagePolicy.inUptime": "アップタイムで編集",
-    "xpack.synthetics.editPackagePolicy.inUptimeDesc": "このパッケージポリシーは、アップタイムアプリで管理されます。",
     "xpack.synthetics.emptyState.loadingMessage": "読み込み中…",
     "xpack.synthetics.emptyStateError.notAuthorized": "アップタイムデータの表示が承認されていません。システム管理者にお問い合わせください。",
     "xpack.synthetics.emptyStateError.notFoundPage": "ページが見つかりません",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -33246,8 +33246,6 @@
     "xpack.synthetics.durationTrend.percentile75": "第 75 个",
     "xpack.synthetics.editMonitor.errorDetailsRoute.title": "错误详细信息",
     "xpack.synthetics.editMonitor.pageHeader.title": "编辑监测",
-    "xpack.synthetics.editPackagePolicy.inUptime": "在 Uptime 中编辑",
-    "xpack.synthetics.editPackagePolicy.inUptimeDesc": "此软件包策略由 Uptime 应用托管。",
     "xpack.synthetics.emptyState.loadingMessage": "正在加载……",
     "xpack.synthetics.emptyStateError.notAuthorized": "您无权查看 Uptime 数据，请联系系统管理员。",
     "xpack.synthetics.emptyStateError.notFoundPage": "未找到页面",