[Monitor] BREAKING CHANGE: az monitor activity-log alert create: Change default value from resourceGroupId to subscriptionId for parameter --scope (#27126)

* migrate activity-logs to codegenV2

Author: AllyW

src/azure-cli/azure/cli/command_modules/monitor/_help.py

@@ -32,111 +32,6 @@
 short-summary: Manage activity log alert rules.
 """
 
-helps['monitor activity-log alert action-group'] = """
-type: group
-short-summary: Manage action groups for activity log alert rules.
-"""
-
-helps['monitor activity-log alert action-group add'] = """
-type: command
-short-summary: Add action groups to this activity log alert rule. It can also be used to overwrite existing webhook properties of particular action groups.
-parameters:
-  - name: --name -n
-    short-summary: Name of the activity log alert rule.
-  - name: --action-group -a
-    short-summary: The names or the resource ids of the action groups to be added.
-  - name: --reset
-    short-summary: Remove all the existing action groups before add new conditions.
-  - name: --webhook-properties -w
-    short-summary: >
-        Space-separated webhook properties in 'key[=value]' format. These properties will be associated with
-        the action groups added in this command.
-    long-summary: >
-        For any webhook receiver in these action group, these data are appended to the webhook payload.
-        To attach different webhook properties to different action groups, add the action groups in separate update-action commands.
-  - name: --strict
-    short-summary: Fails the command if an action group to be added will change existing webhook properties.
-examples:
-  - name: Add an action group and specify webhook properties.
-    text: |
-        az monitor activity-log alert action-group add -n {AlertName} -g {ResourceGroup} \\
-          --action /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/microsoft.insights/actionGroups/{ActionGroup} \\
-          --webhook-properties usage=test owner=jane
-  - name: Overwite an existing action group's webhook properties.
-    text: |
-        az monitor activity-log alert action-group add -n {AlertName} -g {ResourceGroup} \\
-          -a /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/microsoft.insights/actionGroups/{ActionGroup} \\
-          --webhook-properties usage=test owner=john
-  - name: Remove webhook properties from an existing action group.
-    text: |
-        az monitor activity-log alert action-group add -n {AlertName} -g {ResourceGroup} \\
-          -a /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/microsoft.insights/actionGroups/{ActionGroup}
-  - name: Add new action groups but prevent the command from accidently overwrite existing webhook properties
-    text: |
-        az monitor activity-log alert action-group add -n {AlertName} -g {ResourceGroup} --strict \\
-          --action-group {ResourceIDList}
-"""
-
-helps['monitor activity-log alert action-group remove'] = """
-type: command
-short-summary: Remove action groups from this activity log alert rule.
-parameters:
-  - name: --name -n
-    short-summary: Name of the activity log alert rule.
-  - name: --action-group -a
-    short-summary: The names or the resource ids of the action groups to be removed.
-"""
-
-helps['monitor activity-log alert create'] = """
-type: command
-short-summary: Create a default activity log alert rule.
-long-summary: This command will create a default activity log with one condition which compares if the activities logs 'category' field equals to 'ServiceHealth'. The newly created activity log alert does not have any action groups attached to it.
-parameters:
-  - name: --name -n
-    short-summary: Name of the activity log alert rule.
-  - name: --scope -s
-    short-summary: A list of strings that will be used as prefixes.
-    long-summary: >
-        The alert rule will only apply to activity logs with resourceIDs that fall under one of these prefixes.
-        If not provided, the path to the resource group will be used.
-  - name: --disable
-    short-summary: Disable the activity log alert rule after it is created.
-  - name: --description
-    short-summary: A description of this activity log alert rule.
-  - name: --condition -c
-    short-summary: The condition that will cause the alert rule to activate. The format is FIELD=VALUE[ and FIELD=VALUE...].
-    long-summary: >
-        The possible values for the field are 'resourceId', 'category', 'caller', 'level', 'operationName', 'resourceGroup',
-        'resourceProvider', 'status', 'subStatus', 'resourceType', or anything beginning with 'properties.'.
-  - name: --action-group -a
-    short-summary: >
-        Add an action group. Accepts space-separated action group identifiers. The identifier can be the action group's name
-        or its resource ID.
-  - name: --webhook-properties -w
-    short-summary: >
-        Space-separated webhook properties in 'key[=value]' format. These properties are associated with the action groups
-        added in this command.
-    long-summary: >
-        For any webhook receiver in these action group, this data is appended to the webhook payload. To attach different webhook
-        properties to different action groups, add the action groups in separate update-action commands.
-examples:
-  - name: Create an alert rule with default settings.
-    text: >
-        az monitor activity-log alert create -n {AlertName} -g {ResourceGroup}
-  - name: Create an alert rule with condition about error level service health log.
-    text: >
-        az monitor activity-log alert create -n {AlertName} -g {ResourceGroup} \\
-          --condition category=ServiceHealth and level=Error
-  - name: Create an alert rule with an action group and specify webhook properties.
-    text: >
-        az monitor activity-log alert create -n {AlertName} -g {ResourceGroup} \\
-          -a /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/microsoft.insights/actionGroups/{ActionGroup} \\
-          -w usage=test owner=jane
-  - name: Create an alert rule which is initially disabled.
-    text: >
-        az monitor activity-log alert create -n {AlertName} -g {ResourceGroup} --disable
-"""
-
 helps['monitor activity-log alert list'] = """
 type: command
 short-summary: List activity log alert rules under a resource group or the current subscription.
@@ -145,67 +40,6 @@
     short-summary: Name of the resource group under which the activity log alert rules are being listed. If it is omitted, all the activity log alert rules under the current subscription are listed.
 """
 
-helps['monitor activity-log alert scope'] = """
-type: group
-short-summary: Manage scopes for activity log alert rules.
-"""
-
-helps['monitor activity-log alert scope add'] = """
-type: command
-short-summary: Add scopes to this activity log alert rule.
-parameters:
-  - name: --name -n
-    short-summary: Name of the activity log alert rule.
-  - name: --scope -s
-    short-summary: List of scopes to add. Each scope could be a resource ID, a resource group ID or a subscription ID.
-  - name: --reset
-    short-summary: Remove all the existing scopes before add new scopes.
-examples:
-  - name: Add scopes to this activity log alert rule. (autogenerated)
-    text: |
-        az monitor activity-log alert scope add --name MyActivityLogAlerts --resource-group MyResourceGroup --scope /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx  /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myRG  /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myRG/Microsoft.KeyVault/vaults/mykey
-    crafted: true
-"""
-
-helps['monitor activity-log alert scope remove'] = """
-type: command
-short-summary: Removes scopes from this activity log alert rule.
-parameters:
-  - name: --name -n
-    short-summary: Name of the activity log alert rule.
-  - name: --scope -s
-    short-summary: The scopes to remove
-"""
-
-helps['monitor activity-log alert update'] = """
-type: command
-short-summary: Update the details of this activity log alert rule.
-parameters:
-  - name: --description
-    short-summary: A description of this activity log alert rule.
-  - name: --condition -c
-    short-summary: The conditional expression that will cause the alert rule to activate. The format is FIELD=VALUE[ and FIELD=VALUE...].
-    long-summary: >
-        The possible values for the field are 'resourceId', 'category', 'caller', 'level', 'operationName', 'resourceGroup',
-        'resourceProvider', 'status', 'subStatus', 'resourceType', or anything beginning with 'properties.'.
-examples:
-  - name: Update the condition
-    text: >
-        az monitor activity-log alert update -n {AlertName} -g {ResourceGroup} \\
-          --condition category=ServiceHealth and level=Error
-  - name: Disable an alert rule.
-    text: >
-        az monitor activity-log alert update -n {AlertName} -g {ResourceGroup} --enable false
-  - name: Update the details of this activity log alert rule. (autogenerated)
-    text: |
-        az monitor activity-log alert update --enabled true --name MyActivityLogAlerts --resource-group MyResourceGroup --subscription MySubscription
-    crafted: true
-  - name: Update the details of this activity log alert. (autogenerated)
-    text: |
-        az monitor activity-log alert update --name MyActivityLogAlerts --resource-group MyResourceGroup --tags key=value
-    crafted: true
-"""
-
 helps['monitor activity-log list'] = """
 type: command
 short-summary: List and query activity log events.
@@ -242,11 +76,6 @@
     text: az monitor activity-log list -g {ResourceGroup} --offset 1h
 """
 
-helps['monitor activity-log list-categories'] = """
-type: command
-short-summary: List the event categories of activity logs.
-"""
-
 helps['monitor autoscale'] = """
 type: group
 short-summary: Manage autoscale settings.

src/azure-cli/azure/cli/command_modules/monitor/_params.py

@@ -15,7 +15,7 @@
     timezone_offset_type, timezone_name_type, MetricAlertConditionAction, MetricAlertAddAction)
 from azure.cli.command_modules.monitor.util import get_operator_map, get_aggregation_map
 from azure.cli.command_modules.monitor.validators import (
-    process_webhook_prop, validate_autoscale_recurrence, validate_autoscale_timegrain, get_action_group_validator,
+    validate_autoscale_recurrence, validate_autoscale_timegrain, get_action_group_validator,
     get_action_group_id_validator, validate_metric_dimension, validate_storage_accounts_name_or_id)
 
 from knack.arguments import CLIArgumentType
@@ -26,7 +26,6 @@ def load_arguments(self, _):
     from azure.mgmt.monitor.models import ConditionOperator, TimeAggregationOperator, EventData, PredictiveAutoscalePolicyScaleMode
     from .grammar.metric_alert.MetricAlertConditionValidator import dim_op_conversion, agg_conversion, op_conversion, sens_conversion
     name_arg_type = CLIArgumentType(options_list=['--name', '-n'], metavar='NAME')
-    webhook_prop_type = CLIArgumentType(validator=process_webhook_prop, nargs='*')
 
     autoscale_name_type = CLIArgumentType(options_list=['--autoscale-name'], help='Name of the autoscale settings.', id_part='name')
     autoscale_profile_name_type = CLIArgumentType(options_list=['--profile-name'], help='Name of the autoscale profile.')
@@ -299,39 +298,6 @@ def load_arguments(self, _):
     # region ActivityLog Alerts
     with self.argument_context('monitor activity-log alert') as c:
         c.argument('activity_log_alert_name', options_list=['--name', '-n'], id_part='name')
-
-    with self.argument_context('monitor activity-log alert create') as c:
-        from .operations.activity_log_alerts import process_condition_parameter
-        c.argument('disable', action='store_true')
-        c.argument('scopes', options_list=['--scope', '-s'], nargs='+')
-        c.argument('condition', options_list=['--condition', '-c'], nargs='+', validator=process_condition_parameter)
-        c.argument('action_groups', options_list=['--action-group', '-a'], nargs='+')
-        c.argument('webhook_properties', options_list=['--webhook-properties', '-w'], arg_type=webhook_prop_type)
-
-    with self.argument_context('monitor activity-log alert update-condition') as c:
-        c.argument('reset', action='store_true')
-        c.argument('add_conditions', options_list=['--add-condition', '-a'], nargs='+')
-        c.argument('remove_conditions', options_list=['--remove-condition', '-r'], nargs='+')
-
-    with self.argument_context('monitor activity-log alert update') as c:
-        from .operations.activity_log_alerts import process_condition_parameter
-        c.argument('condition', options_list=['--condition', '-c'], nargs='+', validator=process_condition_parameter)
-        c.argument('enabled', arg_type=get_three_state_flag())
-
-    with self.argument_context('monitor activity-log alert action-group add') as c:
-        c.argument('reset', action='store_true')
-        c.argument('action_group_ids', options_list=['--action-group', '-a'], nargs='+')
-        c.argument('webhook_properties', options_list=['--webhook-properties', '-w'], arg_type=webhook_prop_type)
-
-    with self.argument_context('monitor activity-log alert action-group remove') as c:
-        c.argument('action_group_ids', options_list=['--action-group', '-a'], nargs='+')
-
-    with self.argument_context('monitor activity-log alert scope add') as c:
-        c.argument('scopes', options_list=['--scope', '-s'], nargs='+')
-        c.argument('reset', action='store_true')
-
-    with self.argument_context('monitor activity-log alert scope remove') as c:
-        c.argument('scopes', options_list=['--scope', '-s'], nargs='+')
     # endregion
 
     # region Log Analytics Workspace

src/azure-cli/azure/cli/command_modules/monitor/aaz/latest/monitor/activity_log/__cmd_group.py

@@ -0,0 +1,23 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from azure.cli.core.aaz import *
+
+
+@register_command_group(
+    "monitor activity-log",
+)
+class __CMDGroup(AAZCommandGroup):
+    """Manage activity logs.
+    """
+    pass
+
+
+__all__ = ["__CMDGroup"]

src/azure-cli/azure/cli/command_modules/monitor/aaz/latest/monitor/activity_log/__init__.py

@@ -0,0 +1,13 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from .__cmd_group import *
+from ._list import *
+from ._list_categories import *