diff --git a/docs/api-generated/rules/rule-apis-passthru.asciidoc b/docs/api-generated/rules/rule-apis-passthru.asciidoc index 65000212139e1..c4f472c161efe 100644 --- a/docs/api-generated/rules/rule-apis-passthru.asciidoc +++ b/docs/api-generated/rules/rule-apis-passthru.asciidoc @@ -144,6 +144,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -156,6 +157,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -442,6 +444,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -454,6 +457,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -510,6 +514,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -522,6 +527,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -693,6 +699,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -705,6 +712,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -2053,6 +2061,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -2065,6 +2074,7 @@ Any modifications made to this file will be overwritten. "params" : { "key" : "" }, + "uuid" : "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "connector_type_id" : ".server-log", "frequency" : { "summary" : true, @@ -2241,6 +2251,7 @@ Any modifications made to this file will be overwritten.
group (optional)
String The group name for the actions. If you don't need to group actions, set to default.
id (optional)
String The identifier for the connector saved object.
params (optional)
map[String, oas_any_type_not_mapped] The parameters for the action, which are sent to the connector. The params are handled as Mustache templates and passed a default set of context.
+
uuid (optional)
String A universally unique identifier (UUID) for the action.
diff --git a/x-pack/plugins/alerting/docs/openapi/bundled.json b/x-pack/plugins/alerting/docs/openapi/bundled.json index 5aecca94ab463..b17dbef7d29c3 100644 --- a/x-pack/plugins/alerting/docs/openapi/bundled.json +++ b/x-pack/plugins/alerting/docs/openapi/bundled.json @@ -2516,6 +2516,11 @@ "type": "object", "description": "The parameters for the action, which are sent to the connector. The `params` are handled as Mustache templates and passed a default set of context.", "additionalProperties": true + }, + "uuid": { + "type": "string", + "description": "A universally unique identifier (UUID) for the action.", + "example": "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61" } } } @@ -3025,6 +3030,7 @@ { "group": "threshold met", "id": "1007a0c0-7a6e-11ed-89d5-abec321c0def", + "uuid": "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "params": { "level": "info", "message": "alert {{alertName}} is active for group {{context.group}}:\n\n- Value: {{context.value}}\n- Conditions Met: {{context.conditions}} over {{params.timeWindowSize}}{{params.timeWindowUnit}}\n- Timestamp: {{context.date}", @@ -3142,6 +3148,7 @@ "message": "alert {{alertName}} is active for group {{context.group}}:\n\n- Value: {{context.value}}\n- Conditions Met: {{context.conditions}} over {{params.timeWindowSize}}{{params.timeWindowUnit}}\n- Timestamp: {{context.date}" }, "id": "96b668d0-a1b6-11ed-afdf-d39a49596974", + "uuid": "07aef2a0-9eed-4ef9-94ec-39ba58eb609d", "connector_type_id": ".server-log", "frequency": { "summary": false, @@ -3217,6 +3224,7 @@ { "group": "threshold met", "id": "dceeb5d0-6b41-11eb-802b-85b0c1bc8ba2", + "uuid": "07aef2a0-9eed-4ef9-94ec-39ba58eb609d", "frequency": { "notify_when": "onActionGroupChange", "summary": false, @@ -3331,6 +3339,7 @@ { "id": "9dca3e00-74f5-11ed-9801-35303b735aef", "group": "threshold met", + "uuid": "1c7a1280-f28c-4e06-96b2-e4e5f05d1d61", "params": { "level": "info", "message": "alert {{alertName}} is active for group {{context.group}}:\n\n- Value: {{context.value}}\n- Conditions Met: {{context.conditions}} over {{params.timeWindowSize}}{{params.timeWindowUnit}}\n- Timestamp: {{context.date}}", diff --git a/x-pack/plugins/alerting/docs/openapi/bundled.yaml b/x-pack/plugins/alerting/docs/openapi/bundled.yaml index dabd876958a3c..a734948511606 100644 --- a/x-pack/plugins/alerting/docs/openapi/bundled.yaml +++ b/x-pack/plugins/alerting/docs/openapi/bundled.yaml @@ -1603,6 +1603,10 @@ components: type: object description: The parameters for the action, which are sent to the connector. The `params` are handled as Mustache templates and passed a default set of context. additionalProperties: true + uuid: + type: string + description: A universally unique identifier (UUID) for the action. + example: 1c7a1280-f28c-4e06-96b2-e4e5f05d1d61 schedule: type: object description: The check interval, which specifies how frequently the rule conditions are checked. The interval is specified in seconds, minutes, hours, or days. @@ -1990,6 +1994,7 @@ components: actions: - group: threshold met id: 1007a0c0-7a6e-11ed-89d5-abec321c0def + uuid: 1c7a1280-f28c-4e06-96b2-e4e5f05d1d61 params: level: info message: |- @@ -2097,6 +2102,7 @@ components: - Conditions Met: {{context.conditions}} over {{params.timeWindowSize}}{{params.timeWindowUnit}} - Timestamp: {{context.date} id: 96b668d0-a1b6-11ed-afdf-d39a49596974 + uuid: 07aef2a0-9eed-4ef9-94ec-39ba58eb609d connector_type_id: .server-log frequency: summary: false @@ -2157,6 +2163,7 @@ components: actions: - group: threshold met id: dceeb5d0-6b41-11eb-802b-85b0c1bc8ba2 + uuid: 07aef2a0-9eed-4ef9-94ec-39ba58eb609d frequency: notify_when: onActionGroupChange summary: false @@ -2256,6 +2263,7 @@ components: actions: - id: 9dca3e00-74f5-11ed-9801-35303b735aef group: threshold met + uuid: 1c7a1280-f28c-4e06-96b2-e4e5f05d1d61 params: level: info message: |- diff --git a/x-pack/plugins/alerting/docs/openapi/components/examples/create_rule_response.yaml b/x-pack/plugins/alerting/docs/openapi/components/examples/create_rule_response.yaml index 63656e9f469a4..34e7e8e1e17b2 100644 --- a/x-pack/plugins/alerting/docs/openapi/components/examples/create_rule_response.yaml +++ b/x-pack/plugins/alerting/docs/openapi/components/examples/create_rule_response.yaml @@ -3,6 +3,7 @@ value: actions: - group: threshold met id: dceeb5d0-6b41-11eb-802b-85b0c1bc8ba2 + uuid: 07aef2a0-9eed-4ef9-94ec-39ba58eb609d frequency: notify_when: onActionGroupChange summary: false diff --git a/x-pack/plugins/alerting/docs/openapi/components/examples/find_rules_response.yaml b/x-pack/plugins/alerting/docs/openapi/components/examples/find_rules_response.yaml index ab013ff91d080..d16882b9711c3 100644 --- a/x-pack/plugins/alerting/docs/openapi/components/examples/find_rules_response.yaml +++ b/x-pack/plugins/alerting/docs/openapi/components/examples/find_rules_response.yaml @@ -45,6 +45,7 @@ value: actions: - id: 9dca3e00-74f5-11ed-9801-35303b735aef group: threshold met + uuid: 1c7a1280-f28c-4e06-96b2-e4e5f05d1d61 params: level: info message: "alert {{alertName}} is active for group {{context.group}}:\n\n- Value: {{context.value}}\n- Conditions Met: {{context.conditions}} over {{params.timeWindowSize}}{{params.timeWindowUnit}}\n- Timestamp: {{context.date}}" diff --git a/x-pack/plugins/alerting/docs/openapi/components/examples/get_rule_response.yaml b/x-pack/plugins/alerting/docs/openapi/components/examples/get_rule_response.yaml index 69cba60145697..724226aebe0b4 100644 --- a/x-pack/plugins/alerting/docs/openapi/components/examples/get_rule_response.yaml +++ b/x-pack/plugins/alerting/docs/openapi/components/examples/get_rule_response.yaml @@ -41,6 +41,7 @@ value: actions: - group: threshold met id: 1007a0c0-7a6e-11ed-89d5-abec321c0def + uuid: 1c7a1280-f28c-4e06-96b2-e4e5f05d1d61 params: level: info message: "alert {{alertName}} is active for group {{context.group}}:\n\n- Value: {{context.value}}\n- Conditions Met: {{context.conditions}} over {{params.timeWindowSize}}{{params.timeWindowUnit}}\n- Timestamp: {{context.date}" diff --git a/x-pack/plugins/alerting/docs/openapi/components/examples/update_rule_response.yaml b/x-pack/plugins/alerting/docs/openapi/components/examples/update_rule_response.yaml index de01c66700d6d..2d0f56a04b6b7 100644 --- a/x-pack/plugins/alerting/docs/openapi/components/examples/update_rule_response.yaml +++ b/x-pack/plugins/alerting/docs/openapi/components/examples/update_rule_response.yaml @@ -41,6 +41,7 @@ value: level: info message: "alert {{alertName}} is active for group {{context.group}}:\n\n- Value: {{context.value}}\n- Conditions Met: {{context.conditions}} over {{params.timeWindowSize}}{{params.timeWindowUnit}}\n- Timestamp: {{context.date}" id: 96b668d0-a1b6-11ed-afdf-d39a49596974 + uuid: 07aef2a0-9eed-4ef9-94ec-39ba58eb609d connector_type_id: .server-log frequency: summary: false diff --git a/x-pack/plugins/alerting/docs/openapi/components/schemas/actions.yaml b/x-pack/plugins/alerting/docs/openapi/components/schemas/actions.yaml index 5d0d877a4c177..5b67d45ced76f 100644 --- a/x-pack/plugins/alerting/docs/openapi/components/schemas/actions.yaml +++ b/x-pack/plugins/alerting/docs/openapi/components/schemas/actions.yaml @@ -41,3 +41,7 @@ items: type: object description: The parameters for the action, which are sent to the connector. The `params` are handled as Mustache templates and passed a default set of context. additionalProperties: true + uuid: + type: string + description: A universally unique identifier (UUID) for the action. + example: 1c7a1280-f28c-4e06-96b2-e4e5f05d1d61 diff --git a/x-pack/plugins/fleet/common/constants/epm.ts b/x-pack/plugins/fleet/common/constants/epm.ts index 2635dbc05399f..af362c4230223 100644 --- a/x-pack/plugins/fleet/common/constants/epm.ts +++ b/x-pack/plugins/fleet/common/constants/epm.ts @@ -19,6 +19,7 @@ export const FLEET_KUBERNETES_PACKAGE = 'kubernetes'; export const FLEET_UNIVERSAL_PROFILING_SYMBOLIZER_PACKAGE = 'profiler_symbolizer'; export const FLEET_CLOUD_SECURITY_POSTURE_PACKAGE = 'cloud_security_posture'; export const FLEET_CLOUD_SECURITY_POSTURE_KSPM_POLICY_TEMPLATE = 'kspm'; +export const FLEET_CLOUD_DEFEND_PACKAGE = 'cloud_defend'; export const PACKAGE_TEMPLATE_SUFFIX = '@package'; export const USER_SETTINGS_TEMPLATE_SUFFIX = '@custom'; diff --git a/x-pack/plugins/fleet/common/index.ts b/x-pack/plugins/fleet/common/index.ts index 3ca552966a7c5..dfd8b8947cb74 100644 --- a/x-pack/plugins/fleet/common/index.ts +++ b/x-pack/plugins/fleet/common/index.ts @@ -18,6 +18,7 @@ export { FLEET_KUBERNETES_PACKAGE, FLEET_CLOUD_SECURITY_POSTURE_PACKAGE, FLEET_CLOUD_SECURITY_POSTURE_KSPM_POLICY_TEMPLATE, + FLEET_CLOUD_DEFEND_PACKAGE, FLEET_ENDPOINT_PACKAGE, // Saved object type AGENT_POLICY_SAVED_OBJECT_TYPE, diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/hooks.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/hooks.tsx index 46341042102f0..407de12ff0f9d 100644 --- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/hooks.tsx +++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/hooks.tsx @@ -13,12 +13,13 @@ import { FLEET_KUBERNETES_PACKAGE, FLEET_CLOUD_SECURITY_POSTURE_PACKAGE, FLEET_CLOUD_SECURITY_POSTURE_KSPM_POLICY_TEMPLATE, + FLEET_CLOUD_DEFEND_PACKAGE, } from '../../../common'; import type { K8sMode } from './types'; // Packages that requires custom elastic-agent manifest -const K8S_PACKAGES = new Set([FLEET_KUBERNETES_PACKAGE]); +const K8S_PACKAGES = new Set([FLEET_KUBERNETES_PACKAGE, FLEET_CLOUD_DEFEND_PACKAGE]); export function useAgentPolicyWithPackagePolicies(policyId?: string) { const [agentPolicyWithPackagePolicies, setAgentPolicy] = useState(null);