From 7f8d4403edcd0d84f1d074095c7a3f72c4efb4f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Tue, 3 Aug 2021 20:54:08 +0200
Subject: [PATCH 01/16] Remove outdated top_alerts route and related types

---
 .../pages/alerts/alerts_flyout/index.tsx      |   9 +-
 .../public/pages/alerts/alerts_table.tsx      | 167 ------------------
 .../pages/alerts/alerts_table_t_grid.tsx      |  20 +--
 .../public/pages/alerts/decorate_response.ts  |  39 ----
 .../public/pages/alerts/index.tsx             |   3 -
 .../public/pages/alerts/parse_alert.ts        |  36 ++++
 .../public/pages/alerts/render_cell_value.tsx |   8 +-
 .../server/lib/rules/get_top_alerts.ts        |  52 ------
 .../observability/server/routes/rules.ts      |  45 +----
 .../observability/server/utils/queries.ts     |  10 --
 10 files changed, 55 insertions(+), 334 deletions(-)
 delete mode 100644 x-pack/plugins/observability/public/pages/alerts/alerts_table.tsx
 delete mode 100644 x-pack/plugins/observability/public/pages/alerts/decorate_response.ts
 create mode 100644 x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
 delete mode 100644 x-pack/plugins/observability/server/lib/rules/get_top_alerts.ts

diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
index 53b5300e556c5..f22188c8290d2 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
@@ -31,16 +31,16 @@ import {
 } from '@kbn/rule-data-utils/target/technical_field_names';
 import moment from 'moment-timezone';
 import React, { useMemo } from 'react';
-import type { TopAlert, TopAlertResponse } from '../';
+import type { TopAlert } from '../';
 import { useKibana, useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
 import { asDuration } from '../../../../common/utils/formatters';
 import type { ObservabilityRuleTypeRegistry } from '../../../rules/create_observability_rule_type_registry';
-import { decorateResponse } from '../decorate_response';
+import { parseAlert } from '../parse_alert';
 import { SeverityBadge } from '../severity_badge';
 
 type AlertsFlyoutProps = {
   alert?: TopAlert;
-  alerts?: TopAlertResponse[];
+  alerts?: Array<Record<string, unknown>>;
   isInApp?: boolean;
   observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry;
   selectedAlertId?: string;
@@ -59,7 +59,8 @@ export function AlertsFlyout({
   const { http } = services;
   const prepend = http?.basePath.prepend;
   const decoratedAlerts = useMemo(() => {
-    return decorateResponse(alerts ?? [], observabilityRuleTypeRegistry);
+    const parseObservabilityAlert = parseAlert(observabilityRuleTypeRegistry);
+    return (alerts ?? []).map(parseObservabilityAlert);
   }, [alerts, observabilityRuleTypeRegistry]);
 
   let alertData = alert;
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_table.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_table.tsx
deleted file mode 100644
index 28d211766cfe5..0000000000000
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_table.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * 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 {
-  CustomItemAction,
-  EuiBasicTable,
-  EuiBasicTableColumn,
-  EuiButton,
-  EuiIconTip,
-  EuiLink,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import {
-  ALERT_DURATION,
-  ALERT_SEVERITY_LEVEL,
-  ALERT_UUID,
-} from '@kbn/rule-data-utils/target/technical_field_names';
-import React, { Suspense, useMemo, useState } from 'react';
-import { LazyAlertsFlyout } from '../..';
-import { asDuration } from '../../../common/utils/formatters';
-import { TimestampTooltip } from '../../components/shared/timestamp_tooltip';
-import { usePluginContext } from '../../hooks/use_plugin_context';
-import type { TopAlert, TopAlertResponse } from './';
-import { decorateResponse } from './decorate_response';
-import { SeverityBadge } from './severity_badge';
-
-const pagination = { pageIndex: 0, pageSize: 0, totalItemCount: 0 };
-
-interface AlertsTableProps {
-  items: TopAlertResponse[];
-}
-
-export function AlertsTable(props: AlertsTableProps) {
-  const [selectedAlertId, setSelectedAlertId] = useState<string | undefined>(undefined);
-  const handleFlyoutClose = () => setSelectedAlertId(undefined);
-  const { core, observabilityRuleTypeRegistry } = usePluginContext();
-  const { prepend } = core.http.basePath;
-  const items = useMemo(() => decorateResponse(props.items, observabilityRuleTypeRegistry), [
-    props.items,
-    observabilityRuleTypeRegistry,
-  ]);
-
-  const actions: Array<CustomItemAction<TopAlert>> = useMemo(
-    () => [
-      {
-        render: (alert) =>
-          alert.link ? (
-            <EuiButton href={prepend(alert.link)} size="s">
-              {i18n.translate('xpack.observability.alertsTable.viewInAppButtonLabel', {
-                defaultMessage: 'View in app',
-              })}
-            </EuiButton>
-          ) : (
-            <></>
-          ),
-        isPrimary: true,
-      },
-    ],
-    [prepend]
-  );
-
-  const columns: Array<EuiBasicTableColumn<TopAlert>> = useMemo(
-    () => [
-      {
-        field: 'active',
-        name: i18n.translate('xpack.observability.alertsTable.statusColumnDescription', {
-          defaultMessage: 'Status',
-        }),
-        align: 'center',
-        render: (_, alert) => {
-          const { active } = alert;
-
-          return active ? (
-            <EuiIconTip
-              content={i18n.translate('xpack.observability.alertsTable.statusOpenDescription', {
-                defaultMessage: 'Open',
-              })}
-              color="danger"
-              type="alert"
-            />
-          ) : (
-            <EuiIconTip
-              content={i18n.translate('xpack.observability.alertsTable.statusClosedDescription', {
-                defaultMessage: 'Closed',
-              })}
-              type="check"
-            />
-          );
-        },
-      },
-      {
-        field: 'start',
-        name: i18n.translate('xpack.observability.alertsTable.triggeredColumnDescription', {
-          defaultMessage: 'Triggered',
-        }),
-        render: (_, alert) => {
-          return (
-            <TimestampTooltip time={new Date(alert.start).getTime()} timeUnit="milliseconds" />
-          );
-        },
-      },
-      {
-        field: 'duration',
-        name: i18n.translate('xpack.observability.alertsTable.durationColumnDescription', {
-          defaultMessage: 'Duration',
-        }),
-        render: (_, alert) => {
-          const { active } = alert;
-          return active ? null : asDuration(alert.fields[ALERT_DURATION], { extended: true });
-        },
-      },
-      {
-        field: 'severity',
-        name: i18n.translate('xpack.observability.alertsTable.severityColumnDescription', {
-          defaultMessage: 'Severity',
-        }),
-        render: (_, alert) => {
-          return <SeverityBadge severityLevel={alert.fields[ALERT_SEVERITY_LEVEL]} />;
-        },
-      },
-      {
-        field: 'reason',
-        name: i18n.translate('xpack.observability.alertsTable.reasonColumnDescription', {
-          defaultMessage: 'Reason',
-        }),
-        dataType: 'string',
-        render: (_, alert) => {
-          return (
-            <EuiLink onClick={() => setSelectedAlertId(alert.fields[ALERT_UUID])}>
-              {alert.reason}
-            </EuiLink>
-          );
-        },
-      },
-      {
-        actions,
-        name: i18n.translate('xpack.observability.alertsTable.actionsColumnDescription', {
-          defaultMessage: 'Actions',
-        }),
-      },
-    ],
-    [actions, setSelectedAlertId]
-  );
-
-  return (
-    <>
-      <Suspense fallback={null}>
-        <LazyAlertsFlyout
-          alerts={props.items}
-          observabilityRuleTypeRegistry={observabilityRuleTypeRegistry}
-          onClose={handleFlyoutClose}
-          selectedAlertId={selectedAlertId}
-        />
-      </Suspense>
-      <EuiBasicTable<TopAlert>
-        columns={columns}
-        items={items}
-        tableLayout="auto"
-        pagination={pagination}
-      />
-    </>
-  );
-}
diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
index 77c2b5cbca0cf..ad5ddd490cd24 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts_table_t_grid.tsx
@@ -9,7 +9,7 @@ import { EuiButtonIcon, EuiDataGridColumn } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 
-import React, { Suspense, useState } from 'react';
+import React, { Suspense, useMemo, useState } from 'react';
 import {
   ALERT_DURATION,
   ALERT_SEVERITY_LEVEL,
@@ -25,8 +25,8 @@ import type { ActionProps, ColumnHeaderOptions, RowRenderer } from '../../../../
 
 import { getRenderCellValue } from './render_cell_value';
 import { usePluginContext } from '../../hooks/use_plugin_context';
-import { decorateResponse } from './decorate_response';
 import { LazyAlertsFlyout } from '../..';
+import { parseAlert } from './parse_alert';
 
 interface AlertsTableTGridProps {
   indexName: string;
@@ -117,6 +117,10 @@ export function AlertsTableTGrid(props: AlertsTableTGridProps) {
   const handleFlyoutClose = () => setFlyoutAlert(undefined);
   const { timelines } = useKibana<{ timelines: TimelinesUIStart }>().services;
 
+  const parseObservabilityAlert = useMemo(() => parseAlert(observabilityRuleTypeRegistry), [
+    observabilityRuleTypeRegistry,
+  ]);
+
   const leadingControlColumns = [
     {
       id: 'expand',
@@ -132,11 +136,7 @@ export function AlertsTableTGrid(props: AlertsTableTGridProps) {
       },
       rowCellRender: ({ data }: ActionProps) => {
         const dataFieldEs = data.reduce((acc, d) => ({ ...acc, [d.field]: d.value }), {});
-        const decoratedAlerts = decorateResponse(
-          [dataFieldEs] ?? [],
-          observabilityRuleTypeRegistry
-        );
-        const alert = decoratedAlerts[0];
+        const alert = parseObservabilityAlert(dataFieldEs);
         return (
           <EuiButtonIcon
             size="s"
@@ -153,11 +153,7 @@ export function AlertsTableTGrid(props: AlertsTableTGridProps) {
       headerCellRender: () => null,
       rowCellRender: ({ data }: ActionProps) => {
         const dataFieldEs = data.reduce((acc, d) => ({ ...acc, [d.field]: d.value }), {});
-        const decoratedAlerts = decorateResponse(
-          [dataFieldEs] ?? [],
-          observabilityRuleTypeRegistry
-        );
-        const alert = decoratedAlerts[0];
+        const alert = parseObservabilityAlert(dataFieldEs);
         return (
           <EuiButtonIcon
             size="s"
diff --git a/x-pack/plugins/observability/public/pages/alerts/decorate_response.ts b/x-pack/plugins/observability/public/pages/alerts/decorate_response.ts
deleted file mode 100644
index e177bea6c6dac..0000000000000
--- a/x-pack/plugins/observability/public/pages/alerts/decorate_response.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 {
-  RULE_ID,
-  RULE_NAME,
-  ALERT_STATUS,
-  ALERT_START,
-} from '@kbn/rule-data-utils/target/technical_field_names';
-import type { TopAlertResponse, TopAlert } from '.';
-import { parseTechnicalFields } from '../../../../rule_registry/common/parse_technical_fields';
-import { asDuration, asPercent } from '../../../common/utils/formatters';
-import { ObservabilityRuleTypeRegistry } from '../../rules/create_observability_rule_type_registry';
-
-export function decorateResponse(
-  alerts: TopAlertResponse[],
-  observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry
-): TopAlert[] {
-  return alerts.map((alert) => {
-    const parsedFields = parseTechnicalFields(alert);
-    const formatter = observabilityRuleTypeRegistry.getFormatter(parsedFields[RULE_ID]!);
-    const formatted = {
-      link: undefined,
-      reason: parsedFields[RULE_NAME]!,
-      ...(formatter?.({ fields: parsedFields, formatters: { asDuration, asPercent } }) ?? {}),
-    };
-
-    return {
-      ...formatted,
-      fields: parsedFields,
-      active: parsedFields[ALERT_STATUS] !== 'closed',
-      start: new Date(parsedFields[ALERT_START]!).getTime(),
-    };
-  });
-}
diff --git a/x-pack/plugins/observability/public/pages/alerts/index.tsx b/x-pack/plugins/observability/public/pages/alerts/index.tsx
index fed9ee0be3a4a..ec640f4826585 100644
--- a/x-pack/plugins/observability/public/pages/alerts/index.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/index.tsx
@@ -15,15 +15,12 @@ import { ExperimentalBadge } from '../../components/shared/experimental_badge';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { usePluginContext } from '../../hooks/use_plugin_context';
 import { RouteParams } from '../../routes';
-import type { ObservabilityAPIReturnType } from '../../services/call_observability_api/types';
 import { AlertsSearchBar } from './alerts_search_bar';
 import { AlertsTableTGrid } from './alerts_table_t_grid';
 import { StatusFilter } from './status_filter';
 import { useFetcher } from '../../hooks/use_fetcher';
 import { callObservabilityApi } from '../../services/call_observability_api';
 
-export type TopAlertResponse = ObservabilityAPIReturnType<'GET /api/observability/rules/alerts/top'>[number];
-
 export interface TopAlert {
   fields: ParsedTechnicalFields;
   start: number;
diff --git a/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
new file mode 100644
index 0000000000000..a44ea74bd5cbf
--- /dev/null
+++ b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 {
+  RULE_ID,
+  RULE_NAME,
+  ALERT_STATUS,
+  ALERT_START,
+} from '@kbn/rule-data-utils/target/technical_field_names';
+import type { TopAlert } from '.';
+import { parseTechnicalFields } from '../../../../rule_registry/common/parse_technical_fields';
+import { asDuration, asPercent } from '../../../common/utils/formatters';
+import { ObservabilityRuleTypeRegistry } from '../../rules/create_observability_rule_type_registry';
+
+export const parseAlert = (observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry) => (
+  alert: Record<string, unknown>
+): TopAlert => {
+  const parsedFields = parseTechnicalFields(alert);
+  const formatter = observabilityRuleTypeRegistry.getFormatter(parsedFields[RULE_ID]!);
+  const formatted = {
+    link: undefined,
+    reason: parsedFields[RULE_NAME]!,
+    ...(formatter?.({ fields: parsedFields, formatters: { asDuration, asPercent } }) ?? {}),
+  };
+
+  return {
+    ...formatted,
+    fields: parsedFields,
+    active: parsedFields[ALERT_STATUS] !== 'closed',
+    start: new Date(parsedFields[ALERT_START]!).getTime(),
+  };
+};
diff --git a/x-pack/plugins/observability/public/pages/alerts/render_cell_value.tsx b/x-pack/plugins/observability/public/pages/alerts/render_cell_value.tsx
index bb6d0ae6c0e40..d9e30ad34e257 100644
--- a/x-pack/plugins/observability/public/pages/alerts/render_cell_value.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/render_cell_value.tsx
@@ -20,7 +20,7 @@ import { TimestampTooltip } from '../../components/shared/timestamp_tooltip';
 import { asDuration } from '../../../common/utils/formatters';
 import { SeverityBadge } from './severity_badge';
 import { TopAlert } from '.';
-import { decorateResponse } from './decorate_response';
+import { parseAlert } from './parse_alert';
 import { usePluginContext } from '../../hooks/use_plugin_context';
 
 const getMappedNonEcsValue = ({
@@ -95,11 +95,7 @@ export const getRenderCellValue = ({
         return <SeverityBadge severityLevel={value ?? undefined} />;
       case RULE_NAME:
         const dataFieldEs = data.reduce((acc, d) => ({ ...acc, [d.field]: d.value }), {});
-        const decoratedAlerts = decorateResponse(
-          [dataFieldEs] ?? [],
-          observabilityRuleTypeRegistry
-        );
-        const alert = decoratedAlerts[0];
+        const alert = parseAlert(observabilityRuleTypeRegistry)(dataFieldEs);
 
         return (
           // NOTE: EuiLink automatically renders links using a <button>
diff --git a/x-pack/plugins/observability/server/lib/rules/get_top_alerts.ts b/x-pack/plugins/observability/server/lib/rules/get_top_alerts.ts
deleted file mode 100644
index db8191136686a..0000000000000
--- a/x-pack/plugins/observability/server/lib/rules/get_top_alerts.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 { EVENT_KIND, TIMESTAMP } from '@kbn/rule-data-utils/target/technical_field_names';
-import { RuleDataClient } from '../../../../rule_registry/server';
-import type { AlertStatus } from '../../../common/typings';
-import { kqlQuery, rangeQuery, alertStatusQuery } from '../../utils/queries';
-
-export async function getTopAlerts({
-  ruleDataClient,
-  start,
-  end,
-  kuery,
-  size,
-  status,
-}: {
-  ruleDataClient: RuleDataClient;
-  start: number;
-  end: number;
-  kuery?: string;
-  size: number;
-  status: AlertStatus;
-}) {
-  const response = await ruleDataClient.getReader().search({
-    body: {
-      query: {
-        bool: {
-          filter: [
-            ...rangeQuery(start, end),
-            ...kqlQuery(kuery),
-            ...alertStatusQuery(status),
-            { term: { [EVENT_KIND]: 'signal' } },
-          ],
-        },
-      },
-      fields: ['*'],
-      size,
-      sort: {
-        [TIMESTAMP]: 'desc',
-      },
-      _source: false,
-    },
-    allow_no_indices: true,
-  });
-
-  return response.hits.hits.map((hit) => {
-    return hit.fields;
-  });
-}
diff --git a/x-pack/plugins/observability/server/routes/rules.ts b/x-pack/plugins/observability/server/routes/rules.ts
index daa7ad09ea09e..6ca4dc58147f2 100644
--- a/x-pack/plugins/observability/server/routes/rules.ts
+++ b/x-pack/plugins/observability/server/routes/rules.ts
@@ -4,48 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { isoToEpochRt, toNumberRt } from '@kbn/io-ts-utils';
-import * as t from 'io-ts';
+
 import { observabilityFeatureId } from '../../common';
-import { alertStatusRt } from '../../common/typings';
-import { getTopAlerts } from '../lib/rules/get_top_alerts';
 import { createObservabilityServerRoute } from './create_observability_server_route';
 import { createObservabilityServerRouteRepository } from './create_observability_server_route_repository';
 
-const alertsListRoute = createObservabilityServerRoute({
-  endpoint: 'GET /api/observability/rules/alerts/top',
-  options: {
-    tags: [],
-  },
-  params: t.type({
-    query: t.intersection([
-      t.type({
-        start: isoToEpochRt,
-        end: isoToEpochRt,
-        status: alertStatusRt,
-      }),
-      t.partial({
-        kuery: t.string,
-        size: toNumberRt,
-      }),
-    ]),
-  }),
-  handler: async ({ ruleDataClient, context, params }) => {
-    const {
-      query: { start, end, kuery, size = 100, status },
-    } = params;
-
-    return getTopAlerts({
-      ruleDataClient,
-      start,
-      end,
-      kuery,
-      size,
-      status,
-    });
-  },
-});
-
 const alertsDynamicIndexPatternRoute = createObservabilityServerRoute({
   endpoint: 'GET /api/observability/rules/alerts/dynamic_index_pattern',
   options: {
@@ -58,6 +21,6 @@ const alertsDynamicIndexPatternRoute = createObservabilityServerRoute({
   },
 });
 
-export const rulesRouteRepository = createObservabilityServerRouteRepository()
-  .add(alertsListRoute)
-  .add(alertsDynamicIndexPatternRoute);
+export const rulesRouteRepository = createObservabilityServerRouteRepository().add(
+  alertsDynamicIndexPatternRoute
+);
diff --git a/x-pack/plugins/observability/server/utils/queries.ts b/x-pack/plugins/observability/server/utils/queries.ts
index 2ee3291e7fb62..ae4b1ed2ecd4e 100644
--- a/x-pack/plugins/observability/server/utils/queries.ts
+++ b/x-pack/plugins/observability/server/utils/queries.ts
@@ -6,17 +6,7 @@
  */
 
 import type { estypes } from '@elastic/elasticsearch';
-import { ALERT_STATUS } from '@kbn/rule-data-utils/target/technical_field_names';
 import { esKuery } from '../../../../../src/plugins/data/server';
-import { AlertStatus } from '../../common/typings';
-
-export function alertStatusQuery(status: AlertStatus) {
-  if (status === 'all') {
-    return [];
-  }
-
-  return [{ term: { [ALERT_STATUS]: status } }];
-}
 
 export function rangeQuery(
   start?: number,

From a6f2c40e3b7b0af025231531dab2be49037b8bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Tue, 3 Aug 2021 23:42:58 +0200
Subject: [PATCH 02/16] Remove tests for deleted code

---
 .../server/utils/queries.test.ts              | 39 -------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 x-pack/plugins/observability/server/utils/queries.test.ts

diff --git a/x-pack/plugins/observability/server/utils/queries.test.ts b/x-pack/plugins/observability/server/utils/queries.test.ts
deleted file mode 100644
index a0a63b73d7170..0000000000000
--- a/x-pack/plugins/observability/server/utils/queries.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 { ALERT_STATUS } from '@kbn/rule-data-utils/target/technical_field_names';
-import * as queries from './queries';
-
-describe('queries', () => {
-  describe('alertStatusQuery', () => {
-    describe('given "all"', () => {
-      it('returns an empty array', () => {
-        expect(queries.alertStatusQuery('all')).toEqual([]);
-      });
-    });
-
-    describe('given "open"', () => {
-      it('returns a query for open', () => {
-        expect(queries.alertStatusQuery('open')).toEqual([
-          {
-            term: { [ALERT_STATUS]: 'open' },
-          },
-        ]);
-      });
-    });
-
-    describe('given "closed"', () => {
-      it('returns a query for closed', () => {
-        expect(queries.alertStatusQuery('closed')).toEqual([
-          {
-            term: { [ALERT_STATUS]: 'closed' },
-          },
-        ]);
-      });
-    });
-  });
-});

From 6bf826a054db14426265f5b403f9b435cbac8810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Tue, 3 Aug 2021 23:46:19 +0200
Subject: [PATCH 03/16] Remove test for deleted API

---
 .../tests/alerts/rule_registry.ts             | 98 -------------------
 1 file changed, 98 deletions(-)

diff --git a/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts b/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
index 0677acd500c1f..69de4c9999d68 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
@@ -404,82 +404,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           }
         `);
 
-        const now = new Date().getTime();
-
-        const { body: topAlerts, status: topAlertStatus } = await supertest
-          .get(
-            format({
-              pathname: '/api/observability/rules/alerts/top',
-              query: {
-                start: new Date(now - 30 * 60 * 1000).toISOString(),
-                end: new Date(now).toISOString(),
-                status: 'all',
-              },
-            })
-          )
-          .set('kbn-xsrf', 'foo');
-
-        expect(topAlertStatus).to.eql(200);
-
-        expect(topAlerts.length).to.be.greaterThan(0);
-
-        expectSnapshot(omit(topAlerts[0], exclude)).toMatchInline(`
-          Object {
-            "event.action": Array [
-              "open",
-            ],
-            "event.kind": Array [
-              "signal",
-            ],
-            "kibana.rac.alert.duration.us": Array [
-              0,
-            ],
-            "kibana.rac.alert.evaluation.threshold": Array [
-              30,
-            ],
-            "kibana.rac.alert.evaluation.value": Array [
-              50,
-            ],
-            "kibana.rac.alert.id": Array [
-              "apm.transaction_error_rate_opbeans-go_request_ENVIRONMENT_NOT_DEFINED",
-            ],
-            "kibana.rac.alert.owner": Array [
-              "apm",
-            ],
-            "kibana.rac.alert.producer": Array [
-              "apm",
-            ],
-            "kibana.rac.alert.status": Array [
-              "open",
-            ],
-            "kibana.space_ids": Array [
-              "default",
-            ],
-            "processor.event": Array [
-              "transaction",
-            ],
-            "rule.category": Array [
-              "Transaction error rate threshold",
-            ],
-            "rule.id": Array [
-              "apm.transaction_error_rate",
-            ],
-            "rule.name": Array [
-              "Transaction error rate threshold | opbeans-go",
-            ],
-            "service.name": Array [
-              "opbeans-go",
-            ],
-            "tags": Array [
-              "apm",
-              "service.name:opbeans-go",
-            ],
-            "transaction.type": Array [
-              "request",
-            ],
-          }
-        `);
-
         await es.bulk({
           index: APM_TRANSACTION_INDEX_NAME,
           body: [
@@ -589,28 +513,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             ],
           }
         `);
-
-        const {
-          body: topAlertsAfterRecovery,
-          status: topAlertStatusAfterRecovery,
-        } = await supertest
-          .get(
-            format({
-              pathname: '/api/observability/rules/alerts/top',
-              query: {
-                start: new Date(now - 30 * 60 * 1000).toISOString(),
-                end: new Date().toISOString(),
-                status: 'all',
-              },
-            })
-          )
-          .set('kbn-xsrf', 'foo');
-
-        expect(topAlertStatusAfterRecovery).to.eql(200);
-
-        expect(topAlertsAfterRecovery.length).to.be(1);
-
-        expect(topAlertsAfterRecovery[0]['kibana.rac.alert.status']?.[0]).to.be('closed');
       });
     });
   });

From 3a22b8fc8bdb6361e2c708f97a227c35bcc07e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Wed, 4 Aug 2021 11:04:05 +0200
Subject: [PATCH 04/16] Remove reference to deleted type

---
 .../pages/alerts/alerts_flyout/alerts_flyout.stories.tsx       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/alerts_flyout.stories.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/alerts_flyout.stories.tsx
index a752b8d89a1bd..f507802a1e7d1 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/alerts_flyout.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/alerts_flyout.stories.tsx
@@ -7,7 +7,6 @@
 
 import { ALERT_UUID } from '@kbn/rule-data-utils';
 import React, { ComponentType } from 'react';
-import type { TopAlertResponse } from '../';
 import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { PluginContext, PluginContextValue } from '../../../context/plugin_context';
 import { createObservabilityRuleTypeRegistryMock } from '../../../rules/observability_rule_type_registry_mock';
@@ -15,7 +14,7 @@ import { apmAlertResponseExample } from '../example_data';
 import { AlertsFlyout } from './';
 
 interface Args {
-  alerts: TopAlertResponse[];
+  alerts: Array<Record<string, unknown>>;
 }
 
 export default {

From c0c794eecac4e42a0cb81213d9e8b094576c08f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Wed, 4 Aug 2021 18:14:30 +0200
Subject: [PATCH 05/16] Remove unused translations

---
 .../translations/translations/ja-JP.json      | 48 +++++++--------
 .../translations/translations/zh-CN.json      | 60 ++++++++-----------
 2 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index cf3d52dca6167..032709e97433b 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5198,11 +5198,6 @@
     "visTypeXy.function.valueAxis.axisParams.help": "値軸パラメーター",
     "visTypeXy.function.valueaxis.help": "値軸オブジェクトを生成します",
     "visTypeXy.function.valueAxis.name.help": "値軸の名前",
-    "visualizations.function.xyDimension.aggType.help": "集約タイプ",
-    "visualizations.function.xydimension.help": "XYディメンションオブジェクトを生成します",
-    "visualizations.function.xyDimension.label.help": "ラベル",
-    "visualizations.function.xyDimension.params.help": "パラメーター",
-    "visualizations.function.xyDimension.visDimension.help": "ディメンションオブジェクト構成",
     "visTypeXy.functions.help": "XYビジュアライゼーション",
     "visTypeXy.histogram.groupTitle": "系列を分割",
     "visTypeXy.histogram.histogramDescription": "軸の縦棒にデータを表示します。",
@@ -5241,6 +5236,11 @@
     "visTypeXy.thresholdLine.style.dashedText": "鎖線",
     "visTypeXy.thresholdLine.style.dotdashedText": "点線",
     "visTypeXy.thresholdLine.style.fullText": "完全",
+    "visualizations.function.xyDimension.aggType.help": "集約タイプ",
+    "visualizations.function.xydimension.help": "XYディメンションオブジェクトを生成します",
+    "visualizations.function.xyDimension.label.help": "ラベル",
+    "visualizations.function.xyDimension.params.help": "パラメーター",
+    "visualizations.function.xyDimension.visDimension.help": "ディメンションオブジェクト構成",
     "visualizations.advancedSettings.visualizeEnableLabsText": "ユーザーが実験的なビジュアライゼーションを作成、表示、編集できるようになります。無効の場合、\n            ユーザーは本番準備が整ったビジュアライゼーションのみを利用できます。",
     "visualizations.advancedSettings.visualizeEnableLabsTitle": "実験的なビジュアライゼーションを有効にする",
     "visualizations.disabledLabVisualizationLink": "ドキュメンテーションを表示",
@@ -6727,17 +6727,6 @@
     "xpack.canvas.functions.pointseries.args.yHelpText": "Y軸の値です。",
     "xpack.canvas.functions.pointseries.unwrappedExpressionErrorMessage": "表現は {fn} などの関数で囲む必要があります",
     "xpack.canvas.functions.pointseriesHelpText": "{DATATABLE} を点の配列モデルに変換します。現在 {TINYMATH} 式でディメンションのメジャーを区別します。{TINYMATH_URL} をご覧ください。引数に {TINYMATH} 式が入力された場合、その引数をメジャーとして使用し、そうでない場合はディメンションになります。ディメンションを組み合わせて固有のキーを作成します。その後メジャーはそれらのキーで、指定された {TINYMATH} 関数を使用して複製されます。",
-    "expressionShape.functions.progress.args.barColorHelpText": "背景バーの色です。",
-    "expressionShape.functions.progress.args.barWeightHelpText": "背景バーの太さです。",
-    "expressionShape.functions.progress.args.fontHelpText": "ラベルの {CSS} フォントプロパティです。例：{FONT_FAMILY} または {FONT_WEIGHT}。",
-    "expressionShape.functions.progress.args.labelHelpText": "ラベルの表示・非表示を切り替えるには、{BOOLEAN_TRUE}または{BOOLEAN_FALSE}を使用します。また、ラベルとして表示する文字列を入力することもできます。",
-    "expressionShape.functions.progress.args.maxHelpText": "進捗エレメントの最高値です。",
-    "expressionShape.functions.progress.args.shapeHelpText": "{list} または {end} を選択します。",
-    "expressionShape.functions.progress.args.valueColorHelpText": "進捗バーの色です。",
-    "expressionShape.functions.progress.args.valueWeightHelpText": "進捗バーの太さです。",
-    "expressionShape.functions.progress.invalidMaxValueErrorMessage": "無効な {arg} 値：「{max, number}」。「{arg}」は 0 より大きい必要があります",
-    "expressionShape.functions.progress.invalidValueErrorMessage": "無効な値：「{value, number}」。値は 0 と {max, number} の間でなければなりません",
-    "expressionShape.functions.progressHelpText": "進捗エレメントを構成します。",
     "xpack.canvas.functions.render.args.asHelpText": "レンダリングに使用するエレメントタイプです。代わりに {plotFn} や {shapeFn} などの特殊な関数を使用するほうがいいでしょう。",
     "xpack.canvas.functions.render.args.containerStyleHelpText": "背景、境界、透明度を含む、コンテナーのスタイルです。",
     "xpack.canvas.functions.render.args.cssHelpText": "このエレメントの対象となるカスタム {CSS} のブロックです。",
@@ -6926,8 +6915,6 @@
     "xpack.canvas.renderer.pie.helpDescription": "データから円グラフをレンダリングします",
     "xpack.canvas.renderer.plot.displayName": "座標プロット",
     "xpack.canvas.renderer.plot.helpDescription": "データから XY プロットをレンダリングします",
-    "expressionShape.renderer.progress.displayName": "進捗インジケーター",
-    "expressionShape.renderer.progress.helpDescription": "エレメントのパーセンテージを示す進捗インジケーターをレンダリングします",
     "xpack.canvas.renderer.table.displayName": "データテーブル",
     "xpack.canvas.renderer.table.helpDescription": "表形式データを {HTML} としてレンダリングします",
     "xpack.canvas.renderer.text.displayName": "プレインテキスト",
@@ -7411,6 +7398,21 @@
     "xpack.canvas.workpadTemplates.table.descriptionColumnTitle": "説明",
     "xpack.canvas.workpadTemplates.table.nameColumnTitle": "テンプレート名",
     "xpack.canvas.workpadTemplates.table.tagsColumnTitle": "タグ",
+    "expressionShape.functions.progress.args.barColorHelpText": "背景バーの色です。",
+    "expressionShape.functions.progress.args.barWeightHelpText": "背景バーの太さです。",
+    "expressionShape.functions.progress.args.fontHelpText": "ラベルの {CSS} フォントプロパティです。例：{FONT_FAMILY} または {FONT_WEIGHT}。",
+    "expressionShape.functions.progress.args.labelHelpText": "ラベルの表示・非表示を切り替えるには、{BOOLEAN_TRUE}または{BOOLEAN_FALSE}を使用します。また、ラベルとして表示する文字列を入力することもできます。",
+    "expressionShape.functions.progress.args.maxHelpText": "進捗エレメントの最高値です。",
+    "expressionShape.functions.progress.args.shapeHelpText": "{list} または {end} を選択します。",
+    "expressionShape.functions.progress.args.valueColorHelpText": "進捗バーの色です。",
+    "expressionShape.functions.progress.args.valueWeightHelpText": "進捗バーの太さです。",
+    "expressionShape.functions.progress.invalidMaxValueErrorMessage": "無効な {arg} 値：「{max, number}」。「{arg}」は 0 より大きい必要があります",
+    "expressionShape.functions.progress.invalidValueErrorMessage": "無効な値：「{value, number}」。値は 0 と {max, number} の間でなければなりません",
+    "expressionShape.functions.progressHelpText": "進捗エレメントを構成します。",
+    "expressionShape.renderer.progress.displayName": "進捗インジケーター",
+    "expressionShape.renderer.progress.helpDescription": "エレメントのパーセンテージを示す進捗インジケーターをレンダリングします",
+    "expressionShape.renderer.shape.displayName": "形状",
+    "expressionShape.renderer.shape.helpDescription": "基本的な図形をレンダリングします",
     "expressionRepeatImage.error.repeatImage.missingMaxArgument": "{emptyImageArgument} を指定する場合は、{maxArgument} を設定する必要があります",
     "expressionRepeatImage.functions.repeatImage.args.emptyImageHelpText": "この画像のエレメントについて、{CONTEXT}および{maxArg}パラメーターの差異を解消します。画像アセットは{BASE64}データ{URL}として提供するか、部分式で渡します。",
     "expressionRepeatImage.functions.repeatImage.args.imageHelpText": "繰り返す画像です。画像アセットは{BASE64}データ{URL}として提供するか、部分式で渡します。",
@@ -7432,8 +7434,6 @@
     "expressionMetric.functions.metricHelpText": "ラベルの上に数字を表示します。",
     "expressionMetric.renderer.metric.displayName": "メトリック",
     "expressionMetric.renderer.metric.helpDescription": "ラベルの上に数字をレンダリングします",
-    "expressionShape.renderer.shape.displayName": "形状",
-    "expressionShape.renderer.shape.helpDescription": "基本的な図形をレンダリングします",
     "expressionError.errorComponent.description": "表現が失敗し次のメッセージが返されました：",
     "expressionError.errorComponent.title": "おっと！表現が失敗しました",
     "expressionError.renderer.debug.displayName": "デバッグ",
@@ -18450,14 +18450,6 @@
     "xpack.observability.alertsFlyout.statusLabel": "ステータス",
     "xpack.observability.alertsFlyout.triggeredLabel": "実行済み",
     "xpack.observability.alertsLinkTitle": "アラート",
-    "xpack.observability.alertsTable.actionsColumnDescription": "アクション",
-    "xpack.observability.alertsTable.durationColumnDescription": "期間",
-    "xpack.observability.alertsTable.reasonColumnDescription": "理由",
-    "xpack.observability.alertsTable.severityColumnDescription": "深刻度",
-    "xpack.observability.alertsTable.statusClosedDescription": "終了",
-    "xpack.observability.alertsTable.statusColumnDescription": "ステータス",
-    "xpack.observability.alertsTable.statusOpenDescription": "開く",
-    "xpack.observability.alertsTable.triggeredColumnDescription": "実行済み",
     "xpack.observability.alertsTable.viewInAppButtonLabel": "アプリで表示",
     "xpack.observability.alertsTitle": "アラート",
     "xpack.observability.breadcrumbs.alertsLinkText": "アラート",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 294759ec12173..5b0f8d96ddf72 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5225,11 +5225,6 @@
     "visTypeXy.function.valueAxis.axisParams.help": "值轴参数",
     "visTypeXy.function.valueaxis.help": "生成值轴对象",
     "visTypeXy.function.valueAxis.name.help": "值轴的名称",
-    "visualizations.function.xyDimension.aggType.help": "聚合类型",
-    "visualizations.function.xydimension.help": "生成 xy 维度对象",
-    "visualizations.function.xyDimension.label.help": "标签",
-    "visualizations.function.xyDimension.params.help": "参数",
-    "visualizations.function.xyDimension.visDimension.help": "维度对象配置",
     "visTypeXy.functions.help": "XY 可视化",
     "visTypeXy.histogram.groupTitle": "拆分序列",
     "visTypeXy.histogram.histogramDescription": "在轴上以垂直条形图的形式呈现数据。",
@@ -5268,6 +5263,11 @@
     "visTypeXy.thresholdLine.style.dashedText": "虚线",
     "visTypeXy.thresholdLine.style.dotdashedText": "点虚线",
     "visTypeXy.thresholdLine.style.fullText": "实线",
+    "visualizations.function.xyDimension.aggType.help": "聚合类型",
+    "visualizations.function.xydimension.help": "生成 xy 维度对象",
+    "visualizations.function.xyDimension.label.help": "标签",
+    "visualizations.function.xyDimension.params.help": "参数",
+    "visualizations.function.xyDimension.visDimension.help": "维度对象配置",
     "visualizations.advancedSettings.visualizeEnableLabsText": "允许用户创建、查看和编辑实验性可视化。如果禁用，\n            仅被视为生产就绪的可视化可供用户使用。",
     "visualizations.advancedSettings.visualizeEnableLabsTitle": "启用实验性可视化",
     "visualizations.disabledLabVisualizationLink": "阅读文档",
@@ -6767,17 +6767,6 @@
     "xpack.canvas.functions.pointseries.args.yHelpText": "Y 轴上的值。",
     "xpack.canvas.functions.pointseries.unwrappedExpressionErrorMessage": "表达式必须包装在函数中，例如 {fn}",
     "xpack.canvas.functions.pointseriesHelpText": "将 {DATATABLE} 转成点序列模型。当前我们通过寻找 {TINYMATH} 表达式来区分度量和维度。请参阅 {TINYMATH_URL}。如果在参数中输入 {TINYMATH} 表达式，我们将该参数视为度量，否则该参数为维度。维度将进行组合以创建唯一键。然后，这些键使用指定的 {TINYMATH} 函数消除重复的度量",
-    "expressionShape.functions.progress.args.barColorHelpText": "背景条形的颜色。",
-    "expressionShape.functions.progress.args.barWeightHelpText": "背景条形的粗细。",
-    "expressionShape.functions.progress.args.fontHelpText": "标签的 {CSS} 字体属性。例如 {FONT_FAMILY} 或 {FONT_WEIGHT}。",
-    "expressionShape.functions.progress.args.labelHelpText": "要显示或隐藏标签，请使用 {BOOLEAN_TRUE} 或 {BOOLEAN_FALSE}。或者，提供字符串以显示为标签。",
-    "expressionShape.functions.progress.args.maxHelpText": "进度元素的最大值。",
-    "expressionShape.functions.progress.args.shapeHelpText": "选择 {list} 或 {end}。",
-    "expressionShape.functions.progress.args.valueColorHelpText": "进度条的颜色。",
-    "expressionShape.functions.progress.args.valueWeightHelpText": "进度条的粗细。",
-    "expressionShape.functions.progress.invalidMaxValueErrorMessage": "无效的 {arg} 值：“{max, number}”。“{arg}”必须大于 0",
-    "expressionShape.functions.progress.invalidValueErrorMessage": "无效的值：“{value, number}”。值必须介于 0 和 {max, number} 之间",
-    "expressionShape.functions.progressHelpText": "配置进度元素。",
     "xpack.canvas.functions.render.args.asHelpText": "要渲染的元素类型。您可能需要专门的函数，例如 {plotFn} 或 {shapeFn}。",
     "xpack.canvas.functions.render.args.containerStyleHelpText": "容器的样式，包括背景、边框和透明度。",
     "xpack.canvas.functions.render.args.cssHelpText": "要限定于元素的任何定制 {CSS} 块。",
@@ -6966,8 +6955,6 @@
     "xpack.canvas.renderer.pie.helpDescription": "根据您的数据呈现饼图",
     "xpack.canvas.renderer.plot.displayName": "坐标图",
     "xpack.canvas.renderer.plot.helpDescription": "根据您的数据呈现 XY 坐标图",
-    "expressionShape.renderer.progress.displayName": "进度指示",
-    "expressionShape.renderer.progress.helpDescription": "呈现显示元素百分比的进度指示",
     "xpack.canvas.renderer.table.displayName": "数据表",
     "xpack.canvas.renderer.table.helpDescription": "将表格数据呈现为 {HTML}",
     "xpack.canvas.renderer.text.displayName": "纯文本",
@@ -7459,6 +7446,27 @@
     "xpack.canvas.workpadTemplates.table.descriptionColumnTitle": "描述",
     "xpack.canvas.workpadTemplates.table.nameColumnTitle": "模板名称",
     "xpack.canvas.workpadTemplates.table.tagsColumnTitle": "标签",
+    "expressionShape.functions.progress.args.barColorHelpText": "背景条形的颜色。",
+    "expressionShape.functions.progress.args.barWeightHelpText": "背景条形的粗细。",
+    "expressionShape.functions.progress.args.fontHelpText": "标签的 {CSS} 字体属性。例如 {FONT_FAMILY} 或 {FONT_WEIGHT}。",
+    "expressionShape.functions.progress.args.labelHelpText": "要显示或隐藏标签，请使用 {BOOLEAN_TRUE} 或 {BOOLEAN_FALSE}。或者，提供字符串以显示为标签。",
+    "expressionShape.functions.progress.args.maxHelpText": "进度元素的最大值。",
+    "expressionShape.functions.progress.args.shapeHelpText": "选择 {list} 或 {end}。",
+    "expressionShape.functions.progress.args.valueColorHelpText": "进度条的颜色。",
+    "expressionShape.functions.progress.args.valueWeightHelpText": "进度条的粗细。",
+    "expressionShape.functions.progress.invalidMaxValueErrorMessage": "无效的 {arg} 值：“{max, number}”。“{arg}”必须大于 0",
+    "expressionShape.functions.progress.invalidValueErrorMessage": "无效的值：“{value, number}”。值必须介于 0 和 {max, number} 之间",
+    "expressionShape.functions.progressHelpText": "配置进度元素。",
+    "expressionShape.renderer.progress.displayName": "进度指示",
+    "expressionShape.renderer.progress.helpDescription": "呈现显示元素百分比的进度指示",
+    "expressionShape.renderer.shape.displayName": "形状",
+    "expressionShape.renderer.shape.helpDescription": "呈现基本形状",
+    "expressionShape.functions.shape.args.borderHelpText": "形状轮廓边框的 {SVG} 颜色。",
+    "expressionShape.functions.shape.args.borderWidthHelpText": "边框的粗细。",
+    "expressionShape.functions.shape.args.fillHelpText": "填充形状的 {SVG} 颜色。",
+    "expressionShape.functions.shape.args.maintainAspectHelpText": "维持形状的原始纵横比？",
+    "expressionShape.functions.shape.args.shapeHelpText": "选取形状。",
+    "expressionShape.functions.shapeHelpText": "创建形状。",
     "expressionRepeatImage.error.repeatImage.missingMaxArgument": "如果提供 {emptyImageArgument}，则必须设置 {maxArgument}",
     "expressionRepeatImage.functions.repeatImage.args.emptyImageHelpText": "使用此图像填充元素的 {CONTEXT} 和 {maxArg} 参数之间的差距。以 {BASE64} 数据 {URL} 的形式提供图像资产或传入子表达式。",
     "expressionRepeatImage.functions.repeatImage.args.imageHelpText": "要重复的图像。以 {BASE64} 数据 {URL} 的形式提供图像资产或传入子表达式。",
@@ -7487,14 +7495,6 @@
     "expressionRevealImage.functions.revealImage.args.originHelpText": "要开始图像填充的位置。例如 {list} 或 {end}。",
     "expressionRevealImage.functions.revealImage.invalidPercentErrorMessage": "无效值：“{percent}”。百分比必须介于 0 和 1 之间",
     "expressionRevealImage.functions.revealImageHelpText": "配置图像显示元素。",
-    "expressionShape.renderer.shape.displayName": "形状",
-    "expressionShape.renderer.shape.helpDescription": "呈现基本形状",
-    "expressionShape.functions.shape.args.borderHelpText": "形状轮廓边框的 {SVG} 颜色。",
-    "expressionShape.functions.shape.args.borderWidthHelpText": "边框的粗细。",
-    "expressionShape.functions.shape.args.fillHelpText": "填充形状的 {SVG} 颜色。",
-    "expressionShape.functions.shape.args.maintainAspectHelpText": "维持形状的原始纵横比？",
-    "expressionShape.functions.shape.args.shapeHelpText": "选取形状。",
-    "expressionShape.functions.shapeHelpText": "创建形状。",
     "expressionError.errorComponent.description": "表达式失败，并显示消息：",
     "expressionError.errorComponent.title": "哎哟！表达式失败",
     "expressionError.renderer.debug.displayName": "故障排查",
@@ -18873,14 +18873,6 @@
     "xpack.observability.alertsFlyout.statusLabel": "状态",
     "xpack.observability.alertsFlyout.triggeredLabel": "已触发",
     "xpack.observability.alertsLinkTitle": "告警",
-    "xpack.observability.alertsTable.actionsColumnDescription": "操作",
-    "xpack.observability.alertsTable.durationColumnDescription": "持续时间",
-    "xpack.observability.alertsTable.reasonColumnDescription": "原因",
-    "xpack.observability.alertsTable.severityColumnDescription": "严重性",
-    "xpack.observability.alertsTable.statusClosedDescription": "已关闭",
-    "xpack.observability.alertsTable.statusColumnDescription": "状态",
-    "xpack.observability.alertsTable.statusOpenDescription": "打开",
-    "xpack.observability.alertsTable.triggeredColumnDescription": "已触发",
     "xpack.observability.alertsTable.viewInAppButtonLabel": "在应用中查看",
     "xpack.observability.alertsTitle": "告警",
     "xpack.observability.breadcrumbs.alertsLinkText": "告警",

From 8ccbeadd51a317ac38f984589a6c628851c6aa48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Wed, 4 Aug 2021 18:14:42 +0200
Subject: [PATCH 06/16] Remove unused mock from story

---
 .../public/pages/alerts/alerts.stories.tsx    | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
index cf5d8ad2817fe..c6698068395c5 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { StoryContext } from '@storybook/react';
 import React, { ComponentType } from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 import { MemoryRouter } from 'react-router-dom';
@@ -18,23 +17,16 @@ import {
 import { PluginContext, PluginContextValue } from '../../context/plugin_context';
 import { createObservabilityRuleTypeRegistryMock } from '../../rules/observability_rule_type_registry_mock';
 import { createCallObservabilityApi } from '../../services/call_observability_api';
-import type { ObservabilityAPIReturnType } from '../../services/call_observability_api/types';
-import { apmAlertResponseExample, dynamicIndexPattern } from './example_data';
-
-interface PageArgs {
-  items: ObservabilityAPIReturnType<'GET /api/observability/rules/alerts/top'>;
-}
+import { dynamicIndexPattern } from './example_data';
 
 export default {
   title: 'app/Alerts',
   component: AlertsPage,
   decorators: [
-    (Story: ComponentType, { args: { items = [] } }: StoryContext) => {
+    (Story: ComponentType) => {
       createCallObservabilityApi(({
         get: async (endpoint: string) => {
-          if (endpoint === '/api/observability/rules/alerts/top') {
-            return items;
-          } else if (endpoint === '/api/observability/rules/alerts/dynamic_index_pattern') {
+          if (endpoint === '/api/observability/rules/alerts/dynamic_index_pattern') {
             return dynamicIndexPattern;
           }
         },
@@ -83,16 +75,12 @@ export default {
   ],
 };
 
-export function Example(_args: PageArgs) {
+export function Example() {
   return (
     <AlertsPage routeParams={{ query: { rangeFrom: 'now-15m', rangeTo: 'now', kuery: '' } }} />
   );
 }
-Example.args = {
-  items: apmAlertResponseExample,
-} as PageArgs;
 
-export function EmptyState(_args: PageArgs) {
+export function EmptyState() {
   return <AlertsPage routeParams={{ query: {} }} />;
 }
-EmptyState.args = { items: [] } as PageArgs;

From 78a7b2f9bcbd51435f3689b5852b31bd27a53815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Mon, 9 Aug 2021 14:46:21 +0200
Subject: [PATCH 07/16] Remove no-op alerts page story for now

---
 .../public/pages/alerts/alerts.stories.tsx    | 86 -------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx

diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
deleted file mode 100644
index c6698068395c5..0000000000000
--- a/x-pack/plugins/observability/public/pages/alerts/alerts.stories.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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, { ComponentType } from 'react';
-import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
-import { MemoryRouter } from 'react-router-dom';
-import { AlertsPage } from '.';
-import { HttpSetup } from '../../../../../../src/core/public';
-import {
-  KibanaContextProvider,
-  KibanaPageTemplate,
-} from '../../../../../../src/plugins/kibana_react/public';
-import { PluginContext, PluginContextValue } from '../../context/plugin_context';
-import { createObservabilityRuleTypeRegistryMock } from '../../rules/observability_rule_type_registry_mock';
-import { createCallObservabilityApi } from '../../services/call_observability_api';
-import { dynamicIndexPattern } from './example_data';
-
-export default {
-  title: 'app/Alerts',
-  component: AlertsPage,
-  decorators: [
-    (Story: ComponentType) => {
-      createCallObservabilityApi(({
-        get: async (endpoint: string) => {
-          if (endpoint === '/api/observability/rules/alerts/dynamic_index_pattern') {
-            return dynamicIndexPattern;
-          }
-        },
-      } as unknown) as HttpSetup);
-
-      return (
-        <MemoryRouter>
-          <IntlProvider locale="en">
-            <KibanaContextProvider
-              services={{
-                application: { getUrlForApp: () => '' },
-                data: { autocomplete: { hasQuerySuggestions: () => false }, query: {} },
-                chrome: { docTitle: { change: () => {} } },
-                docLinks: { links: { query: {} } },
-                storage: { get: () => {} },
-                timelines: { getTGrid: () => <></> },
-                uiSettings: {
-                  get: (setting: string) => {
-                    if (setting === 'dateFormat') {
-                      return '';
-                    } else {
-                      return [];
-                    }
-                  },
-                },
-              }}
-            >
-              <PluginContext.Provider
-                value={
-                  ({
-                    core: {
-                      http: { basePath: { prepend: (_: string) => '' } },
-                    },
-                    observabilityRuleTypeRegistry: createObservabilityRuleTypeRegistryMock(),
-                    ObservabilityPageTemplate: KibanaPageTemplate,
-                  } as unknown) as PluginContextValue
-                }
-              >
-                <Story />
-              </PluginContext.Provider>
-            </KibanaContextProvider>
-          </IntlProvider>
-        </MemoryRouter>
-      );
-    },
-  ],
-};
-
-export function Example() {
-  return (
-    <AlertsPage routeParams={{ query: { rangeFrom: 'now-15m', rangeTo: 'now', kuery: '' } }} />
-  );
-}
-
-export function EmptyState() {
-  return <AlertsPage routeParams={{ query: {} }} />;
-}

From c88d4cd005df9e50e4ad485b4e6cb6880b784954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Wed, 11 Aug 2021 13:39:21 +0200
Subject: [PATCH 08/16] Remove unsafe type assertions

---
 .../src/decode_or_throw/index.ts              | 52 +++++++++++++++++++
 packages/kbn-io-ts-utils/src/index.ts         |  1 +
 .../public/pages/alerts/parse_alert.ts        |  4 +-
 .../common/parse_technical_fields.ts          | 15 ++----
 4 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 packages/kbn-io-ts-utils/src/decode_or_throw/index.ts

diff --git a/packages/kbn-io-ts-utils/src/decode_or_throw/index.ts b/packages/kbn-io-ts-utils/src/decode_or_throw/index.ts
new file mode 100644
index 0000000000000..fd0d3332c6776
--- /dev/null
+++ b/packages/kbn-io-ts-utils/src/decode_or_throw/index.ts
@@ -0,0 +1,52 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { Context, Errors, IntersectionType, Type, UnionType, ValidationError } from 'io-ts';
+
+type ErrorFactory = (message: string) => Error;
+
+const getErrorPath = ([first, ...rest]: Context): string[] => {
+  if (typeof first === 'undefined') {
+    return [];
+  } else if (first.type instanceof IntersectionType) {
+    const [, ...next] = rest;
+    return getErrorPath(next);
+  } else if (first.type instanceof UnionType) {
+    const [, ...next] = rest;
+    return [first.key, ...getErrorPath(next)];
+  }
+
+  return [first.key, ...getErrorPath(rest)];
+};
+
+const getErrorType = ({ context }: ValidationError) =>
+  context[context.length - 1]?.type?.name ?? 'unknown';
+
+const formatError = (error: ValidationError) =>
+  error.message ??
+  `in ${getErrorPath(error.context).join('/')}: ${JSON.stringify(
+    error.value
+  )} does not match expected type ${getErrorType(error)}`;
+
+const formatErrors = (errors: ValidationError[]) =>
+  `Failed to validate: \n${errors.map((error) => `  ${formatError(error)}`).join('\n')}`;
+
+export const createPlainError = (message: string) => new Error(message);
+
+export const throwErrors = (createError: ErrorFactory) => (errors: Errors) => {
+  throw createError(formatErrors(errors));
+};
+
+export const decodeOrThrow = <DecodedValue, EncodedValue, InputValue>(
+  runtimeType: Type<DecodedValue, EncodedValue, InputValue>,
+  createError: ErrorFactory = createPlainError
+) => (inputValue: InputValue) =>
+  pipe(runtimeType.decode(inputValue), fold(throwErrors(createError), identity));
diff --git a/packages/kbn-io-ts-utils/src/index.ts b/packages/kbn-io-ts-utils/src/index.ts
index a60bc2086fa3a..b8b33d55b4bd4 100644
--- a/packages/kbn-io-ts-utils/src/index.ts
+++ b/packages/kbn-io-ts-utils/src/index.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+export { decodeOrThrow } from './decode_or_throw';
 export { jsonRt } from './json_rt';
 export { mergeRt } from './merge_rt';
 export { strictKeysRt } from './strict_keys_rt';
diff --git a/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
index a44ea74bd5cbf..8bc9086efdec4 100644
--- a/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
+++ b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
@@ -23,7 +23,7 @@ export const parseAlert = (observabilityRuleTypeRegistry: ObservabilityRuleTypeR
   const formatter = observabilityRuleTypeRegistry.getFormatter(parsedFields[RULE_ID]!);
   const formatted = {
     link: undefined,
-    reason: parsedFields[RULE_NAME]!,
+    reason: parsedFields[RULE_NAME] ?? '',
     ...(formatter?.({ fields: parsedFields, formatters: { asDuration, asPercent } }) ?? {}),
   };
 
@@ -31,6 +31,6 @@ export const parseAlert = (observabilityRuleTypeRegistry: ObservabilityRuleTypeR
     ...formatted,
     fields: parsedFields,
     active: parsedFields[ALERT_STATUS] !== 'closed',
-    start: new Date(parsedFields[ALERT_START]!).getTime(),
+    start: new Date(parsedFields[ALERT_START] ?? 0).getTime(),
   };
 };
diff --git a/x-pack/plugins/rule_registry/common/parse_technical_fields.ts b/x-pack/plugins/rule_registry/common/parse_technical_fields.ts
index 9d92c657468a3..73b204eaeaede 100644
--- a/x-pack/plugins/rule_registry/common/parse_technical_fields.ts
+++ b/x-pack/plugins/rule_registry/common/parse_technical_fields.ts
@@ -5,21 +5,16 @@
  * 2.0.
  */
 
-import { isLeft } from 'fp-ts/lib/Either';
-import { PathReporter } from 'io-ts/lib/PathReporter';
+import { decodeOrThrow } from '@kbn/io-ts-utils';
 import { technicalRuleFieldMap } from './assets/field_maps/technical_rule_field_map';
 import { runtimeTypeFromFieldMap } from './field_map';
 
-const technicalFieldRuntimeType = runtimeTypeFromFieldMap(technicalRuleFieldMap);
+const technicalFieldsRT = runtimeTypeFromFieldMap(technicalRuleFieldMap);
 
-export const parseTechnicalFields = (input: unknown) => {
-  const validate = technicalFieldRuntimeType.decode(input);
+export const parseTechnicalFields = (fieldMap: unknown) => {
+  const decodedFieldMap = decodeOrThrow(technicalFieldsRT)(fieldMap);
 
-  if (isLeft(validate)) {
-    throw new Error(PathReporter.report(validate).join('\n'));
-  }
-
-  return technicalFieldRuntimeType.encode(validate.right);
+  return technicalFieldsRT.encode(decodedFieldMap);
 };
 
 export type ParsedTechnicalFields = ReturnType<typeof parseTechnicalFields>;

From def69874987fb82bf4422ca8b1f045654bb65b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Wed, 11 Aug 2021 14:06:51 +0200
Subject: [PATCH 09/16] Factor out alert field type

---
 .../observability/public/pages/alerts/alerts_flyout/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
index 6d9e8bd8f2475..57b2f2282c0e0 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
@@ -38,9 +38,11 @@ import type { ObservabilityRuleTypeRegistry } from '../../../rules/create_observ
 import { parseAlert } from '../parse_alert';
 import { SeverityBadge } from '../severity_badge';
 
+type AlertFields = Record<string, unknown>;
+
 type AlertsFlyoutProps = {
   alert?: TopAlert;
-  alerts?: Array<Record<string, unknown>>;
+  alerts?: AlertFields[];
   isInApp?: boolean;
   observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry;
   selectedAlertId?: string;

From a1267b139d10f7ea209fe51ebb9967fd04cd9594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Wed, 11 Aug 2021 17:33:21 +0200
Subject: [PATCH 10/16] Compile kbn-io-ts-utils for the browser as well

---
 packages/kbn-io-ts-utils/.babelrc         |  3 +++
 packages/kbn-io-ts-utils/.babelrc.browser |  3 +++
 packages/kbn-io-ts-utils/BUILD.bazel      | 30 ++++++++++++++++++-----
 packages/kbn-io-ts-utils/package.json     |  5 ++--
 packages/kbn-io-ts-utils/tsconfig.json    |  3 ++-
 5 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 packages/kbn-io-ts-utils/.babelrc
 create mode 100644 packages/kbn-io-ts-utils/.babelrc.browser

diff --git a/packages/kbn-io-ts-utils/.babelrc b/packages/kbn-io-ts-utils/.babelrc
new file mode 100644
index 0000000000000..7da72d1779128
--- /dev/null
+++ b/packages/kbn-io-ts-utils/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@kbn/babel-preset/node_preset"]
+}
diff --git a/packages/kbn-io-ts-utils/.babelrc.browser b/packages/kbn-io-ts-utils/.babelrc.browser
new file mode 100644
index 0000000000000..dc6a77bbe0bcd
--- /dev/null
+++ b/packages/kbn-io-ts-utils/.babelrc.browser
@@ -0,0 +1,3 @@
+{
+  "presets": ["@kbn/babel-preset/webpack_preset"]
+}
diff --git a/packages/kbn-io-ts-utils/BUILD.bazel b/packages/kbn-io-ts-utils/BUILD.bazel
index 0e5210bcc38a5..8a9b740b402bc 100644
--- a/packages/kbn-io-ts-utils/BUILD.bazel
+++ b/packages/kbn-io-ts-utils/BUILD.bazel
@@ -1,5 +1,6 @@
 load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler")
 
 PKG_BASE_NAME = "kbn-io-ts-utils"
 PKG_REQUIRE_NAME = "@kbn/io-ts-utils"
@@ -24,7 +25,7 @@ NPM_MODULE_EXTRA_FILES = [
   "package.json",
 ]
 
-SRC_DEPS = [
+RUNTIME_DEPS = [
   "//packages/kbn-config-schema",
   "@npm//fp-ts",
   "@npm//io-ts",
@@ -33,12 +34,28 @@ SRC_DEPS = [
 ]
 
 TYPES_DEPS = [
+  "//packages/kbn-config-schema",
   "@npm//@types/jest",
   "@npm//@types/lodash",
   "@npm//@types/node",
+  "@npm//fp-ts",
+  "@npm//io-ts",
+  "@npm//lodash",
+  "@npm//tslib",
 ]
 
-DEPS = SRC_DEPS + TYPES_DEPS
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+jsts_transpiler(
+  name = "target_web",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+  config_file = ".babelrc.browser"
+)
 
 ts_config(
   name = "tsconfig",
@@ -50,13 +67,14 @@ ts_config(
 )
 
 ts_project(
-  name = "tsc",
+  name = "tsc_types",
   args = ['--pretty'],
   srcs = SRCS,
-  deps = DEPS,
+  deps = TYPES_DEPS,
   declaration = True,
   declaration_map = True,
-  out_dir = "target",
+  emit_declaration_only = True,
+  out_dir = "target_types",
   source_map = True,
   root_dir = "src",
   tsconfig = ":tsconfig",
@@ -65,7 +83,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = DEPS + [":tsc"],
+  deps = RUNTIME_DEPS + [":target_node", ":target_web", ":tsc_types"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )
diff --git a/packages/kbn-io-ts-utils/package.json b/packages/kbn-io-ts-utils/package.json
index 9d22277f27c01..3308cb3222253 100644
--- a/packages/kbn-io-ts-utils/package.json
+++ b/packages/kbn-io-ts-utils/package.json
@@ -1,7 +1,8 @@
 {
   "name": "@kbn/io-ts-utils",
-  "main": "./target/index.js",
-  "types": "./target/index.d.ts",
+  "browser": "./target_web/browser.js",
+  "main": "./target_node/index.js",
+  "types": "./target_types/index.d.ts",
   "version": "1.0.0",
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "private": true
diff --git a/packages/kbn-io-ts-utils/tsconfig.json b/packages/kbn-io-ts-utils/tsconfig.json
index 3ee769739dfc7..ad978c41d9702 100644
--- a/packages/kbn-io-ts-utils/tsconfig.json
+++ b/packages/kbn-io-ts-utils/tsconfig.json
@@ -1,10 +1,11 @@
 {
   "extends": "../../tsconfig.bazel.json",
   "compilerOptions": {
-    "outDir": "./target/types",
     "stripInternal": false,
     "declaration": true,
     "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "./target_types",
     "sourceMap": true,
     "sourceRoot": "../../../../packages/kbn-io-ts-utils/src",
     "types": [

From 492378c6b59c44da081e71857828a54389a9c554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Wed, 11 Aug 2021 21:16:12 +0200
Subject: [PATCH 11/16] Avoid deep import which doesn't work cross-platform

---
 packages/kbn-io-ts-utils/src/index.ts                       | 1 +
 packages/kbn-typed-react-router-config/src/create_router.ts | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kbn-io-ts-utils/src/index.ts b/packages/kbn-io-ts-utils/src/index.ts
index b8b33d55b4bd4..1929ad52d742d 100644
--- a/packages/kbn-io-ts-utils/src/index.ts
+++ b/packages/kbn-io-ts-utils/src/index.ts
@@ -7,6 +7,7 @@
  */
 
 export { decodeOrThrow } from './decode_or_throw';
+export { deepExactRt } from './deep_exact_rt';
 export { jsonRt } from './json_rt';
 export { mergeRt } from './merge_rt';
 export { strictKeysRt } from './strict_keys_rt';
diff --git a/packages/kbn-typed-react-router-config/src/create_router.ts b/packages/kbn-typed-react-router-config/src/create_router.ts
index 846808cb798f1..1e7b6eb312e4f 100644
--- a/packages/kbn-typed-react-router-config/src/create_router.ts
+++ b/packages/kbn-typed-react-router-config/src/create_router.ts
@@ -14,8 +14,7 @@ import {
 } from 'react-router-config';
 import qs from 'query-string';
 import { findLastIndex, merge, compact } from 'lodash';
-import { deepExactRt } from '@kbn/io-ts-utils/target/deep_exact_rt';
-import { mergeRt } from '@kbn/io-ts-utils/target/merge_rt';
+import { deepExactRt, mergeRt } from '@kbn/io-ts-utils';
 import { Route, Router } from './types';
 
 export function createRouter<TRoutes extends Route[]>(routes: TRoutes): Router<TRoutes> {

From 714020aa8f88213b1b2512f4b7f085e02ec21243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Thu, 12 Aug 2021 15:48:22 +0200
Subject: [PATCH 12/16] Revert "Avoid deep import which doesn't work
 cross-platform"

This reverts commit 492378c6b59c44da081e71857828a54389a9c554.
---
 packages/kbn-io-ts-utils/src/index.ts                       | 1 -
 packages/kbn-typed-react-router-config/src/create_router.ts | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kbn-io-ts-utils/src/index.ts b/packages/kbn-io-ts-utils/src/index.ts
index 1929ad52d742d..b8b33d55b4bd4 100644
--- a/packages/kbn-io-ts-utils/src/index.ts
+++ b/packages/kbn-io-ts-utils/src/index.ts
@@ -7,7 +7,6 @@
  */
 
 export { decodeOrThrow } from './decode_or_throw';
-export { deepExactRt } from './deep_exact_rt';
 export { jsonRt } from './json_rt';
 export { mergeRt } from './merge_rt';
 export { strictKeysRt } from './strict_keys_rt';
diff --git a/packages/kbn-typed-react-router-config/src/create_router.ts b/packages/kbn-typed-react-router-config/src/create_router.ts
index 1e7b6eb312e4f..846808cb798f1 100644
--- a/packages/kbn-typed-react-router-config/src/create_router.ts
+++ b/packages/kbn-typed-react-router-config/src/create_router.ts
@@ -14,7 +14,8 @@ import {
 } from 'react-router-config';
 import qs from 'query-string';
 import { findLastIndex, merge, compact } from 'lodash';
-import { deepExactRt, mergeRt } from '@kbn/io-ts-utils';
+import { deepExactRt } from '@kbn/io-ts-utils/target/deep_exact_rt';
+import { mergeRt } from '@kbn/io-ts-utils/target/merge_rt';
 import { Route, Router } from './types';
 
 export function createRouter<TRoutes extends Route[]>(routes: TRoutes): Router<TRoutes> {

From 0d60ce703398ded574c99533bb6534ed2c6f29e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Thu, 12 Aug 2021 15:48:26 +0200
Subject: [PATCH 13/16] Revert "Compile kbn-io-ts-utils for the browser as
 well"

This reverts commit a1267b139d10f7ea209fe51ebb9967fd04cd9594.
---
 packages/kbn-io-ts-utils/.babelrc         |  3 ---
 packages/kbn-io-ts-utils/.babelrc.browser |  3 ---
 packages/kbn-io-ts-utils/BUILD.bazel      | 30 +++++------------------
 packages/kbn-io-ts-utils/package.json     |  5 ++--
 packages/kbn-io-ts-utils/tsconfig.json    |  3 +--
 5 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 packages/kbn-io-ts-utils/.babelrc
 delete mode 100644 packages/kbn-io-ts-utils/.babelrc.browser

diff --git a/packages/kbn-io-ts-utils/.babelrc b/packages/kbn-io-ts-utils/.babelrc
deleted file mode 100644
index 7da72d1779128..0000000000000
--- a/packages/kbn-io-ts-utils/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["@kbn/babel-preset/node_preset"]
-}
diff --git a/packages/kbn-io-ts-utils/.babelrc.browser b/packages/kbn-io-ts-utils/.babelrc.browser
deleted file mode 100644
index dc6a77bbe0bcd..0000000000000
--- a/packages/kbn-io-ts-utils/.babelrc.browser
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["@kbn/babel-preset/webpack_preset"]
-}
diff --git a/packages/kbn-io-ts-utils/BUILD.bazel b/packages/kbn-io-ts-utils/BUILD.bazel
index 8a9b740b402bc..0e5210bcc38a5 100644
--- a/packages/kbn-io-ts-utils/BUILD.bazel
+++ b/packages/kbn-io-ts-utils/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
-load("//src/dev/bazel:index.bzl", "jsts_transpiler")
 
 PKG_BASE_NAME = "kbn-io-ts-utils"
 PKG_REQUIRE_NAME = "@kbn/io-ts-utils"
@@ -25,7 +24,7 @@ NPM_MODULE_EXTRA_FILES = [
   "package.json",
 ]
 
-RUNTIME_DEPS = [
+SRC_DEPS = [
   "//packages/kbn-config-schema",
   "@npm//fp-ts",
   "@npm//io-ts",
@@ -34,28 +33,12 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config-schema",
   "@npm//@types/jest",
   "@npm//@types/lodash",
   "@npm//@types/node",
-  "@npm//fp-ts",
-  "@npm//io-ts",
-  "@npm//lodash",
-  "@npm//tslib",
 ]
 
-jsts_transpiler(
-  name = "target_node",
-  srcs = SRCS,
-  build_pkg_name = package_name(),
-)
-
-jsts_transpiler(
-  name = "target_web",
-  srcs = SRCS,
-  build_pkg_name = package_name(),
-  config_file = ".babelrc.browser"
-)
+DEPS = SRC_DEPS + TYPES_DEPS
 
 ts_config(
   name = "tsconfig",
@@ -67,14 +50,13 @@ ts_config(
 )
 
 ts_project(
-  name = "tsc_types",
+  name = "tsc",
   args = ['--pretty'],
   srcs = SRCS,
-  deps = TYPES_DEPS,
+  deps = DEPS,
   declaration = True,
   declaration_map = True,
-  emit_declaration_only = True,
-  out_dir = "target_types",
+  out_dir = "target",
   source_map = True,
   root_dir = "src",
   tsconfig = ":tsconfig",
@@ -83,7 +65,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = RUNTIME_DEPS + [":target_node", ":target_web", ":tsc_types"],
+  deps = DEPS + [":tsc"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )
diff --git a/packages/kbn-io-ts-utils/package.json b/packages/kbn-io-ts-utils/package.json
index 3308cb3222253..9d22277f27c01 100644
--- a/packages/kbn-io-ts-utils/package.json
+++ b/packages/kbn-io-ts-utils/package.json
@@ -1,8 +1,7 @@
 {
   "name": "@kbn/io-ts-utils",
-  "browser": "./target_web/browser.js",
-  "main": "./target_node/index.js",
-  "types": "./target_types/index.d.ts",
+  "main": "./target/index.js",
+  "types": "./target/index.d.ts",
   "version": "1.0.0",
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "private": true
diff --git a/packages/kbn-io-ts-utils/tsconfig.json b/packages/kbn-io-ts-utils/tsconfig.json
index ad978c41d9702..3ee769739dfc7 100644
--- a/packages/kbn-io-ts-utils/tsconfig.json
+++ b/packages/kbn-io-ts-utils/tsconfig.json
@@ -1,11 +1,10 @@
 {
   "extends": "../../tsconfig.bazel.json",
   "compilerOptions": {
+    "outDir": "./target/types",
     "stripInternal": false,
     "declaration": true,
     "declarationMap": true,
-    "emitDeclarationOnly": true,
-    "outDir": "./target_types",
     "sourceMap": true,
     "sourceRoot": "../../../../packages/kbn-io-ts-utils/src",
     "types": [

From 947598852d470166ef1c6f64cc9fabac6c9ae530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Thu, 12 Aug 2021 15:48:28 +0200
Subject: [PATCH 14/16] Revert "Factor out alert field type"

This reverts commit def69874987fb82bf4422ca8b1f045654bb65b12.
---
 .../observability/public/pages/alerts/alerts_flyout/index.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
index 57b2f2282c0e0..6d9e8bd8f2475 100644
--- a/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/alerts_flyout/index.tsx
@@ -38,11 +38,9 @@ import type { ObservabilityRuleTypeRegistry } from '../../../rules/create_observ
 import { parseAlert } from '../parse_alert';
 import { SeverityBadge } from '../severity_badge';
 
-type AlertFields = Record<string, unknown>;
-
 type AlertsFlyoutProps = {
   alert?: TopAlert;
-  alerts?: AlertFields[];
+  alerts?: Array<Record<string, unknown>>;
   isInApp?: boolean;
   observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry;
   selectedAlertId?: string;

From d66a4747257716bd37105ed043781076b554ca1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Thu, 12 Aug 2021 15:50:45 +0200
Subject: [PATCH 15/16] Revert "Remove unsafe type assertions"

This reverts commit c88d4cd005df9e50e4ad485b4e6cb6880b784954.
---
 .../src/decode_or_throw/index.ts              | 52 -------------------
 packages/kbn-io-ts-utils/src/index.ts         |  1 -
 .../public/pages/alerts/parse_alert.ts        |  4 +-
 .../common/parse_technical_fields.ts          | 15 ++++--
 4 files changed, 12 insertions(+), 60 deletions(-)
 delete mode 100644 packages/kbn-io-ts-utils/src/decode_or_throw/index.ts

diff --git a/packages/kbn-io-ts-utils/src/decode_or_throw/index.ts b/packages/kbn-io-ts-utils/src/decode_or_throw/index.ts
deleted file mode 100644
index fd0d3332c6776..0000000000000
--- a/packages/kbn-io-ts-utils/src/decode_or_throw/index.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { fold } from 'fp-ts/lib/Either';
-import { identity } from 'fp-ts/lib/function';
-import { pipe } from 'fp-ts/lib/pipeable';
-import { Context, Errors, IntersectionType, Type, UnionType, ValidationError } from 'io-ts';
-
-type ErrorFactory = (message: string) => Error;
-
-const getErrorPath = ([first, ...rest]: Context): string[] => {
-  if (typeof first === 'undefined') {
-    return [];
-  } else if (first.type instanceof IntersectionType) {
-    const [, ...next] = rest;
-    return getErrorPath(next);
-  } else if (first.type instanceof UnionType) {
-    const [, ...next] = rest;
-    return [first.key, ...getErrorPath(next)];
-  }
-
-  return [first.key, ...getErrorPath(rest)];
-};
-
-const getErrorType = ({ context }: ValidationError) =>
-  context[context.length - 1]?.type?.name ?? 'unknown';
-
-const formatError = (error: ValidationError) =>
-  error.message ??
-  `in ${getErrorPath(error.context).join('/')}: ${JSON.stringify(
-    error.value
-  )} does not match expected type ${getErrorType(error)}`;
-
-const formatErrors = (errors: ValidationError[]) =>
-  `Failed to validate: \n${errors.map((error) => `  ${formatError(error)}`).join('\n')}`;
-
-export const createPlainError = (message: string) => new Error(message);
-
-export const throwErrors = (createError: ErrorFactory) => (errors: Errors) => {
-  throw createError(formatErrors(errors));
-};
-
-export const decodeOrThrow = <DecodedValue, EncodedValue, InputValue>(
-  runtimeType: Type<DecodedValue, EncodedValue, InputValue>,
-  createError: ErrorFactory = createPlainError
-) => (inputValue: InputValue) =>
-  pipe(runtimeType.decode(inputValue), fold(throwErrors(createError), identity));
diff --git a/packages/kbn-io-ts-utils/src/index.ts b/packages/kbn-io-ts-utils/src/index.ts
index b8b33d55b4bd4..a60bc2086fa3a 100644
--- a/packages/kbn-io-ts-utils/src/index.ts
+++ b/packages/kbn-io-ts-utils/src/index.ts
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-export { decodeOrThrow } from './decode_or_throw';
 export { jsonRt } from './json_rt';
 export { mergeRt } from './merge_rt';
 export { strictKeysRt } from './strict_keys_rt';
diff --git a/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
index 54a9aa0669e44..2264671574789 100644
--- a/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
+++ b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
@@ -23,7 +23,7 @@ export const parseAlert = (observabilityRuleTypeRegistry: ObservabilityRuleTypeR
   const formatter = observabilityRuleTypeRegistry.getFormatter(parsedFields[ALERT_RULE_TYPE_ID]!);
   const formatted = {
     link: undefined,
-    reason: parsedFields[ALERT_RULE_NAME] ?? '',
+    reason: parsedFields[ALERT_RULE_NAME]!,
     ...(formatter?.({ fields: parsedFields, formatters: { asDuration, asPercent } }) ?? {}),
   };
 
@@ -31,6 +31,6 @@ export const parseAlert = (observabilityRuleTypeRegistry: ObservabilityRuleTypeR
     ...formatted,
     fields: parsedFields,
     active: parsedFields[ALERT_STATUS] !== 'closed',
-    start: new Date(parsedFields[ALERT_START] ?? 0).getTime(),
+    start: new Date(parsedFields[ALERT_START]!).getTime(),
   };
 };
diff --git a/x-pack/plugins/rule_registry/common/parse_technical_fields.ts b/x-pack/plugins/rule_registry/common/parse_technical_fields.ts
index 73b204eaeaede..9d92c657468a3 100644
--- a/x-pack/plugins/rule_registry/common/parse_technical_fields.ts
+++ b/x-pack/plugins/rule_registry/common/parse_technical_fields.ts
@@ -5,16 +5,21 @@
  * 2.0.
  */
 
-import { decodeOrThrow } from '@kbn/io-ts-utils';
+import { isLeft } from 'fp-ts/lib/Either';
+import { PathReporter } from 'io-ts/lib/PathReporter';
 import { technicalRuleFieldMap } from './assets/field_maps/technical_rule_field_map';
 import { runtimeTypeFromFieldMap } from './field_map';
 
-const technicalFieldsRT = runtimeTypeFromFieldMap(technicalRuleFieldMap);
+const technicalFieldRuntimeType = runtimeTypeFromFieldMap(technicalRuleFieldMap);
 
-export const parseTechnicalFields = (fieldMap: unknown) => {
-  const decodedFieldMap = decodeOrThrow(technicalFieldsRT)(fieldMap);
+export const parseTechnicalFields = (input: unknown) => {
+  const validate = technicalFieldRuntimeType.decode(input);
 
-  return technicalFieldsRT.encode(decodedFieldMap);
+  if (isLeft(validate)) {
+    throw new Error(PathReporter.report(validate).join('\n'));
+  }
+
+  return technicalFieldRuntimeType.encode(validate.right);
 };
 
 export type ParsedTechnicalFields = ReturnType<typeof parseTechnicalFields>;

From 77631aad30438c7be3c8add38c76564f1ce09c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Thu, 12 Aug 2021 16:11:38 +0200
Subject: [PATCH 16/16] Remove unsafe type assertions (again)

---
 .../plugins/observability/public/pages/alerts/parse_alert.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
index 2264671574789..54a9aa0669e44 100644
--- a/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
+++ b/x-pack/plugins/observability/public/pages/alerts/parse_alert.ts
@@ -23,7 +23,7 @@ export const parseAlert = (observabilityRuleTypeRegistry: ObservabilityRuleTypeR
   const formatter = observabilityRuleTypeRegistry.getFormatter(parsedFields[ALERT_RULE_TYPE_ID]!);
   const formatted = {
     link: undefined,
-    reason: parsedFields[ALERT_RULE_NAME]!,
+    reason: parsedFields[ALERT_RULE_NAME] ?? '',
     ...(formatter?.({ fields: parsedFields, formatters: { asDuration, asPercent } }) ?? {}),
   };
 
@@ -31,6 +31,6 @@ export const parseAlert = (observabilityRuleTypeRegistry: ObservabilityRuleTypeR
     ...formatted,
     fields: parsedFields,
     active: parsedFields[ALERT_STATUS] !== 'closed',
-    start: new Date(parsedFields[ALERT_START]!).getTime(),
+    start: new Date(parsedFields[ALERT_START] ?? 0).getTime(),
   };
 };