{Monitor} Apply single api of azure-mgmt-monitor sdk (#30824)

Author: AllyW

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -220,39 +220,7 @@ def default_api_version(self):
         ResourceType.DATA_COSMOS_TABLE: '2017-04-17',
         ResourceType.MGMT_SERVICEBUS: '2022-10-01-preview',
         ResourceType.MGMT_EVENTHUB: '2022-01-01-preview',
-        ResourceType.MGMT_MONITOR: SDKProfile('2019-06-01', {
-            'action_groups': '2022-06-01',
-            'activity_log_alerts': '2017-04-01',
-            'activity_logs': '2015-04-01',
-            'alert_rule_incidents': '2016-03-01',
-            'alert_rules': '2016-03-01',
-            'autoscale_settings': '2022-10-01',
-            'baseline': '2018-09-01',
-            'baselines': '2019-03-01',
-            'diagnostic_settings': '2021-05-01-preview',
-            'diagnostic_settings_category': '2017-05-01-preview',
-            'event_categories': '2015-04-01',
-            'guest_diagnostics_settings': '2018-06-01-preview',
-            'guest_diagnostics_settings_association': '2018-06-01-preview',
-            'log_profiles': '2016-03-01',
-            'metric_alerts': '2018-03-01',
-            'metric_alerts_status': '2018-03-01',
-            'metric_baseline': '2018-09-01',
-            'metric_definitions': '2018-01-01',
-            'metric_namespaces': '2017-12-01-preview',
-            'metrics': '2018-01-01',
-            'operations': '2015-04-01',
-            'scheduled_query_rules': '2018-04-16',
-            'service_diagnostic_settings': '2016-09-01',
-            'tenant_activity_logs': '2015-04-01',
-            'vm_insights': '2018-11-27-preview',
-            'private_link_resources': '2019-10-17-preview',
-            'private_link_scoped_resources': '2019-10-17-preview',
-            'private_link_scope_operation_status': '2019-10-17-preview',
-            'private_link_scopes': '2019-10-17-preview',
-            'private_endpoint_connections': '2019-10-17-preview',
-            'subscription_diagnostic_settings': '2017-05-01-preview'
-        }),
+        ResourceType.MGMT_MONITOR: None,
         ResourceType.MGMT_MSI: '2023-01-31',
         ResourceType.MGMT_APPSERVICE: '2023-01-01',
         ResourceType.MGMT_IOTHUB: '2023-06-30-preview',

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

@@ -11,10 +11,6 @@ def cf_monitor(cli_ctx, **kwargs):
     return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_MONITOR, **kwargs)
 
 
-def cf_alert_rules(cli_ctx, _):
-    return cf_monitor(cli_ctx).alert_rules
-
-
 def cf_alert_rule_incidents(cli_ctx, _):
     return cf_monitor(cli_ctx).alert_rule_incidents
 

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

@@ -10,10 +10,8 @@
 from azure.cli.core.commands.validators import get_default_location_from_resource_group
 
 from azure.cli.command_modules.monitor.actions import (
-    AlertAddAction, AlertRemoveAction, ConditionAction,
     AutoscaleScaleAction, AutoscaleConditionAction, get_period_type, AutoscaleCreateAction,
     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 (
     validate_loganalytics_workspace_search_table_name, validate_loganalytics_workspace_restore_table_name,
     validate_autoscale_recurrence, validate_autoscale_timegrain, get_action_group_validator,
@@ -25,7 +23,7 @@
 
 # pylint: disable=line-too-long, too-many-statements
 def load_arguments(self, _):
-    from azure.mgmt.monitor.models import ConditionOperator, TimeAggregationOperator, EventData, PredictiveAutoscalePolicyScaleMode
+    from azure.mgmt.monitor.models import 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')
 
@@ -37,54 +35,6 @@ def load_arguments(self, _):
         c.argument('location', get_location_type(self.cli_ctx), validator=get_default_location_from_resource_group)
         c.argument('tags', tags_type)
 
-    # region Alerts
-    with self.argument_context('monitor alert') as c:
-        c.argument('rule_name', name_arg_type, id_part='name', help='Name of the alert rule.')
-
-    with self.argument_context('monitor alert create') as c:
-        c.resource_parameter('target', arg_group='Target Resource', alias='target', preserve_resource_group_parameter=True)
-        c.argument('rule_name', name_arg_type, id_part='name', help='Name of the alert rule.')
-        c.argument('disabled', arg_type=get_three_state_flag())
-        c.argument('condition', action=ConditionAction, nargs='+')
-
-    with self.argument_context('monitor alert create', arg_group='Action') as c:
-        c.argument('custom_emails', nargs='+')
-        c.argument('email_service_owners', arg_type=get_three_state_flag())
-        c.argument('actions', options_list=['--action', '-a'], action=AlertAddAction, nargs='+')
-
-    with self.argument_context('monitor alert create', arg_group='Condition') as c:
-        c.argument('metric_name')
-        c.argument('operator', arg_type=get_enum_type(ConditionOperator))
-        c.argument('threshold')
-        c.argument('time_aggregation', arg_type=get_enum_type(TimeAggregationOperator))
-        c.argument('window_size')
-
-    with self.argument_context('monitor alert update') as c:
-        c.argument('rule_name', name_arg_type, id_part='name', help='Name of the alert rule.')
-        c.resource_parameter('target', arg_group='Target Resource', required=False, preserve_resource_group_parameter=True)
-
-    with self.argument_context('monitor alert update', arg_group='Action') as c:
-        c.argument('email_service_owners', arg_type=get_three_state_flag())
-        c.argument('add_actions', options_list=['--add-action', '-a'], nargs='+', action=AlertAddAction)
-        c.argument('remove_actions', options_list=['--remove-action', '-r'], nargs='+', action=AlertRemoveAction)
-
-    with self.argument_context('monitor alert update', arg_group='Condition') as c:
-        c.argument('condition', action=ConditionAction, nargs='+')
-        c.argument('metric')
-        c.argument('operator', arg_type=get_enum_type(get_operator_map().keys()))
-        c.argument('threshold')
-        c.argument('aggregation', arg_type=get_enum_type(get_aggregation_map().keys()))
-        c.argument('period', type=get_period_type())
-
-    for scope in ['monitor alert show-incident', 'monitor alert list-incidents']:
-        with self.argument_context(scope) as c:
-            c.argument('rule_name', options_list=['--rule-name'], id_part='name')
-            c.argument('incident_name', name_arg_type, id_part='child_name_1')
-
-    with self.argument_context('monitor alert list-incidents') as c:
-        c.argument('rule_name', options_list=['--rule-name'], id_part=None)
-    # endregion
-
     # region Metrics
     with self.argument_context('monitor metrics') as c:
         c.argument('metricnamespace', options_list=['--namespace'], help='Namespace to query metric definitions for.')

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

@@ -10,8 +10,7 @@
 from knack.arguments import CLIArgumentType
 from knack.log import get_logger
 from knack.util import CLIError
-from azure.cli.command_modules.monitor.util import (
-    get_aggregation_map, get_operator_map, get_autoscale_scale_direction_map)
+from azure.cli.command_modules.monitor.util import get_autoscale_scale_direction_map
 
 from azure.cli.core.azclierror import InvalidArgumentValueError
 from azure.cli.core.aaz._arg import AAZCompoundTypeArg, AAZListType
@@ -211,54 +210,6 @@ def __call__(self, parser, namespace, values, option_string=None):
         super().__call__(parser, namespace, action, option_string)
 
 
-# pylint: disable=too-few-public-methods
-class ConditionAction(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string=None):
-        from azure.mgmt.monitor.models import ThresholdRuleCondition, RuleMetricDataSource
-        # get default description if not specified
-        if namespace.description is None:
-            namespace.description = ' '.join(values)
-        if len(values) == 1:
-            # workaround because CMD.exe eats > character... Allows condition to be
-            # specified as a quoted expression
-            values = values[0].split(' ')
-        if len(values) < 5:
-            raise InvalidArgumentValueError(
-                '--condition METRIC {>,>=,<,<=} THRESHOLD {avg,min,max,total,last} DURATION')
-        metric_name = ' '.join(values[:-4])
-        operator = get_operator_map()[values[-4]]
-        threshold = int(values[-3])
-        aggregation = get_aggregation_map()[values[-2].lower()]
-        window = get_period_type()(values[-1])
-        metric = RuleMetricDataSource(resource_uri=None, metric_name=metric_name)  # target URI will be filled in later
-        condition = ThresholdRuleCondition(
-            operator=operator, threshold=threshold, data_source=metric,
-            window_size=window, time_aggregation=aggregation)
-        namespace.condition = condition
-
-
-# pylint: disable=protected-access
-class AlertAddAction(argparse._AppendAction):
-    def __call__(self, parser, namespace, values, option_string=None):
-        action = self.get_action(values, option_string)
-        super().__call__(parser, namespace, action, option_string)
-
-    def get_action(self, values, option_string):  # pylint: disable=no-self-use
-        _type = values[0].lower()
-        if _type == 'email':
-            from azure.mgmt.monitor.models import RuleEmailAction
-            return RuleEmailAction(custom_emails=values[1:])
-        if _type == 'webhook':
-            from azure.mgmt.monitor.models import RuleWebhookAction
-            uri = values[1]
-            try:
-                properties = dict(x.split('=', 1) for x in values[2:])
-            except ValueError:
-                raise InvalidArgumentValueError('{} webhook URI [KEY=VALUE ...]'.format(option_string))
-            return RuleWebhookAction(service_uri=uri, properties=properties)
-        raise InvalidArgumentValueError('usage error: {} TYPE KEY [ARGS]'.format(option_string))
-
-
 class AlertRemoveAction(argparse._AppendAction):
     def __call__(self, parser, namespace, values, option_string=None):
         action = self.get_action(values, option_string)

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

@@ -8,7 +8,7 @@
 # pylint: disable=line-too-long, too-many-locals, too-many-statements
 def load_command_table(self, _):
     from ._client_factory import (
-        cf_alert_rules, cf_autoscale,
+        cf_autoscale,
         cf_action_groups, cf_event_categories,
         cf_metric_alerts, cf_log_analytics_workspace, cf_log_analytics_linked_storage)
     from .transformers import (action_group_list_table)
@@ -52,8 +52,6 @@ def load_command_table(self, _):
 
     alert_custom = CliCommandType(
         operations_tmpl='azure.cli.command_modules.monitor.operations.metric_alert#{}',
-        client_factory=cf_alert_rules,
-        operation_group='alert_rules',
         exception_handler=exception_handler)
 
     metric_alert_sdk = CliCommandType(

src/azure-cli/azure/cli/command_modules/monitor/operations/metric_alert.py

@@ -321,24 +321,6 @@ def create_metric_alert_condition(condition_type, aggregation, metric_name, oper
     return condition.strip()
 
 
-def _parse_actions(actions):
-    """ Actions come in as a combined list. This method separates the webhook actions into a
-        separate collection and combines any number of email actions into a single email collection
-        and a single value for `email_service_owners`. If any email action contains a True value
-        for `send_to_service_owners` then it is assumed the entire value should be True. """
-    from azure.mgmt.monitor.models import RuleEmailAction, RuleWebhookAction
-    actions = actions or []
-    email_service_owners = None
-    webhooks = [x for x in actions if isinstance(x, RuleWebhookAction)]
-    custom_emails = set()
-    for action in actions:
-        if isinstance(action, RuleEmailAction):
-            if action.send_to_service_owners:
-                email_service_owners = True
-            custom_emails = custom_emails | set(action.custom_emails)
-    return list(custom_emails), webhooks, email_service_owners
-
-
 def _parse_action_removals(actions):
     """ Separates the combined list of keys to remove into webhooks and emails. """
     flattened = list({x for sublist in actions for x in sublist})

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

@@ -16,19 +16,6 @@ def get_resource_group_location(cli_ctx, name):
     return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).resource_groups.get(name).location
 
 
-def get_operator_map():
-    from azure.mgmt.monitor.models import ConditionOperator
-    return {'>': ConditionOperator.greater_than, '>=': ConditionOperator.greater_than_or_equal,
-            '<': ConditionOperator.less_than, '<=': ConditionOperator.less_than_or_equal}
-
-
-def get_aggregation_map():
-    from azure.mgmt.monitor.models import TimeAggregationOperator
-    return {'avg': TimeAggregationOperator.average, 'min': TimeAggregationOperator.minimum,
-            'max': TimeAggregationOperator.maximum, 'total': TimeAggregationOperator.total,
-            'last': TimeAggregationOperator.last}
-
-
 # region Autoscale Maps
 def get_autoscale_statistic_map():
     from azure.mgmt.monitor.models import MetricStatisticType

src/azure-cli/azure/cli/command_modules/vm/commands.py

@@ -534,7 +534,7 @@ def load_command_table(self, _):
     with self.command_group('vm monitor log', client_factory=cf_log_analytics_data_plane) as g:
         g.custom_command('show', 'execute_query_for_vm', transform=transform_log_analytics_query_output)  # pylint: disable=show-command
 
-    with self.command_group('vm monitor metrics', custom_command_type=monitor_custom, command_type=metric_definitions_sdk, resource_type=ResourceType.MGMT_MONITOR, operation_group='metric_definitions', min_api='2018-01-01', is_preview=True) as g:
+    with self.command_group('vm monitor metrics', custom_command_type=monitor_custom, command_type=metric_definitions_sdk, resource_type=ResourceType.MGMT_MONITOR, operation_group='metric_definitions', is_preview=True) as g:
         from azure.cli.command_modules.monitor.transformers import metrics_table, metrics_definitions_table
         from azure.cli.core.profiles._shared import APIVersionException
         try:

src/azure-cli/requirements.py3.Darwin.txt

@@ -53,7 +53,7 @@ azure-mgmt-managementgroups==1.0.0
 azure-mgmt-maps==2.0.0
 azure-mgmt-marketplaceordering==1.1.0
 azure-mgmt-media==9.0.0
-azure-mgmt-monitor==5.0.0
+azure-mgmt-monitor==7.0.0b1
 azure-mgmt-msi==7.0.0
 azure-mgmt-netapp==10.1.0
 azure-mgmt-policyinsights==1.1.0b4

src/azure-cli/requirements.py3.Linux.txt

@@ -53,7 +53,7 @@ azure-mgmt-managementgroups==1.0.0
 azure-mgmt-maps==2.0.0
 azure-mgmt-marketplaceordering==1.1.0
 azure-mgmt-media==9.0.0
-azure-mgmt-monitor==5.0.0
+azure-mgmt-monitor==7.0.0b1
 azure-mgmt-msi==7.0.0
 azure-mgmt-netapp==10.1.0
 azure-mgmt-policyinsights==1.1.0b4