Merge branch 'main' into build/docker-upgrade-ubuntu

.buildkite/pipelines/on_merge.yml

@@ -187,6 +187,18 @@ steps:
         - exit_status: '*'
           limit: 1
 
+  - command: .buildkite/scripts/steps/functional/osquery_cypress.sh
+    label: 'Osquery Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 50
+    parallelism: 6
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
   - command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
     label: Trigger unsupported ftr tests
     timeout_in_minutes: 10

.buildkite/pipelines/on_merge_unsupported_ftrs.yml

@@ -63,15 +63,3 @@ steps:
           limit: 3
         - exit_status: '*'
           limit: 1
-
-  - command: .buildkite/scripts/steps/functional/osquery_cypress.sh
-    label: 'Osquery Cypress Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 50
-    parallelism: 6
-    retry:
-      automatic:
-        - exit_status: '*'
-          limit: 1

.buildkite/pipelines/pull_request/base.yml

@@ -187,6 +187,18 @@ steps:
         - exit_status: '*'
           limit: 1
 
+  - command: .buildkite/scripts/steps/functional/osquery_cypress.sh
+    label: 'Osquery Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 50
+    parallelism: 6
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
   - command: .buildkite/scripts/steps/functional/security_solution_burn.sh
     label: 'Security Solution Cypress tests, burning changed specs'
     agents:
@@ -198,6 +210,28 @@ steps:
       automatic: false
     soft_fail: true
 
+  - command: .buildkite/scripts/steps/functional/osquery_cypress_burn.sh
+    label: 'Osquery Cypress Tests, burning changed specs'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 50
+    soft_fail: true
+    retry:
+      automatic: false
+
+  - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
+    label: 'Serverless Osquery Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 50
+    parallelism: 6
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
   # status_exception: Native role management is not enabled in this Elasticsearch instance
   # - command: .buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
   #   label: 'Serverless Security Defend Workflows Cypress Tests'

.buildkite/scripts/pipelines/pull_request/pipeline.ts

@@ -151,14 +151,6 @@ const uploadPipeline = (pipelineContent: string | object) => {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/webpack_bundle_analyzer.yml'));
     }
 
-    if (
-      ((await doAnyChangesMatch([/^x-pack\/plugins\/osquery/, /^x-pack\/test\/osquery_cypress/])) ||
-        GITHUB_PR_LABELS.includes('ci:all-cypress-suites')) &&
-      !GITHUB_PR_LABELS.includes('ci:skip-cypress-osquery')
-    ) {
-      pipeline.push(getPipeline('.buildkite/pipelines/pull_request/osquery_cypress.yml'));
-    }
-
     if (
       (await doAnyChangesMatch([
         /\.docnav\.json$/,

x-pack/plugins/alerting/common/routes/rules_settings/apis/get/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export type { GetQueryDelaySettingsResponse } from './types/latest';
+
+export type { GetQueryDelaySettingsResponse as GetQueryDelaySettingsResponseV1 } from './types/v1';

x-pack/plugins/alerting/common/routes/rules_settings/apis/get/types/latest.ts

@@ -0,0 +1,8 @@
+/*
+ * 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.
+ */
+
+export type { GetQueryDelaySettingsResponse } from './v1';

x-pack/plugins/alerting/common/routes/rules_settings/apis/get/types/v1.ts

@@ -0,0 +1,11 @@
+/*
+ * 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 type { TypeOf } from '@kbn/config-schema';
+import { queryDelaySettingsResponseSchemaV1 } from '../../../response';
+
+export type GetQueryDelaySettingsResponse = TypeOf<typeof queryDelaySettingsResponseSchemaV1>;

x-pack/plugins/alerting/common/routes/rules_settings/apis/update/index.ts

@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+export { updateQueryDelaySettingsBodySchema } from './schemas/latest';
+export type {
+  UpdateQueryDelaySettingsRequestBody,
+  UpdateQueryDelaySettingsResponse,
+} from './types/latest';
+
+export { updateQueryDelaySettingsBodySchema as updateQueryDelaySettingsBodySchemaV1 } from './schemas/v1';
+export type {
+  UpdateQueryDelaySettingsRequestBody as UpdateQueryDelaySettingsRequestBodyV1,
+  UpdateQueryDelaySettingsResponse as UpdateQueryDelaySettingsResponseV1,
+} from './types/v1';

x-pack/plugins/alerting/common/routes/rules_settings/apis/update/schemas/latest.ts

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

x-pack/plugins/alerting/common/routes/rules_settings/apis/update/schemas/v1.ts

@@ -0,0 +1,12 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+
+export const updateQueryDelaySettingsBodySchema = schema.object({
+  delay: schema.number(),
+});

x-pack/plugins/alerting/common/routes/rules_settings/apis/update/types/latest.ts

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

x-pack/plugins/alerting/common/routes/rules_settings/apis/update/types/v1.ts

@@ -0,0 +1,16 @@
+/*
+ * 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 type { TypeOf } from '@kbn/config-schema';
+import { queryDelaySettingsResponseSchemaV1 } from '../../../response';
+import { updateQueryDelaySettingsBodySchemaV1 } from '..';
+
+export type UpdateQueryDelaySettingsRequestBody = TypeOf<
+  typeof updateQueryDelaySettingsBodySchemaV1
+>;
+
+export type UpdateQueryDelaySettingsResponse = TypeOf<typeof queryDelaySettingsResponseSchemaV1>;

x-pack/plugins/alerting/common/routes/rules_settings/response/index.ts

@@ -0,0 +1,12 @@
+/*
+ * 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.
+ */
+
+export { queryDelaySettingsResponseSchema } from './schemas/latest';
+export type { QueryDelaySettingsResponse } from './types/latest';
+
+export { queryDelaySettingsResponseSchema as queryDelaySettingsResponseSchemaV1 } from './schemas/v1';
+export type { QueryDelaySettingsResponse as QueryDelaySettingsResponseV1 } from './types/v1';

x-pack/plugins/alerting/common/routes/rules_settings/response/schemas/latest.ts

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

x-pack/plugins/alerting/common/routes/rules_settings/response/schemas/v1.ts

@@ -0,0 +1,20 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+
+export const queryDelaySettingsResponseBodySchema = schema.object({
+  delay: schema.number(),
+  created_by: schema.nullable(schema.string()),
+  updated_by: schema.nullable(schema.string()),
+  created_at: schema.string(),
+  updated_at: schema.string(),
+});
+
+export const queryDelaySettingsResponseSchema = schema.object({
+  body: queryDelaySettingsResponseBodySchema,
+});

x-pack/plugins/alerting/common/routes/rules_settings/response/types/latest.ts

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

x-pack/plugins/alerting/common/routes/rules_settings/response/types/v1.ts

@@ -0,0 +1,11 @@
+/*
+ * 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 type { TypeOf } from '@kbn/config-schema';
+import { queryDelaySettingsResponseSchemaV1 } from '..';
+
+export type QueryDelaySettingsResponse = TypeOf<typeof queryDelaySettingsResponseSchemaV1>;

x-pack/plugins/alerting/common/rules_settings.ts

@@ -20,29 +20,51 @@ export interface RulesSettingsFlappingProperties {
 export type RulesSettingsFlapping = RulesSettingsFlappingProperties &
   RulesSettingsModificationMetadata;
 
+export interface RulesSettingsQueryDelayProperties {
+  delay: number;
+}
+
+export type RulesSettingsQueryDelay = RulesSettingsQueryDelayProperties &
+  RulesSettingsModificationMetadata;
+
+export interface RulesSettingsProperties {
+  flapping?: RulesSettingsFlappingProperties;
+  queryDelay?: RulesSettingsQueryDelayProperties;
+}
+
 export interface RulesSettings {
-  flapping: RulesSettingsFlapping;
+  flapping?: RulesSettingsFlapping;
+  queryDelay?: RulesSettingsQueryDelay;
 }
 
 export const MIN_LOOK_BACK_WINDOW = 2;
 export const MAX_LOOK_BACK_WINDOW = 20;
 export const MIN_STATUS_CHANGE_THRESHOLD = 2;
 export const MAX_STATUS_CHANGE_THRESHOLD = 20;
+export const MIN_QUERY_DELAY = 0;
+export const MAX_QUERY_DELAY = 60;
 
 export const RULES_SETTINGS_FEATURE_ID = 'rulesSettings';
 export const ALL_FLAPPING_SETTINGS_SUB_FEATURE_ID = 'allFlappingSettings';
 export const READ_FLAPPING_SETTINGS_SUB_FEATURE_ID = 'readFlappingSettings';
+export const ALL_QUERY_DELAY_SETTINGS_SUB_FEATURE_ID = 'allQueryDelaySettings';
+export const READ_QUERY_DELAY_SETTINGS_SUB_FEATURE_ID = 'readQueryDelaySettings';
 
 export const API_PRIVILEGES = {
   READ_FLAPPING_SETTINGS: 'read-flapping-settings',
   WRITE_FLAPPING_SETTINGS: 'write-flapping-settings',
+  READ_QUERY_DELAY_SETTINGS: 'read-query-delay-settings',
+  WRITE_QUERY_DELAY_SETTINGS: 'write-query-delay-settings',
 };
 
 export const RULES_SETTINGS_SAVED_OBJECT_TYPE = 'rules-settings';
-export const RULES_SETTINGS_SAVED_OBJECT_ID = 'rules-settings';
+export const RULES_SETTINGS_FLAPPING_SAVED_OBJECT_ID = 'rules-settings';
+export const RULES_SETTINGS_QUERY_DELAY_SAVED_OBJECT_ID = 'query-delay-settings';
 
 export const DEFAULT_LOOK_BACK_WINDOW = 20;
 export const DEFAULT_STATUS_CHANGE_THRESHOLD = 4;
+export const DEFAULT_QUERY_DELAY = 0;
+export const DEFAULT_SERVERLESS_QUERY_DELAY = 15;
 
 export const DEFAULT_FLAPPING_SETTINGS: RulesSettingsFlappingProperties = {
   enabled: true,
@@ -54,3 +76,10 @@ export const DISABLE_FLAPPING_SETTINGS: RulesSettingsFlappingProperties = {
   ...DEFAULT_FLAPPING_SETTINGS,
   enabled: false,
 };
+
+export const DEFAULT_QUERY_DELAY_SETTINGS: RulesSettingsQueryDelayProperties = {
+  delay: DEFAULT_QUERY_DELAY,
+};
+export const DEFAULT_SERVERLESS_QUERY_DELAY_SETTINGS: RulesSettingsQueryDelayProperties = {
+  delay: DEFAULT_SERVERLESS_QUERY_DELAY,
+};