[RAC] Rename occurrences of alert_type to rule_type in Infra (elastic…

…#120455)

[RAC] Rename occurrences of alert_type to rule_type in Infra

x-pack/plugins/infra/public/alerting/inventory/index.ts

@@ -15,15 +15,15 @@ import {
 
 import { ObservabilityRuleTypeModel } from '../../../../observability/public';
 
-import { AlertTypeParams } from '../../../../alerting/common';
+import { AlertTypeParams as RuleTypeParams } from '../../../../alerting/common';
 import { validateMetricThreshold } from './components/validation';
 import { formatReason } from './rule_data_formatters';
 
-interface InventoryMetricAlertTypeParams extends AlertTypeParams {
+interface InventoryMetricRuleTypeParams extends RuleTypeParams {
   criteria: InventoryMetricConditions[];
 }
 
-export function createInventoryMetricAlertType(): ObservabilityRuleTypeModel<InventoryMetricAlertTypeParams> {
+export function createInventoryMetricRuleType(): ObservabilityRuleTypeModel<InventoryMetricRuleTypeParams> {
   return {
     id: METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID,
     description: i18n.translate('xpack.infra.metrics.inventory.alertFlyout.alertDescription', {

x-pack/plugins/infra/public/alerting/log_threshold/index.ts

@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export * from './log_threshold_alert_type';
+export * from './log_threshold_rule_type';
 export { AlertDropdown } from './components/alert_dropdown';

x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_alert_type.ts → x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.ts

@@ -11,11 +11,11 @@ import { ObservabilityRuleTypeModel } from '../../../../observability/public';
 import {
   LOG_DOCUMENT_COUNT_ALERT_TYPE_ID,
   PartialAlertParams,
-} from '../../../common/alerting/logs/log_threshold/types';
+} from '../../../common/alerting/logs/log_threshold';
 import { formatRuleData } from './rule_data_formatters';
 import { validateExpression } from './validation';
 
-export function createLogThresholdAlertType(): ObservabilityRuleTypeModel<PartialAlertParams> {
+export function createLogThresholdRuleType(): ObservabilityRuleTypeModel<PartialAlertParams> {
   return {
     id: LOG_DOCUMENT_COUNT_ALERT_TYPE_ID,
     description: i18n.translate('xpack.infra.logs.alertFlyout.alertDescription', {

x-pack/plugins/infra/public/alerting/metric_anomaly/index.ts

@@ -8,16 +8,15 @@
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { METRIC_ANOMALY_ALERT_TYPE_ID } from '../../../common/alerting/metrics';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { AlertTypeModel } from '../../../../triggers_actions_ui/public/types';
-import { AlertTypeParams } from '../../../../alerting/common';
+import { AlertTypeModel } from '../../../../triggers_actions_ui/public';
+import { AlertTypeParams as RuleTypeParams } from '../../../../alerting/common';
 import { validateMetricAnomaly } from './components/validation';
 
-interface MetricAnomalyAlertTypeParams extends AlertTypeParams {
+interface MetricAnomalyRuleTypeParams extends RuleTypeParams {
   hasInfraMLCapabilities: boolean;
 }
 
-export function createMetricAnomalyAlertType(): AlertTypeModel<MetricAnomalyAlertTypeParams> {
+export function createMetricAnomalyRuleType(): AlertTypeModel<MetricAnomalyRuleTypeParams> {
   return {
     id: METRIC_ANOMALY_ALERT_TYPE_ID,
     description: i18n.translate('xpack.infra.metrics.anomaly.alertFlyout.alertDescription', {

x-pack/plugins/infra/public/alerting/metric_threshold/index.ts

@@ -10,18 +10,18 @@ import React from 'react';
 import { ObservabilityRuleTypeModel } from '../../../../observability/public';
 import { validateMetricThreshold } from './components/validation';
 import { formatReason } from './rule_data_formatters';
-import { AlertTypeParams } from '../../../../alerting/common';
+import { AlertTypeParams as RuleTypeParams } from '../../../../alerting/common';
 import {
   MetricExpressionParams,
   METRIC_THRESHOLD_ALERT_TYPE_ID,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../server/lib/alerting/metric_threshold/types';
 
-interface MetricThresholdAlertTypeParams extends AlertTypeParams {
+interface MetricThresholdRuleTypeParams extends RuleTypeParams {
   criteria: MetricExpressionParams[];
 }
 
-export function createMetricThresholdAlertType(): ObservabilityRuleTypeModel<MetricThresholdAlertTypeParams> {
+export function createMetricThresholdRuleType(): ObservabilityRuleTypeModel<MetricThresholdRuleTypeParams> {
   return {
     id: METRIC_THRESHOLD_ALERT_TYPE_ID,
     description: i18n.translate('xpack.infra.metrics.alertFlyout.alertDescription', {

x-pack/plugins/infra/public/plugin.ts

@@ -31,19 +31,17 @@ export class Plugin implements InfraClientPluginClass {
       registerFeatures(pluginsSetup.home);
     }
 
-    const { createInventoryMetricAlertType } = await import('./alerting/inventory');
-    const { createLogThresholdAlertType } = await import('./alerting/log_threshold');
-    const { createMetricThresholdAlertType } = await import('./alerting/metric_threshold');
+    const { createInventoryMetricRuleType } = await import('./alerting/inventory');
+    const { createLogThresholdRuleType } = await import('./alerting/log_threshold');
+    const { createMetricThresholdRuleType } = await import('./alerting/metric_threshold');
 
     pluginsSetup.observability.observabilityRuleTypeRegistry.register(
-      createInventoryMetricAlertType()
+      createInventoryMetricRuleType()
     );
 
+    pluginsSetup.observability.observabilityRuleTypeRegistry.register(createLogThresholdRuleType());
     pluginsSetup.observability.observabilityRuleTypeRegistry.register(
-      createLogThresholdAlertType()
-    );
-    pluginsSetup.observability.observabilityRuleTypeRegistry.register(
-      createMetricThresholdAlertType()
+      createMetricThresholdRuleType()
     );
     pluginsSetup.observability.dashboard.register({
       appName: 'infra_logs',

x-pack/plugins/infra/server/lib/alerting/index.ts

@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { registerAlertTypes } from './register_alert_types';
+export { registerRuleTypes } from './register_rule_types';

x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts

@@ -8,18 +8,18 @@
 import { mapValues, last, first } from 'lodash';
 import moment from 'moment';
 import { ElasticsearchClient } from 'kibana/server';
-import { SnapshotCustomMetricInput } from '../../../../common/http_api/snapshot_api';
 import {
   isTooManyBucketsPreviewException,
   TOO_MANY_BUCKETS_PREVIEW_EXCEPTION,
 } from '../../../../common/alerting/metrics';
-import {
-  InfraDatabaseSearchResponse,
-  CallWithRequestParams,
-} from '../../adapters/framework/adapter_types';
+import { InfraDatabaseSearchResponse, CallWithRequestParams } from '../../adapters/framework';
 import { Comparator, InventoryMetricConditions } from './types';
 import { InventoryItemType, SnapshotMetricType } from '../../../../common/inventory_models/types';
-import { InfraTimerangeInput, SnapshotRequest } from '../../../../common/http_api/snapshot_api';
+import {
+  InfraTimerangeInput,
+  SnapshotRequest,
+  SnapshotCustomMetricInput,
+} from '../../../../common/http_api';
 import { InfraSource } from '../../sources';
 import { UNGROUPED_FACTORY_KEY } from '../common/utils';
 import { getNodes } from '../../../routes/snapshot/lib/get_nodes';

x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts

@@ -15,11 +15,14 @@ import { AlertStates } from './types';
 import {
   ActionGroupIdsOf,
   ActionGroup,
-  AlertInstanceContext,
-  AlertInstanceState,
+  AlertInstanceContext as AlertContext,
+  AlertInstanceState as AlertState,
   RecoveredActionGroup,
 } from '../../../../../alerting/common';
-import { AlertInstance, AlertTypeState } from '../../../../../alerting/server';
+import {
+  AlertInstance as Alert,
+  AlertTypeState as RuleTypeState,
+} from '../../../../../alerting/server';
 import { SnapshotMetricType } from '../../../../common/inventory_models/types';
 import { InfraBackendLibs } from '../../infra_types';
 import { METRIC_FORMATTERS } from '../../../../common/formatters/snapshot_metric_formats';
@@ -39,34 +42,34 @@ type InventoryMetricThresholdAllowedActionGroups = ActionGroupIdsOf<
   typeof FIRED_ACTIONS | typeof WARNING_ACTIONS
 >;
 
-export type InventoryMetricThresholdAlertTypeState = AlertTypeState; // no specific state used
-export type InventoryMetricThresholdAlertInstanceState = AlertInstanceState; // no specific state used
-export type InventoryMetricThresholdAlertInstanceContext = AlertInstanceContext; // no specific instance context used
+export type InventoryMetricThresholdRuleTypeState = RuleTypeState; // no specific state used
+export type InventoryMetricThresholdAlertState = AlertState; // no specific state used
+export type InventoryMetricThresholdAlertContext = AlertContext; // no specific instance context used
 
-type InventoryMetricThresholdAlertInstance = AlertInstance<
-  InventoryMetricThresholdAlertInstanceState,
-  InventoryMetricThresholdAlertInstanceContext,
+type InventoryMetricThresholdAlert = Alert<
+  InventoryMetricThresholdAlertState,
+  InventoryMetricThresholdAlertContext,
   InventoryMetricThresholdAllowedActionGroups
 >;
-type InventoryMetricThresholdAlertInstanceFactory = (
+type InventoryMetricThresholdAlertFactory = (
   id: string,
   reason: string,
   threshold?: number | undefined,
   value?: number | undefined
-) => InventoryMetricThresholdAlertInstance;
+) => InventoryMetricThresholdAlert;
 
 export const createInventoryMetricThresholdExecutor = (libs: InfraBackendLibs) =>
   libs.metricsRules.createLifecycleRuleExecutor<
     InventoryMetricThresholdParams & Record<string, unknown>,
-    InventoryMetricThresholdAlertTypeState,
-    InventoryMetricThresholdAlertInstanceState,
-    InventoryMetricThresholdAlertInstanceContext,
+    InventoryMetricThresholdRuleTypeState,
+    InventoryMetricThresholdAlertState,
+    InventoryMetricThresholdAlertContext,
     InventoryMetricThresholdAllowedActionGroups
   >(async ({ services, params }) => {
     const { criteria, filterQuery, sourceId, nodeType, alertOnNoData } = params;
     if (criteria.length === 0) throw new Error('Cannot execute an alert with 0 conditions');
     const { alertWithLifecycle, savedObjectsClient } = services;
-    const alertInstanceFactory: InventoryMetricThresholdAlertInstanceFactory = (id, reason) =>
+    const alertFactory: InventoryMetricThresholdAlertFactory = (id, reason) =>
       alertWithLifecycle({
         id,
         fields: {
@@ -82,8 +85,8 @@ export const createInventoryMetricThresholdExecutor = (libs: InfraBackendLibs) =
       } catch (e) {
         const actionGroupId = FIRED_ACTIONS.id; // Change this to an Error action group when able
         const reason = buildInvalidQueryAlertReason(params.filterQueryText);
-        const alertInstance = alertInstanceFactory('*', reason);
-        alertInstance.scheduleActions(actionGroupId, {
+        const alert = alertFactory('*', reason);
+        alert.scheduleActions(actionGroupId, {
           group: '*',
           alertState: stateToAlertMessage[AlertStates.ERROR],
           reason,
@@ -191,8 +194,8 @@ export const createInventoryMetricThresholdExecutor = (libs: InfraBackendLibs) =
             ? WARNING_ACTIONS.id
             : FIRED_ACTIONS.id;
 
-        const alertInstance = alertInstanceFactory(`${group}`, reason);
-        alertInstance.scheduleActions(
+        const alert = alertFactory(`${group}`, reason);
+        alert.scheduleActions(
           /**
            * TODO: We're lying to the compiler here as explicitly  calling `scheduleActions` on
            * the RecoveredActionGroup isn't allowed

x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_alert_type.ts → x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/register_inventory_metric_threshold_rule_type.ts

@@ -58,7 +58,7 @@ const condition = schema.object({
   ),
 });
 
-export async function registerMetricInventoryThresholdAlertType(
+export async function registerMetricInventoryThresholdRuleType(
   alertingPlugin: PluginSetupContract,
   libs: InfraBackendLibs
 ) {

x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts

@@ -22,7 +22,7 @@ import {
   Criterion,
   UngroupedSearchQueryResponse,
   GroupedSearchQueryResponse,
-} from '../../../../common/alerting/logs/log_threshold/types';
+} from '../../../../common/alerting/logs/log_threshold';
 import { alertsMock } from '../../../../../alerting/server/mocks';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
@@ -407,7 +407,7 @@ describe('Log threshold executor', () => {
   describe('Results processors', () => {
     describe('Can process ungrouped results', () => {
       test('It handles the ALERT state correctly', () => {
-        const alertInstanceUpdaterMock = jest.fn();
+        const alertUpdaterMock = jest.fn();
         const alertParams = {
           ...baseAlertParams,
           criteria: [positiveCriteria[0]],
@@ -423,12 +423,12 @@ describe('Log threshold executor', () => {
           results,
           alertParams,
           alertsMock.createAlertInstanceFactory,
-          alertInstanceUpdaterMock
+          alertUpdaterMock
         );
         // First call, second argument
-        expect(alertInstanceUpdaterMock.mock.calls[0][1]).toBe(AlertStates.ALERT);
+        expect(alertUpdaterMock.mock.calls[0][1]).toBe(AlertStates.ALERT);
         // First call, third argument
-        expect(alertInstanceUpdaterMock.mock.calls[0][2]).toEqual([
+        expect(alertUpdaterMock.mock.calls[0][2]).toEqual([
           {
             actionGroup: 'logs.threshold.fired',
             context: {
@@ -444,7 +444,7 @@ describe('Log threshold executor', () => {
 
     describe('Can process grouped results', () => {
       test('It handles the ALERT state correctly', () => {
-        const alertInstanceUpdaterMock = jest.fn();
+        const alertUpdaterMock = jest.fn();
         const alertParams = {
           ...baseAlertParams,
           criteria: [positiveCriteria[0]],
@@ -487,13 +487,13 @@ describe('Log threshold executor', () => {
           results,
           alertParams,
           alertsMock.createAlertInstanceFactory,
-          alertInstanceUpdaterMock
+          alertUpdaterMock
         );
-        expect(alertInstanceUpdaterMock.mock.calls.length).toBe(2);
+        expect(alertUpdaterMock.mock.calls.length).toBe(2);
         // First call, second argument
-        expect(alertInstanceUpdaterMock.mock.calls[0][1]).toBe(AlertStates.ALERT);
+        expect(alertUpdaterMock.mock.calls[0][1]).toBe(AlertStates.ALERT);
         // First call, third argument
-        expect(alertInstanceUpdaterMock.mock.calls[0][2]).toEqual([
+        expect(alertUpdaterMock.mock.calls[0][2]).toEqual([
           {
             actionGroup: 'logs.threshold.fired',
             context: {
@@ -506,9 +506,9 @@ describe('Log threshold executor', () => {
         ]);
 
         // Second call, second argument
-        expect(alertInstanceUpdaterMock.mock.calls[1][1]).toBe(AlertStates.ALERT);
+        expect(alertUpdaterMock.mock.calls[1][1]).toBe(AlertStates.ALERT);
         // Second call, third argument
-        expect(alertInstanceUpdaterMock.mock.calls[1][2]).toEqual([
+        expect(alertUpdaterMock.mock.calls[1][2]).toEqual([
           {
             actionGroup: 'logs.threshold.fired',
             context: {