[RAM] add observability feature for server less

config/serverless.oblt.yml

@@ -25,6 +25,11 @@ xpack.serverless.plugin.developer.projectSwitcher.currentType: 'observability'
 ## Disable adding the component template `.fleet_agent_id_verification-1` to every index template for each datastream for each integration
 xpack.fleet.agentIdVerificationEnabled: false
 
+## Enable the capability for the observability feature ID in the serverless environment to take ownership of the rules.
+xpack.observability.createO11yGenericFeatureId: true
+xpack.apm.rules.useO11yFeatureIdAsOwner: true
+xpack.observability.slo.rules.useO11yFeatureIdAsOwner: true
+
 ## APM Serverless Onboarding flow
 xpack.apm.serverlessOnboarding: true
 

packages/kbn-rule-data-utils/src/rule_types/o11y_rules.ts

@@ -7,3 +7,10 @@
  */
 
 export const OBSERVABILITY_THRESHOLD_RULE_TYPE_ID = 'observability.rules.custom_threshold';
+
+export enum ApmRuleType {
+  ErrorCount = 'apm.error_rate', // ErrorRate was renamed to ErrorCount but the key is kept as `error_rate` for backwards-compat.
+  TransactionErrorRate = 'apm.transaction_error_rate',
+  TransactionDuration = 'apm.transaction_duration',
+  Anomaly = 'apm.anomaly',
+}

x-pack/plugins/apm/common/rules/apm_rule_types.ts

@@ -16,6 +16,7 @@ import type { ActionGroup } from '@kbn/alerting-plugin/common';
 import { formatDurationFromTimeUnitChar } from '@kbn/observability-plugin/common';
 import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
 import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
+import { ApmRuleType } from '@kbn/rule-data-utils';
 import {
   ERROR_GROUP_ID,
   ERROR_GROUP_NAME,
@@ -28,13 +29,6 @@ import { getEnvironmentLabel } from '../environment_filter_values';
 
 export const APM_SERVER_FEATURE_ID = 'apm';
 
-export enum ApmRuleType {
-  ErrorCount = 'apm.error_rate', // ErrorRate was renamed to ErrorCount but the key is kept as `error_rate` for backwards-compat.
-  TransactionErrorRate = 'apm.transaction_error_rate',
-  TransactionDuration = 'apm.transaction_duration',
-  Anomaly = 'apm.anomaly',
-}
-
 export enum AggregationType {
   Avg = 'avg',
   P95 = '95th',

x-pack/plugins/apm/common/rules/get_all_groupby_fields.ts

@@ -6,7 +6,7 @@
  */
 
 import { union } from 'lodash';
-import { ApmRuleType } from './apm_rule_types';
+import { ApmRuleType } from '@kbn/rule-data-utils';
 import {
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,

x-pack/plugins/apm/common/rules/schema.ts

@@ -7,7 +7,8 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
-import { AggregationType, ApmRuleType } from './apm_rule_types';
+import { ApmRuleType } from '@kbn/rule-data-utils';
+import { AggregationType } from './apm_rule_types';
 
 export const searchConfigurationSchema = schema.object({
   query: schema.object({

x-pack/plugins/apm/public/components/alerting/rule_types/register_apm_rule_types.ts

@@ -7,13 +7,12 @@
 
 import { i18n } from '@kbn/i18n';
 import { lazy } from 'react';
-import { ALERT_REASON } from '@kbn/rule-data-utils';
+import { ALERT_REASON, ApmRuleType } from '@kbn/rule-data-utils';
 import type { ObservabilityRuleTypeRegistry } from '@kbn/observability-plugin/public';
 import {
   getAlertUrlErrorCount,
   getAlertUrlTransaction,
 } from '../../../../common/utils/formatters';
-import { ApmRuleType } from '../../../../common/rules/apm_rule_types';
 import {
   anomalyMessage,
   errorCountMessage,

x-pack/plugins/apm/public/components/alerting/ui_components/alerting_flyout/index.tsx

@@ -7,10 +7,8 @@
 
 import React, { useCallback, useMemo } from 'react';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import {
-  ApmRuleType,
-  APM_SERVER_FEATURE_ID,
-} from '../../../../../common/rules/apm_rule_types';
+import { ApmRuleType } from '@kbn/rule-data-utils';
+import { APM_SERVER_FEATURE_ID } from '../../../../../common/rules/apm_rule_types';
 import { getInitialAlertValues } from '../../utils/get_initial_alert_values';
 import { ApmPluginStartDeps } from '../../../../plugin';
 import { useServiceName } from '../../../../hooks/use_service_name';
@@ -70,6 +68,7 @@ export function AlertingFlyout(props: Props) {
           start,
           end,
         } as AlertMetadata,
+        useRuleProducer: true,
       }),
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
     [

x-pack/plugins/apm/public/components/alerting/utils/get_initial_alert_values.test.ts

@@ -6,10 +6,8 @@
  */
 
 import { getInitialAlertValues } from './get_initial_alert_values';
-import {
-  ApmRuleType,
-  RULE_TYPES_CONFIG,
-} from '../../../../common/rules/apm_rule_types';
+import { RULE_TYPES_CONFIG } from '../../../../common/rules/apm_rule_types';
+import { ApmRuleType } from '@kbn/rule-data-utils';
 
 test('handles null rule type and undefined service name', () => {
   expect(getInitialAlertValues(null, undefined)).toEqual({ tags: ['apm'] });

x-pack/plugins/apm/public/components/alerting/utils/get_initial_alert_values.ts

@@ -5,10 +5,8 @@
  * 2.0.
  */
 
-import {
-  ApmRuleType,
-  RULE_TYPES_CONFIG,
-} from '../../../../common/rules/apm_rule_types';
+import { ApmRuleType } from '@kbn/rule-data-utils';
+import { RULE_TYPES_CONFIG } from '../../../../common/rules/apm_rule_types';
 
 export function getInitialAlertValues(
   ruleType: ApmRuleType | null,

x-pack/plugins/apm/public/components/app/alerts_overview/index.tsx

@@ -110,7 +110,7 @@ export function AlertsOverview() {
               }
               id={'service-overview-alerts'}
               configurationId={AlertConsumers.OBSERVABILITY}
-              featureIds={[AlertConsumers.APM]}
+              featureIds={[AlertConsumers.APM, AlertConsumers.OBSERVABILITY]}
               query={esQuery}
               showAlertStatusWithFlapping
             />

x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/alerting_popover_flyout.tsx

@@ -13,7 +13,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
-import { ApmRuleType } from '../../../../../common/rules/apm_rule_types';
+import { ApmRuleType } from '@kbn/rule-data-utils';
 import { AlertingFlyout } from '../../../alerting/ui_components/alerting_flyout';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
 

x-pack/plugins/apm/server/feature.ts

@@ -14,10 +14,8 @@ import {
 } from '@kbn/licensing-plugin/server';
 
 import { APM_INDEX_SETTINGS_SAVED_OBJECT_TYPE } from '@kbn/apm-data-access-plugin/server/saved_objects/apm_indices';
-import {
-  ApmRuleType,
-  APM_SERVER_FEATURE_ID,
-} from '../common/rules/apm_rule_types';
+import { ApmRuleType } from '@kbn/rule-data-utils';
+import { APM_SERVER_FEATURE_ID } from '../common/rules/apm_rule_types';
 
 const ruleTypes = Object.values(ApmRuleType);
 

x-pack/plugins/apm/server/index.ts

@@ -80,6 +80,9 @@ const configSchema = schema.object({
       options: { defaultValue: schema.contextRef('serverless') },
     }),
   }),
+  rules: schema.object({
+    useO11yFeatureIdAsOwner: schema.boolean({ defaultValue: false }),
+  }),
 });
 
 // plugin config

x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.ts

@@ -12,6 +12,7 @@ import datemath from '@kbn/datemath';
 import type { ESSearchResponse } from '@kbn/es-types';
 import {
   getAlertUrl,
+  observabilityFeatureId,
   observabilityPaths,
   ProcessorEvent,
 } from '@kbn/observability-plugin/common';
@@ -21,6 +22,7 @@ import {
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
   ALERT_SEVERITY,
+  ApmRuleType,
 } from '@kbn/rule-data-utils';
 import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
 import { addSpaceIdToPath } from '@kbn/spaces-plugin/common';
@@ -43,7 +45,7 @@ import {
 } from '../../../../../common/environment_filter_values';
 import {
   ANOMALY_ALERT_SEVERITY_TYPES,
-  ApmRuleType,
+  APM_SERVER_FEATURE_ID,
   formatAnomalyReason,
   RULE_TYPES_CONFIG,
 } from '../../../../../common/rules/apm_rule_types';
@@ -63,6 +65,7 @@ const ruleTypeConfig = RULE_TYPES_CONFIG[ApmRuleType.Anomaly];
 export function registerAnomalyRuleType({
   alerting,
   alertsLocator,
+  apmConfig,
   getApmIndices,
   basePath,
   logger,
@@ -94,7 +97,9 @@ export function registerAnomalyRuleType({
         ],
       },
       category: DEFAULT_APP_CATEGORIES.observability.id,
-      producer: 'apm',
+      producer: apmConfig.rules.useO11yFeatureIdAsOwner
+        ? observabilityFeatureId
+        : APM_SERVER_FEATURE_ID,
       minimumLicenseRequired: 'basic',
       isExportable: true,
       executor: async ({

x-pack/plugins/apm/server/routes/alerts/rule_types/error_count/get_error_count_chart_preview.ts

@@ -11,6 +11,7 @@ import {
   termQuery,
 } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '@kbn/observability-plugin/common';
+import { ApmRuleType } from '@kbn/rule-data-utils';
 import {
   ERROR_GROUP_ID,
   PROCESSOR_EVENT,
@@ -21,7 +22,6 @@ import { environmentQuery } from '../../../../../common/utils/environment_query'
 import { APMEventClient } from '../../../../lib/helpers/create_es_client/create_apm_event_client';
 import { getGroupByTerms } from '../utils/get_groupby_terms';
 import { getAllGroupByFields } from '../../../../../common/rules/get_all_groupby_fields';
-import { ApmRuleType } from '../../../../../common/rules/apm_rule_types';
 import {
   BarSeriesDataMap,
   getFilteredBarSeries,

x-pack/plugins/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.ts

@@ -10,6 +10,7 @@ import { GetViewInAppRelativeUrlFnOpts } from '@kbn/alerting-plugin/server';
 import {
   formatDurationFromTimeUnitChar,
   getAlertUrl,
+  observabilityFeatureId,
   observabilityPaths,
   ProcessorEvent,
   TimeUnitChar,
@@ -18,6 +19,7 @@ import {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
+  ApmRuleType,
 } from '@kbn/rule-data-utils';
 import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
 import {
@@ -34,7 +36,6 @@ import {
   SERVICE_NAME,
 } from '../../../../../common/es_fields/apm';
 import {
-  ApmRuleType,
   APM_SERVER_FEATURE_ID,
   formatErrorCountReason,
   RULE_TYPES_CONFIG,
@@ -75,6 +76,7 @@ export const errorCountActionVariables = [
 export function registerErrorCountRuleType({
   alerting,
   alertsLocator,
+  apmConfig,
   basePath,
   getApmIndices,
   logger,
@@ -96,7 +98,9 @@ export function registerErrorCountRuleType({
         context: errorCountActionVariables,
       },
       category: DEFAULT_APP_CATEGORIES.observability.id,
-      producer: APM_SERVER_FEATURE_ID,
+      producer: apmConfig.rules.useO11yFeatureIdAsOwner
+        ? observabilityFeatureId
+        : APM_SERVER_FEATURE_ID,
       minimumLicenseRequired: 'basic',
       isExportable: true,
       executor: async ({

x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/get_transaction_duration_chart_preview.ts

@@ -11,10 +11,8 @@ import {
   rangeQuery,
   termQuery,
 } from '@kbn/observability-plugin/server';
-import {
-  AggregationType,
-  ApmRuleType,
-} from '../../../../../common/rules/apm_rule_types';
+import { ApmRuleType } from '@kbn/rule-data-utils';
+import { AggregationType } from '../../../../../common/rules/apm_rule_types';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,

x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.ts

@@ -12,6 +12,7 @@ import {
   asDuration,
   formatDurationFromTimeUnitChar,
   getAlertDetailsUrl,
+  observabilityFeatureId,
   observabilityPaths,
   ProcessorEvent,
   TimeUnitChar,
@@ -24,6 +25,7 @@ import {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
+  ApmRuleType,
 } from '@kbn/rule-data-utils';
 import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
 import { addSpaceIdToPath } from '@kbn/spaces-plugin/common';
@@ -38,7 +40,6 @@ import {
   TRANSACTION_TYPE,
 } from '../../../../../common/es_fields/apm';
 import {
-  ApmRuleType,
   APM_SERVER_FEATURE_ID,
   formatTransactionDurationReason,
   RULE_TYPES_CONFIG,
@@ -108,7 +109,9 @@ export function registerTransactionDurationRuleType({
       context: transactionDurationActionVariables,
     },
     category: DEFAULT_APP_CATEGORIES.observability.id,
-    producer: APM_SERVER_FEATURE_ID,
+    producer: apmConfig.rules.useO11yFeatureIdAsOwner
+      ? observabilityFeatureId
+      : APM_SERVER_FEATURE_ID,
     minimumLicenseRequired: 'basic',
     isExportable: true,
     executor: async ({

x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_error_rate/get_transaction_error_rate_chart_preview.ts

@@ -10,7 +10,7 @@ import {
   rangeQuery,
   termQuery,
 } from '@kbn/observability-plugin/server';
-import { ApmRuleType } from '../../../../../common/rules/apm_rule_types';
+import { ApmRuleType } from '@kbn/rule-data-utils';
 import {
   SERVICE_NAME,
   TRANSACTION_TYPE,

x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.ts

@@ -10,6 +10,7 @@ import { GetViewInAppRelativeUrlFnOpts } from '@kbn/alerting-plugin/server';
 import {
   formatDurationFromTimeUnitChar,
   getAlertUrl,
+  observabilityFeatureId,
   observabilityPaths,
   ProcessorEvent,
   TimeUnitChar,
@@ -23,6 +24,7 @@ import {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
   ALERT_REASON,
+  ApmRuleType,
 } from '@kbn/rule-data-utils';
 import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
 import { addSpaceIdToPath } from '@kbn/spaces-plugin/common';
@@ -39,7 +41,6 @@ import {
 } from '../../../../../common/es_fields/apm';
 import { EventOutcome } from '../../../../../common/event_outcome';
 import {
-  ApmRuleType,
   APM_SERVER_FEATURE_ID,
   formatTransactionErrorRateReason,
   RULE_TYPES_CONFIG,
@@ -105,7 +106,9 @@ export function registerTransactionErrorRateRuleType({
         context: transactionErrorRateActionVariables,
       },
       category: DEFAULT_APP_CATEGORIES.observability.id,
-      producer: APM_SERVER_FEATURE_ID,
+      producer: apmConfig.rules.useO11yFeatureIdAsOwner
+        ? observabilityFeatureId
+        : APM_SERVER_FEATURE_ID,
       minimumLicenseRequired: 'basic',
       isExportable: true,
       executor: async ({

x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts

@@ -56,7 +56,10 @@ export const createRuleTypeMocks = () => {
       publicBaseUrl: 'http://localhost:5601/eyr',
       serverBasePath: '/eyr',
     } as IBasePath,
-    apmConfig: { searchAggregatedTransactions: true } as any as APMConfig,
+    apmConfig: {
+      searchAggregatedTransactions: true,
+      rules: { useO11yFeatureIdAsOwner: false },
+    } as any as APMConfig,
     getApmIndices: async () => ({
       error: 'apm-*',
       transaction: 'apm-*',

x-pack/plugins/observability/common/constants.ts

@@ -60,4 +60,5 @@ export const observabilityAlertFeatureIds: ValidFeatureId[] = [
 export const observabilityRuleCreationValidConsumers: RuleCreationValidConsumer[] = [
   AlertConsumers.INFRASTRUCTURE,
   AlertConsumers.LOGS,
+  AlertConsumers.OBSERVABILITY,
 ];

x-pack/plugins/observability/public/components/custom_threshold/components/alert_flyout.tsx

@@ -39,6 +39,7 @@ export function AlertFlyout(props: Props) {
           series: props.series,
         },
         validConsumers: observabilityRuleCreationValidConsumers,
+        useRuleProducer: true,
       }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [triggersActionsUI, onCloseFlyout]

x-pack/plugins/observability/public/pages/slo_details/components/header_control.tsx

@@ -250,6 +250,7 @@ export function HeaderControl({ isLoading, slo }: Props) {
           canChangeTrigger={false}
           onClose={onCloseRuleFlyout}
           initialValues={{ name: `${slo.name} burn rate`, params: { sloId: slo.id } }}
+          useRuleProducer
         />
       ) : null}