[RAM] .es-query and .observability.rules.threshold RBAC

packages/kbn-rule-data-utils/index.ts

@@ -14,3 +14,4 @@ export * from './src/alerts_as_data_severity';
 export * from './src/alerts_as_data_status';
 export * from './src/alerts_as_data_cases';
 export * from './src/routes/stack_rule_paths';
+export * from './src/rule_types';

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

@@ -0,0 +1,10 @@
+/*
+ * 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.
+ */
+
+export * from './stack_rules';
+export * from './o11y_rules';

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

@@ -0,0 +1,9 @@
+/*
+ * 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.
+ */
+
+export const OBSERVABILITY_THRESHOLD_RULE_TYPE_ID = 'observability.rules.custom_threshold';

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

@@ -0,0 +1,10 @@
+/*
+ * 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.
+ */
+
+export const STACK_ALERTS_FEATURE_ID = 'stackAlerts';
+export const ES_QUERY_ID = '.es-query';

src/plugins/discover/public/application/main/components/top_nav/open_alerts_popover.tsx

@@ -13,6 +13,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import type { DataView } from '@kbn/data-plugin/common';
 import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { STACK_ALERTS_FEATURE_ID } from '@kbn/rule-data-utils';
 import { DiscoverStateContainer } from '../../services/discover_state';
 import { DiscoverServices } from '../../../../build_services';
 
@@ -97,7 +98,7 @@ export function AlertsPopover({
 
     return triggersActionsUi?.getAddRuleFlyout({
       metadata: discoverMetadata,
-      consumer: 'discover',
+      consumer: STACK_ALERTS_FEATURE_ID,
       onClose: (_, metadata) => {
         onFinishFlyoutInteraction(metadata as EsQueryAlertMetaData);
         onClose();

src/plugins/discover/tsconfig.json

@@ -72,6 +72,7 @@
     "@kbn/react-kibana-context-render",
     "@kbn/unified-data-table",
     "@kbn/no-data-page-plugin",
+    "@kbn/rule-data-utils",
     "@kbn/global-search-plugin"
   ],
   "exclude": [

x-pack/plugins/alerting/common/routes/rule/apis/aggregate/schemas/v1.ts

@@ -24,6 +24,7 @@ export const aggregateRulesRequestBodySchema = schema.object({
     )
   ),
   filter: schema.maybe(schema.string()),
+  filter_consumers: schema.maybe(schema.arrayOf(schema.string())),
 });
 
 export const aggregateRulesResponseBodySchema = schema.object({

x-pack/plugins/alerting/public/alert_navigation_registry/types.ts

@@ -16,4 +16,4 @@ import { SanitizedRule } from '../../common';
  * originally registered to {@link PluginSetupContract.registerNavigation}.
  *
  */
-export type AlertNavigationHandler = (rule: SanitizedRule) => string;
+export type AlertNavigationHandler = (rule: SanitizedRule) => string | undefined;

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

@@ -138,7 +138,8 @@ export class AlertingPublicPlugin
 
         if (this.alertNavigationRegistry!.has(rule.consumer, ruleType)) {
           const navigationHandler = this.alertNavigationRegistry!.get(rule.consumer, ruleType);
-          return navigationHandler(rule);
+          const navUrl = navigationHandler(rule);
+          if (navUrl) return navUrl;
         }
 
         if (rule.viewInAppRelativeUrl) {

x-pack/plugins/alerting/server/alerts_client/alerts_client.test.ts

@@ -61,6 +61,7 @@ const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
     mappings: { fieldMap: { field: { type: 'keyword', required: false } } },
     shouldWrite: true,
   },
+  validLegacyConsumers: [],
 };
 
 const mockLegacyAlertsClient = legacyAlertsClientMock.create();

x-pack/plugins/alerting/server/alerts_client/legacy_alerts_client.test.ts

@@ -99,6 +99,7 @@ const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
   validate: {
     params: schema.any(),
   },
+  validLegacyConsumers: [],
 };
 
 const testAlert1 = {

x-pack/plugins/alerting/server/alerts_client/lib/format_rule.test.ts

@@ -29,6 +29,7 @@ const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
     mappings: { fieldMap: { field: { type: 'keyword', required: false } } },
     shouldWrite: true,
   },
+  validLegacyConsumers: [],
 };
 
 describe('formatRule', () => {

x-pack/plugins/alerting/server/alerts_service/alerts_service.test.ts

@@ -203,6 +203,7 @@ const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
   validate: {
     params: { validate: (params) => params },
   },
+  validLegacyConsumers: [],
 };
 
 const ruleTypeWithAlertDefinition: jest.Mocked<UntypedNormalizedRuleType> = {

x-pack/plugins/alerting/server/application/rule/methods/aggregate/aggregate_rules.test.ts

@@ -82,6 +82,7 @@ describe('aggregate()', () => {
       enabledInLicense: true,
       hasAlertsMappings: false,
       hasFieldsForAAD: false,
+      validLegacyConsumers: [],
     },
   ]);
   beforeEach(() => {
@@ -166,6 +167,7 @@ describe('aggregate()', () => {
           enabledInLicense: true,
           hasAlertsMappings: false,
           hasFieldsForAAD: false,
+          validLegacyConsumers: [],
         },
       ])
     );

x-pack/plugins/alerting/server/application/rule/methods/aggregate/aggregate_rules.ts

@@ -6,6 +6,7 @@
  */
 
 import { KueryNode, nodeBuilder } from '@kbn/es-query';
+import { isEmpty } from 'lodash';
 import { findRulesSo } from '../../../../data/rule';
 import { AlertingAuthorizationEntity } from '../../../../authorization';
 import { ruleAuditEvent, RuleAuditAction } from '../../../../rules_client/common/audit_events';
@@ -21,13 +22,14 @@ export async function aggregateRules<T = Record<string, unknown>>(
   params: AggregateParams<T>
 ): Promise<T> {
   const { options = {}, aggs } = params;
-  const { filter, page = 1, perPage = 0, ...restOptions } = options;
+  const { filter, page = 1, perPage = 0, filterConsumers, ...restOptions } = options;
 
   let authorizationTuple;
   try {
     authorizationTuple = await context.authorization.getFindAuthorizationFilter(
       AlertingAuthorizationEntity.Rule,
-      alertingAuthorizationFilterOpts
+      alertingAuthorizationFilterOpts,
+      isEmpty(filterConsumers) ? undefined : new Set(filterConsumers)
     );
     validateRuleAggregationFields(aggs);
     aggregateOptionsSchema.validate(options);

x-pack/plugins/alerting/server/application/rule/methods/aggregate/schemas/aggregate_options_schema.ts

@@ -16,6 +16,7 @@ export const aggregateOptionsSchema = schema.object({
       id: schema.string(),
     })
   ),
+  filterConsumers: schema.maybe(schema.arrayOf(schema.string())),
   // filter type is `string | KueryNode`, but `KueryNode` has no schema to import yet
   filter: schema.maybe(
     schema.oneOf([schema.string(), schema.recordOf(schema.string(), schema.any())])

x-pack/plugins/alerting/server/application/rule/methods/aggregate/types/index.ts

@@ -19,6 +19,7 @@ export type AggregateOptions = TypeOf<typeof aggregateOptionsSchema> & {
   filter?: string | KueryNode;
   page?: AggregateOptionsSchemaTypes['page'];
   perPage?: AggregateOptionsSchemaTypes['perPage'];
+  filterConsumers?: string[];
 };
 
 export interface AggregateParams<AggregationResult> {

x-pack/plugins/alerting/server/application/rule/methods/bulk_edit/bulk_edit_rules.test.ts

@@ -243,6 +243,7 @@ describe('bulkEdit()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     });
 
     (migrateLegacyActions as jest.Mock).mockResolvedValue(migrateLegacyActionsMock);
@@ -745,6 +746,7 @@ describe('bulkEdit()', () => {
           mappings: { fieldMap: { field: { type: 'keyword', required: false } } },
           shouldWrite: true,
         },
+        validLegacyConsumers: [],
       });
       const existingAction = {
         frequency: {
@@ -2351,6 +2353,7 @@ describe('bulkEdit()', () => {
           return { state: {} };
         },
         producer: 'alerts',
+        validLegacyConsumers: [],
       });
 
       const result = await rulesClient.bulkEdit({
@@ -2395,6 +2398,7 @@ describe('bulkEdit()', () => {
           return { state: {} };
         },
         producer: 'alerts',
+        validLegacyConsumers: [],
       });
 
       const result = await rulesClient.bulkEdit({

x-pack/plugins/alerting/server/application/rule/methods/create/create_rule.test.ts

@@ -1551,6 +1551,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
     const data = getMockData({
       params: ruleParams,
@@ -1738,6 +1739,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
     const data = getMockData({
       params: ruleParams,
@@ -2557,6 +2559,7 @@ describe('create()', () => {
         return { state: {} };
       },
       producer: 'alerts',
+      validLegacyConsumers: [],
     });
     await expect(rulesClient.create({ data })).rejects.toThrowErrorMatchingInlineSnapshot(
       `"params invalid: [param1]: expected value of type [string] but got [undefined]"`
@@ -3031,6 +3034,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
     const createdAttributes = {
       ...data,
@@ -3103,6 +3107,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
 
     const data = getMockData({ schedule: { interval: '1s' } });
@@ -3140,6 +3145,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
 
     const data = getMockData({
@@ -3232,6 +3238,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
 
     const data = getMockData({
@@ -3281,6 +3288,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
 
     const data = getMockData({
@@ -3343,6 +3351,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
 
     const data = getMockData({
@@ -3423,6 +3432,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
 
     const data = getMockData({
@@ -3627,6 +3637,7 @@ describe('create()', () => {
         mappings: { fieldMap: { field: { type: 'keyword', required: false } } },
         shouldWrite: true,
       },
+      validLegacyConsumers: [],
     }));
 
     const data = getMockData({
@@ -3679,6 +3690,7 @@ describe('create()', () => {
       validate: {
         params: { validate: (params) => params },
       },
+      validLegacyConsumers: [],
     }));
 
     const data = getMockData({