From 8660b94de4c655c3010af08c098ffc4a2af500fa Mon Sep 17 00:00:00 2001 From: Shivani-gslab <145646625+Shivani-gslab@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:26:02 +0530 Subject: [PATCH] Refactor(eos_cli_config_gen): Remove the deprecated keys for event-handlers (#4279) --- .../arista/avd/docs/porting-guides/5.x.x.md | 6 +- .../documentation/devices/host1.md | 27 --------- .../intended/configs/host1.cfg | 12 ---- .../host_vars/host1/event-handlers.yml | 23 -------- .../docs/tables/event-handlers.md | 22 +------- .../docs/tables/management-settings.md | 22 +------- .../documentation/event-handlers.j2 | 7 --- .../j2templates/eos/event-handlers.j2 | 6 -- .../schema/eos_cli_config_gen.jsonschema.json | 21 ------- .../schema/eos_cli_config_gen.schema.yml | 56 +++++++++---------- .../event_handlers.schema.yml | 46 +++++++-------- .../schema/eos_designs.jsonschema.json | 42 -------------- 12 files changed, 60 insertions(+), 230 deletions(-) delete mode 100644 ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/event-handlers.yml diff --git a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md index 397d39a373a..e9f049cdc2b 100644 --- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md +++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md @@ -62,9 +62,9 @@ The following data model keys have been removed from `eos_cli_config_gen` in v5. | Removed key | New key | | ----------- | ------- | | old key 1(daemon_terminattr) | new key(TODO) | -| old key 2.1(event_handlers) | new key(TODO) | -| old key 2.2(event_handlers) | new key(TODO) | -| old key 2.3(event_handlers) | new key(TODO) | +| event_handlers.action | event_handlers.actions.bash_command | +| event_handlers.action_type | event_handlers.actions | +| event_handlers.regex | event_handlers.trigger_on_logging.regex | | old key 3(flow_trackings) | new key(TODO) | | old key 4.1(management_api_gnmi) | new key(TODO) | | old key 4.2(management_api_gnmi) | new key(TODO) | diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md index 74529a2c01f..ba1478b2c27 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md @@ -22,7 +22,6 @@ - [SNMP](#snmp) - [SFlow](#sflow) - [VM Tracer Sessions](#vm-tracer-sessions) - - [Event Handler](#event-handler) - [Flow Tracking](#flow-tracking) - [Hardware TCAM Profile](#hardware-tcam-profile) - [Custom TCAM Profiles](#custom-tcam-profiles) @@ -446,32 +445,6 @@ vmtracer session session_2 password 7 encrypted_password ``` -### Event Handler - -#### Event Handler Summary - -| Handler | Actions | Trigger | Trigger Config | -| ------- | ------- | ------- | -------------- | -| CONFIG_VERSIONING | bash FN=/mnt/flash/startup-config; LFN="`ls -1 $FN.*-* \| tail -n 1`"; if [ -z "$LFN" -o -n "`diff -I 'last modified' $FN $LFN`" ]; then cp $FN $FN.`date +%Y%m%d-%H%M%S`; ls -1r $FN.*-* \| tail -n +11 \| xargs -I % rm %; fi | on-startup-config | - | -| evpn-blacklist-recovery | bash FastCli -p 15 -c "clear bgp evpn host-flap" | on-logging | - | - -#### Event Handler Device Configuration - -```eos -! -event-handler CONFIG_VERSIONING - trigger on-startup-config - action bash FN=/mnt/flash/startup-config; LFN="`ls -1 $FN.*-* | tail -n 1`"; if [ -z "$LFN" -o -n "`diff -I 'last modified' $FN $LFN`" ]; then cp $FN $FN.`date +%Y%m%d-%H%M%S`; ls -1r $FN.*-* | tail -n +11 | xargs -I % rm %; fi - delay 0 -! -event-handler evpn-blacklist-recovery - trigger on-logging - regex EVPN-3-BLACKLISTED_DUPLICATE_MAC - action bash FastCli -p 15 -c "clear bgp evpn host-flap" - delay 300 - asynchronous -``` - ### Flow Tracking #### Flow Tracking Sampled diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg index 244ea675c32..f6434935e15 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg @@ -313,18 +313,6 @@ hardware tcam ip address virtual source-nat vrf TEST_01 address 1.1.1.1 ip address virtual source-nat vrf TEST_02 address 1.1.1.2 ! -event-handler CONFIG_VERSIONING - trigger on-startup-config - action bash FN=/mnt/flash/startup-config; LFN="`ls -1 $FN.*-* | tail -n 1`"; if [ -z "$LFN" -o -n "`diff -I 'last modified' $FN $LFN`" ]; then cp $FN $FN.`date +%Y%m%d-%H%M%S`; ls -1r $FN.*-* | tail -n +11 | xargs -I % rm %; fi - delay 0 -! -event-handler evpn-blacklist-recovery - trigger on-logging - regex EVPN-3-BLACKLISTED_DUPLICATE_MAC - action bash FastCli -p 15 -c "clear bgp evpn host-flap" - delay 300 - asynchronous -! group bgp bar vrf red neighbor peer-group-baz diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/event-handlers.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/event-handlers.yml deleted file mode 100644 index 433ecd225a2..00000000000 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/event-handlers.yml +++ /dev/null @@ -1,23 +0,0 @@ -### Event Handlers ### - -# Testing event_handlers as dict of dict -# Dict type is deprecated in 4.0.0. To be removed in 5.0.0 -event_handlers: - evpn-blacklist-recovery: - # Testing "action_type" and "action" key which are deprecared and will be removed in 5.0.0 - action_type: bash - action: FastCli -p 15 -c "clear bgp evpn host-flap" - delay: 300 - trigger: on-logging - # Testing "regex" key which is deprecared and will be removed in 5.0.0 - regex: EVPN-3-BLACKLISTED_DUPLICATE_MAC - asynchronous: true - CONFIG_VERSIONING: - action_type: bash - action: >- - FN=/mnt/flash/startup-config; LFN="`ls -1 $FN.*-* | tail -n 1`"; - if [ -z "$LFN" -o -n "`diff -I 'last modified' $FN $LFN`" ]; - then cp $FN $FN.`date +%Y%m%d-%H%M%S`; ls -1r $FN.*-* | tail -n +11 | xargs -I % rm %; - fi - delay: 0 - trigger: on-startup-config diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/event-handlers.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/event-handlers.md index 08d4405823c..69f8a0e990b 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/event-handlers.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/event-handlers.md @@ -9,8 +9,6 @@ | -------- | ---- | -------- | ------- | ------------------ | ----------- | | [event_handlers](## "event_handlers") | List, items: Dictionary | | | | Gives the ability to monitor and react to Syslog messages.
Event Handlers provide a powerful and flexible tool that can be used to apply self-healing actions,
customize the system behavior, and implement workarounds to problems discovered in the field.
| | [  - name](## "event_handlers.[].name") | String | Required, Unique | | | Event Handler Name. | - | [    action_type](## "event_handlers.[].action_type") deprecated | String | | | Valid Values:
- bash
- increment
- log | This key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.actions instead. | - | [    action](## "event_handlers.[].action") deprecated | String | | | | Command to execute.
This key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.actions instead. | | [    actions](## "event_handlers.[].actions") | Dictionary | | | | Note: `bash_command` and `log` are mutually exclusive. `bash_command` takes precedence over `log`. | | [      bash_command](## "event_handlers.[].actions.bash_command") | String | | | | Define BASH command action. Command could be multiline also. | | [      log](## "event_handlers.[].actions.log") | Boolean | | | | Log a message when the event is triggered. | @@ -37,8 +35,10 @@ | [      vrf](## "event_handlers.[].trigger_on_maintenance.vrf") | String | | | | VRF name. VRF can be defined for "bgp_peer" only. | | [      interface](## "event_handlers.[].trigger_on_maintenance.interface") | String | | | | Trigger condition occurs on maintenance operation of specified interface. | | [      unit](## "event_handlers.[].trigger_on_maintenance.unit") | String | | | | Name of unit. Trigger condition occurs on maintenance operation of specified unit | - | [    regex](## "event_handlers.[].regex") deprecated | String | | | | Regular expression to use for searching log messages. Required for on-logging trigger.
This key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.trigger_on_logging.regex instead. | | [    asynchronous](## "event_handlers.[].asynchronous") | Boolean | | `False` | | Set the action to be non-blocking.
| + | [    action_type](## "event_handlers.[].action_type") removed | String | | | Valid Values:
- bash
- increment
- log | This key was removed. Support was removed in AVD version 5.0.0. Use event_handlers.actions instead. | + | [    action](## "event_handlers.[].action") removed | String | | | | Command to execute.
This key was removed. Support was removed in AVD version 5.0.0. Use event_handlers.actions.bash_command instead. | + | [    regex](## "event_handlers.[].regex") removed | String | | | | Regular expression to use for searching log messages. Required for on-logging trigger.
This key was removed. Support was removed in AVD version 5.0.0. Use event_handlers.trigger_on_logging.regex instead. | === "YAML" @@ -50,16 +50,6 @@ # Event Handler Name. - name: - # This key is deprecated. - # Support will be removed in AVD version 5.0.0. - # Use event_handlers.actions instead. - action_type: - - # Command to execute. - # This key is deprecated. - # Support will be removed in AVD version 5.0.0. - # Use event_handlers.actions instead. - action: # Note: `bash_command` and `log` are mutually exclusive. `bash_command` takes precedence over `log`. actions: @@ -141,12 +131,6 @@ # Name of unit. Trigger condition occurs on maintenance operation of specified unit unit: - # Regular expression to use for searching log messages. Required for on-logging trigger. - # This key is deprecated. - # Support will be removed in AVD version 5.0.0. - # Use event_handlers.trigger_on_logging.regex instead. - regex: - # Set the action to be non-blocking. asynchronous: ``` diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/management-settings.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/management-settings.md index e1effa39ae5..e380c8f4c8c 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/management-settings.md +++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/management-settings.md @@ -9,8 +9,6 @@ | -------- | ---- | -------- | ------- | ------------------ | ----------- | | [event_handlers](## "event_handlers") | List, items: Dictionary | | | | Gives the ability to monitor and react to Syslog messages.
Event Handlers provide a powerful and flexible tool that can be used to apply self-healing actions,
customize the system behavior, and implement workarounds to problems discovered in the field.
| | [  - name](## "event_handlers.[].name") | String | Required, Unique | | | Event Handler Name. | - | [    action_type](## "event_handlers.[].action_type") deprecated | String | | | Valid Values:
- bash
- increment
- log | This key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.actions instead. | - | [    action](## "event_handlers.[].action") deprecated | String | | | | Command to execute.
This key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.actions instead. | | [    actions](## "event_handlers.[].actions") | Dictionary | | | | Note: `bash_command` and `log` are mutually exclusive. `bash_command` takes precedence over `log`. | | [      bash_command](## "event_handlers.[].actions.bash_command") | String | | | | Define BASH command action. Command could be multiline also. | | [      log](## "event_handlers.[].actions.log") | Boolean | | | | Log a message when the event is triggered. | @@ -37,8 +35,10 @@ | [      vrf](## "event_handlers.[].trigger_on_maintenance.vrf") | String | | | | VRF name. VRF can be defined for "bgp_peer" only. | | [      interface](## "event_handlers.[].trigger_on_maintenance.interface") | String | | | | Trigger condition occurs on maintenance operation of specified interface. | | [      unit](## "event_handlers.[].trigger_on_maintenance.unit") | String | | | | Name of unit. Trigger condition occurs on maintenance operation of specified unit | - | [    regex](## "event_handlers.[].regex") deprecated | String | | | | Regular expression to use for searching log messages. Required for on-logging trigger.
This key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.trigger_on_logging.regex instead. | | [    asynchronous](## "event_handlers.[].asynchronous") | Boolean | | `False` | | Set the action to be non-blocking.
| + | [    action_type](## "event_handlers.[].action_type") removed | String | | | Valid Values:
- bash
- increment
- log | This key was removed. Support was removed in AVD version 5.0.0. Use event_handlers.actions instead. | + | [    action](## "event_handlers.[].action") removed | String | | | | Command to execute.
This key was removed. Support was removed in AVD version 5.0.0. Use event_handlers.actions.bash_command instead. | + | [    regex](## "event_handlers.[].regex") removed | String | | | | Regular expression to use for searching log messages. Required for on-logging trigger.
This key was removed. Support was removed in AVD version 5.0.0. Use event_handlers.trigger_on_logging.regex instead. | | [ipv6_mgmt_destination_networks](## "ipv6_mgmt_destination_networks") | List, items: String | | | | List of IPv6 prefixes to configure as static routes towards the OOB IPv6 Management interface gateway.
Replaces the default route.
| | [  - <str>](## "ipv6_mgmt_destination_networks.[]") | String | | | | IPv6_network/Mask. | | [ipv6_mgmt_gateway](## "ipv6_mgmt_gateway") | String | | | Format: ipv6 | OOB Management interface gateway in IPv6 format.
Used as next-hop for default gateway or static routes defined under 'ipv6_mgmt_destination_networks'.
| @@ -88,16 +88,6 @@ # Event Handler Name. - name: - # This key is deprecated. - # Support will be removed in AVD version 5.0.0. - # Use event_handlers.actions instead. - action_type: - - # Command to execute. - # This key is deprecated. - # Support will be removed in AVD version 5.0.0. - # Use event_handlers.actions instead. - action: # Note: `bash_command` and `log` are mutually exclusive. `bash_command` takes precedence over `log`. actions: @@ -179,12 +169,6 @@ # Name of unit. Trigger condition occurs on maintenance operation of specified unit unit: - # Regular expression to use for searching log messages. Required for on-logging trigger. - # This key is deprecated. - # Support will be removed in AVD version 5.0.0. - # Use event_handlers.trigger_on_logging.regex instead. - regex: - # Set the action to be non-blocking. asynchronous: diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/event-handlers.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/event-handlers.j2 index 0cbbec7830c..50f74d04e28 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/event-handlers.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/event-handlers.j2 @@ -13,13 +13,6 @@ | Handler | Actions | Trigger | Trigger Config | | ------- | ------- | ------- | -------------- | {% for handler in event_handlers | arista.avd.natural_sort('name') %} -{% if handler.action_type is arista.avd.defined %} -{% set actions = handler.action_type %} -{% if handler.action is arista.avd.defined %} -{% set action = handler.action | replace('|', '\|') %} -{% set actions = actions ~ ' ' ~ action ~ '' %} -{% endif %} -{% endif %} {% if handler.actions is arista.avd.defined %} {% set actions = [] %} {% if handler.actions.bash_command is arista.avd.defined %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/event-handlers.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/event-handlers.j2 index 5e9f82cbfba..8897ad28eb5 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/event-handlers.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/event-handlers.j2 @@ -69,12 +69,6 @@ event-handler {{ handler.name }} {% else %} trigger {{ handler.trigger }} {% endif %} -{% if handler.regex is arista.avd.defined %} - regex {{ handler.regex }} -{% endif %} -{% endif %} -{% if handler.action is arista.avd.defined and handler.action_type is arista.avd.defined %} - action {{ handler.action_type }} {{ handler.action }} {% endif %} {% if handler.actions.bash_command is arista.avd.defined %} {% set bash_command = handler.actions.bash_command %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json index 0abe2fd9846..e23d675b977 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.jsonschema.json @@ -5923,21 +5923,6 @@ "description": "Event Handler Name.", "title": "Name" }, - "action_type": { - "type": "string", - "enum": [ - "bash", - "increment", - "log" - ], - "title": "Action Type" - }, - "action": { - "type": "string", - "description": "Command to execute.\n\nThis key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.actions instead.", - "deprecated": true, - "title": "Action" - }, "actions": { "type": "object", "description": "Note: `bash_command` and `log` are mutually exclusive. `bash_command` takes precedence over `log`.", @@ -6132,12 +6117,6 @@ }, "title": "Trigger On Maintenance" }, - "regex": { - "type": "string", - "description": "Regular expression to use for searching log messages. Required for on-logging trigger.\n\nThis key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.trigger_on_logging.regex instead.", - "deprecated": true, - "title": "Regex" - }, "asynchronous": { "type": "boolean", "default": false, diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index c15ead6ffd1..88a72e36589 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -3578,27 +3578,6 @@ keys: name: type: str description: Event Handler Name. - action_type: - type: str - valid_values: - - bash - - increment - - log - deprecation: - warning: true - removed: false - remove_in_version: 5.0.0 - new_key: event_handlers.actions - action: - type: str - description: 'Command to execute. - - ' - deprecation: - warning: true - removed: false - remove_in_version: 5.0.0 - new_key: event_handlers.actions actions: type: dict description: 'Note: `bash_command` and `log` are mutually exclusive. `bash_command` @@ -3734,22 +3713,43 @@ keys: type: str description: Name of unit. Trigger condition occurs on maintenance operation of specified unit + asynchronous: + type: bool + default: false + description: 'Set the action to be non-blocking. + + ' + action_type: + type: str + valid_values: + - bash + - increment + - log + deprecation: + warning: true + removed: true + remove_in_version: 5.0.0 + new_key: event_handlers.actions + action: + type: str + description: 'Command to execute. + + ' + deprecation: + warning: true + removed: true + remove_in_version: 5.0.0 + new_key: event_handlers.actions.bash_command regex: type: str deprecation: warning: true - removed: false + removed: true remove_in_version: 5.0.0 new_key: event_handlers.trigger_on_logging.regex description: 'Regular expression to use for searching log messages. Required for on-logging trigger. - ' - asynchronous: - type: bool - default: false - description: 'Set the action to be non-blocking. - ' event_monitor: type: dict diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/event_handlers.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/event_handlers.schema.yml index 1d341dad0f4..6242023cf01 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/event_handlers.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/event_handlers.schema.yml @@ -21,23 +21,6 @@ keys: name: type: str description: Event Handler Name. - action_type: - type: str - valid_values: ["bash", "increment", "log"] - deprecation: - warning: true - removed: false - remove_in_version: 5.0.0 - new_key: event_handlers.actions - action: - type: str - description: | - Command to execute. - deprecation: - warning: true - removed: false - remove_in_version: 5.0.0 - new_key: event_handlers.actions actions: type: dict description: |- @@ -168,17 +151,34 @@ keys: unit: type: str description: Name of unit. Trigger condition occurs on maintenance operation of specified unit + asynchronous: + type: bool + default: False + description: | + Set the action to be non-blocking. + action_type: + type: str + valid_values: ["bash", "increment", "log"] + deprecation: + warning: true + removed: true + remove_in_version: 5.0.0 + new_key: event_handlers.actions + action: + type: str + description: | + Command to execute. + deprecation: + warning: true + removed: true + remove_in_version: 5.0.0 + new_key: event_handlers.actions.bash_command regex: type: str deprecation: warning: true - removed: false + removed: true remove_in_version: 5.0.0 new_key: event_handlers.trigger_on_logging.regex description: | Regular expression to use for searching log messages. Required for on-logging trigger. - asynchronous: - type: bool - default: False - description: | - Set the action to be non-blocking. diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json b/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json index 3918d0dae63..1f84d786115 100644 --- a/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json +++ b/python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json @@ -6123,21 +6123,6 @@ "description": "Event Handler Name.", "title": "Name" }, - "action_type": { - "type": "string", - "enum": [ - "bash", - "increment", - "log" - ], - "title": "Action Type" - }, - "action": { - "type": "string", - "description": "Command to execute.\n\nThis key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.actions instead.", - "deprecated": true, - "title": "Action" - }, "actions": { "type": "object", "description": "Note: `bash_command` and `log` are mutually exclusive. `bash_command` takes precedence over `log`.", @@ -6332,12 +6317,6 @@ }, "title": "Trigger On Maintenance" }, - "regex": { - "type": "string", - "description": "Regular expression to use for searching log messages. Required for on-logging trigger.\n\nThis key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.trigger_on_logging.regex instead.", - "deprecated": true, - "title": "Regex" - }, "asynchronous": { "type": "boolean", "default": false, @@ -23963,21 +23942,6 @@ "description": "Event Handler Name.", "title": "Name" }, - "action_type": { - "type": "string", - "enum": [ - "bash", - "increment", - "log" - ], - "title": "Action Type" - }, - "action": { - "type": "string", - "description": "Command to execute.\n\nThis key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.actions instead.", - "deprecated": true, - "title": "Action" - }, "actions": { "type": "object", "description": "Note: `bash_command` and `log` are mutually exclusive. `bash_command` takes precedence over `log`.", @@ -24172,12 +24136,6 @@ }, "title": "Trigger On Maintenance" }, - "regex": { - "type": "string", - "description": "Regular expression to use for searching log messages. Required for on-logging trigger.\n\nThis key is deprecated. Support will be removed in AVD version 5.0.0. Use event_handlers.trigger_on_logging.regex instead.", - "deprecated": true, - "title": "Regex" - }, "asynchronous": { "type": "boolean", "default": false,