Creating alert link with alert id and rule id (#140634)

* creating alert link with alert id and rule id * fixing failing test * fixing failing tests
elastic · Sep 13, 2022 · 8647bd8 · 8647bd8
1 parent c9b8098
commit 8647bd8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/x-pack/plugins/observability/public/config/paths.ts b/x-pack/plugins/observability/public/config/paths.ts
@@ -14,8 +14,10 @@ export const paths = {
     rules: RULES_PAGE_LINK,
     ruleDetails: (ruleId?: string | null) =>
       ruleId ? `${RULES_PAGE_LINK}/${encodeURI(ruleId)}` : RULES_PAGE_LINK,
-    alertDetails: (alertId?: string | null) =>
-      alertId ? `${ALERT_PAGE_LINK}/${encodeURI(alertId)}` : ALERT_PAGE_LINK,
+    alertDetails: (alertId?: string | null, ruleId?: string | null) =>
+      alertId && ruleId
+        ? `${ALERT_PAGE_LINK}/rules/${encodeURI(ruleId)}/alerts/${encodeURI(alertId)}`
+        : ALERT_PAGE_LINK,
   },
   management: {
     rules: '/app/management/insightsAndAlerting/triggersActions/rules',

diff --git a/x-pack/plugins/observability/public/pages/alerts/components/observability_actions.tsx b/x-pack/plugins/observability/public/pages/alerts/components/observability_actions.tsx
@@ -79,8 +79,8 @@ export function ObservabilityActions({
       : null;
   const alertId = alert.fields['kibana.alert.uuid'] ?? null;
   const linkToAlert =
-    pageId !== ALERT_DETAILS_PAGE_ID && alertId
-      ? http.basePath.prepend(paths.observability.alertDetails(alertId))
+    pageId !== ALERT_DETAILS_PAGE_ID && alertId && ruleId
+      ? http.basePath.prepend(paths.observability.alertDetails(alertId, ruleId))
       : null;
   const caseAttachments: CaseAttachmentsWithoutOwner = useMemo(() => {
     return ecsData?._id

diff --git a/x-pack/plugins/observability/public/routes/index.tsx b/x-pack/plugins/observability/public/routes/index.tsx
@@ -117,7 +117,7 @@ export const routes = {
     params: {},
     exact: true,
   },
-  '/alerts/:alertId': {
+  '/alerts/rules/:ruleId/alerts/:alertId': {
     handler: () => {
       return <AlertDetailsPage />;
     },

diff --git a/x-pack/test/functional/services/observability/alerts/common.ts b/x-pack/test/functional/services/observability/alerts/common.ts
@@ -56,10 +56,10 @@ export function ObservabilityAlertsCommonProvider({
     );
   };
 
-  const navigateToAlertDetails = async (alertId: string) => {
+  const navigateToAlertDetails = async (alertId: string, ruleId: string) => {
     return await pageObjects.common.navigateToUrlWithBrowserHistory(
       'observability',
-      `/alerts/${alertId}`,
+      `/alerts/rules/${ruleId}/alerts/${alertId}`,
       '',
       { ensureCurrentUrl: false }
     );

diff --git a/x-pack/test/observability_functional/apps/observability/pages/alert_details_page.ts b/x-pack/test/observability_functional/apps/observability/pages/alert_details_page.ts
@@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => {
     });
 
     it('should show 404 page when the feature flag is disabled', async () => {
-      await observability.alerts.common.navigateToAlertDetails(uuid.v4());
+      await observability.alerts.common.navigateToAlertDetails(uuid.v4(), uuid.v4());
       await retry.waitFor(
         'Alerts page to be visible',
         async () => await testSubjects.exists('pageNotFound')