diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/action_group_resource_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/action_group_resource_py3.py index 0a085e1e5b52..81edb6f53b0f 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/action_group_resource_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/action_group_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class ActionGroupResource(Resource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/activity_log_alert_resource_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/activity_log_alert_resource_py3.py index bc03347d612d..1d44d057e560 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/activity_log_alert_resource_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/activity_log_alert_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class ActivityLogAlertResource(Resource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/alert_rule_resource_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/alert_rule_resource_py3.py index 83f226b1201d..c5d83396e2ab 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/alert_rule_resource_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/alert_rule_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class AlertRuleResource(Resource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/alerting_action.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/alerting_action.py index b58fa3b4a748..462b180d180f 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/alerting_action.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/alerting_action.py @@ -26,10 +26,10 @@ class AlertingAction(Action): :param severity: Required. Severity of the alert. Possible values include: '0', '1', '2', '3', '4' :type severity: str or ~azure.mgmt.monitor.models.AlertSeverity - :param azns_action: Required. Azure action group reference. + :param azns_action: Required. azns notification group reference. :type azns_action: ~azure.mgmt.monitor.models.AzNsActionGroup :param throttling_in_min: time (in minutes) for which Alerts should be - throttled or suppressed. + throttled :type throttling_in_min: int :param trigger: Required. The trigger condition that results in the alert rule being. diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/alerting_action_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/alerting_action_py3.py index dc5c47092f0a..8e1083acad51 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/alerting_action_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/alerting_action_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .action import Action +from .action_py3 import Action class AlertingAction(Action): @@ -26,10 +26,10 @@ class AlertingAction(Action): :param severity: Required. Severity of the alert. Possible values include: '0', '1', '2', '3', '4' :type severity: str or ~azure.mgmt.monitor.models.AlertSeverity - :param azns_action: Required. Azure action group reference. + :param azns_action: Required. azns notification group reference. :type azns_action: ~azure.mgmt.monitor.models.AzNsActionGroup :param throttling_in_min: time (in minutes) for which Alerts should be - throttled or suppressed. + throttled :type throttling_in_min: int :param trigger: Required. The trigger condition that results in the alert rule being. diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/autoscale_setting_resource_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/autoscale_setting_resource_py3.py index b09a23c57c85..23eb4643a585 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/autoscale_setting_resource_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/autoscale_setting_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class AutoscaleSettingResource(Resource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/az_ns_action_group.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/az_ns_action_group.py index d98d5546826e..5c5576517664 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/az_ns_action_group.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/az_ns_action_group.py @@ -13,15 +13,14 @@ class AzNsActionGroup(Model): - """Azure action group. + """azns notification group. - :param action_group: Azure Action Group reference. + :param action_group: Azure Group reference. :type action_group: list[str] - :param email_subject: Custom subject override for all email ids in Azure - action group + :param email_subject: Custom subject for Azns email :type email_subject: str - :param custom_webhook_payload: Custom payload to be sent for all webook - URI in Azure action group + :param custom_webhook_payload: Custom webhook payload to be send to azns + action group :type custom_webhook_payload: str """ diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/az_ns_action_group_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/az_ns_action_group_py3.py index 72bc693ab43d..bd5f281ea775 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/az_ns_action_group_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/az_ns_action_group_py3.py @@ -13,15 +13,14 @@ class AzNsActionGroup(Model): - """Azure action group. + """azns notification group. - :param action_group: Azure Action Group reference. + :param action_group: Azure Group reference. :type action_group: list[str] - :param email_subject: Custom subject override for all email ids in Azure - action group + :param email_subject: Custom subject for Azns email :type email_subject: str - :param custom_webhook_payload: Custom payload to be sent for all webook - URI in Azure action group + :param custom_webhook_payload: Custom webhook payload to be send to azns + action group :type custom_webhook_payload: str """ diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/diagnostic_settings_category_resource_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/diagnostic_settings_category_resource_py3.py index 3c98429cbc1c..f97b609a6e0a 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/diagnostic_settings_category_resource_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/diagnostic_settings_category_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .proxy_only_resource import ProxyOnlyResource +from .proxy_only_resource_py3 import ProxyOnlyResource class DiagnosticSettingsCategoryResource(ProxyOnlyResource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/diagnostic_settings_resource_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/diagnostic_settings_resource_py3.py index df04a6892561..8d02b9e280ca 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/diagnostic_settings_resource_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/diagnostic_settings_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .proxy_only_resource import ProxyOnlyResource +from .proxy_only_resource_py3 import ProxyOnlyResource class DiagnosticSettingsResource(ProxyOnlyResource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/location_threshold_rule_condition_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/location_threshold_rule_condition_py3.py index 1d4157b8cdd1..e0d0eff9a386 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/location_threshold_rule_condition_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/location_threshold_rule_condition_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .rule_condition import RuleCondition +from .rule_condition_py3 import RuleCondition class LocationThresholdRuleCondition(RuleCondition): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/log_profile_resource_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/log_profile_resource_py3.py index ec376218e6c2..28d3892f442d 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/log_profile_resource_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/log_profile_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class LogProfileResource(Resource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/log_search_rule_resource_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/log_search_rule_resource_py3.py index 90bedd4f1bcb..5cee5f349023 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/log_search_rule_resource_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/log_search_rule_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class LogSearchRuleResource(Resource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/management_event_rule_condition_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/management_event_rule_condition_py3.py index 6de67497fbcd..6fb5cdb009f7 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/management_event_rule_condition_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/management_event_rule_condition_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .rule_condition import RuleCondition +from .rule_condition_py3 import RuleCondition class ManagementEventRuleCondition(RuleCondition): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource.py index 4a45ac4ed6f6..5324dcac5a59 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource.py @@ -50,6 +50,9 @@ class MetricAlertResource(Resource): :param criteria: Required. defines the specific alert criteria information. :type criteria: ~azure.mgmt.monitor.models.MetricAlertCriteria + :param auto_mitigate: the flag that indicates whether the alert should be + auto resolved or not. + :type auto_mitigate: bool :param actions: the array of actions that are performed when the alert rule becomes active, and when an alert condition is resolved. :type actions: list[~azure.mgmt.monitor.models.Action] @@ -84,6 +87,7 @@ class MetricAlertResource(Resource): 'evaluation_frequency': {'key': 'properties.evaluationFrequency', 'type': 'duration'}, 'window_size': {'key': 'properties.windowSize', 'type': 'duration'}, 'criteria': {'key': 'properties.criteria', 'type': 'MetricAlertCriteria'}, + 'auto_mitigate': {'key': 'properties.autoMitigate', 'type': 'bool'}, 'actions': {'key': 'properties.actions', 'type': '[Action]'}, 'last_updated_time': {'key': 'properties.lastUpdatedTime', 'type': 'iso-8601'}, } @@ -97,5 +101,6 @@ def __init__(self, **kwargs): self.evaluation_frequency = kwargs.get('evaluation_frequency', None) self.window_size = kwargs.get('window_size', None) self.criteria = kwargs.get('criteria', None) + self.auto_mitigate = kwargs.get('auto_mitigate', None) self.actions = kwargs.get('actions', None) self.last_updated_time = None diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_patch.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_patch.py index 52be4f70d27e..ec51a3f1fdbe 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_patch.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_patch.py @@ -42,6 +42,9 @@ class MetricAlertResourcePatch(Model): :param criteria: Required. defines the specific alert criteria information. :type criteria: ~azure.mgmt.monitor.models.MetricAlertCriteria + :param auto_mitigate: the flag that indicates whether the alert should be + auto resolved or not. + :type auto_mitigate: bool :param actions: the array of actions that are performed when the alert rule becomes active, and when an alert condition is resolved. :type actions: list[~azure.mgmt.monitor.models.Action] @@ -68,6 +71,7 @@ class MetricAlertResourcePatch(Model): 'evaluation_frequency': {'key': 'properties.evaluationFrequency', 'type': 'duration'}, 'window_size': {'key': 'properties.windowSize', 'type': 'duration'}, 'criteria': {'key': 'properties.criteria', 'type': 'MetricAlertCriteria'}, + 'auto_mitigate': {'key': 'properties.autoMitigate', 'type': 'bool'}, 'actions': {'key': 'properties.actions', 'type': '[Action]'}, 'last_updated_time': {'key': 'properties.lastUpdatedTime', 'type': 'iso-8601'}, } @@ -82,5 +86,6 @@ def __init__(self, **kwargs): self.evaluation_frequency = kwargs.get('evaluation_frequency', None) self.window_size = kwargs.get('window_size', None) self.criteria = kwargs.get('criteria', None) + self.auto_mitigate = kwargs.get('auto_mitigate', None) self.actions = kwargs.get('actions', None) self.last_updated_time = None diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_patch_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_patch_py3.py index 2198413c7819..7a4cad2c38e2 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_patch_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_patch_py3.py @@ -42,6 +42,9 @@ class MetricAlertResourcePatch(Model): :param criteria: Required. defines the specific alert criteria information. :type criteria: ~azure.mgmt.monitor.models.MetricAlertCriteria + :param auto_mitigate: the flag that indicates whether the alert should be + auto resolved or not. + :type auto_mitigate: bool :param actions: the array of actions that are performed when the alert rule becomes active, and when an alert condition is resolved. :type actions: list[~azure.mgmt.monitor.models.Action] @@ -68,11 +71,12 @@ class MetricAlertResourcePatch(Model): 'evaluation_frequency': {'key': 'properties.evaluationFrequency', 'type': 'duration'}, 'window_size': {'key': 'properties.windowSize', 'type': 'duration'}, 'criteria': {'key': 'properties.criteria', 'type': 'MetricAlertCriteria'}, + 'auto_mitigate': {'key': 'properties.autoMitigate', 'type': 'bool'}, 'actions': {'key': 'properties.actions', 'type': '[Action]'}, 'last_updated_time': {'key': 'properties.lastUpdatedTime', 'type': 'iso-8601'}, } - def __init__(self, *, description: str, severity: int, enabled: bool, evaluation_frequency, window_size, criteria, tags=None, scopes=None, actions=None, **kwargs) -> None: + def __init__(self, *, description: str, severity: int, enabled: bool, evaluation_frequency, window_size, criteria, tags=None, scopes=None, auto_mitigate: bool=None, actions=None, **kwargs) -> None: super(MetricAlertResourcePatch, self).__init__(**kwargs) self.tags = tags self.description = description @@ -82,5 +86,6 @@ def __init__(self, *, description: str, severity: int, enabled: bool, evaluation self.evaluation_frequency = evaluation_frequency self.window_size = window_size self.criteria = criteria + self.auto_mitigate = auto_mitigate self.actions = actions self.last_updated_time = None diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_py3.py index 7dfbfeb5cae8..06c36b04a910 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class MetricAlertResource(Resource): @@ -50,6 +50,9 @@ class MetricAlertResource(Resource): :param criteria: Required. defines the specific alert criteria information. :type criteria: ~azure.mgmt.monitor.models.MetricAlertCriteria + :param auto_mitigate: the flag that indicates whether the alert should be + auto resolved or not. + :type auto_mitigate: bool :param actions: the array of actions that are performed when the alert rule becomes active, and when an alert condition is resolved. :type actions: list[~azure.mgmt.monitor.models.Action] @@ -84,11 +87,12 @@ class MetricAlertResource(Resource): 'evaluation_frequency': {'key': 'properties.evaluationFrequency', 'type': 'duration'}, 'window_size': {'key': 'properties.windowSize', 'type': 'duration'}, 'criteria': {'key': 'properties.criteria', 'type': 'MetricAlertCriteria'}, + 'auto_mitigate': {'key': 'properties.autoMitigate', 'type': 'bool'}, 'actions': {'key': 'properties.actions', 'type': '[Action]'}, 'last_updated_time': {'key': 'properties.lastUpdatedTime', 'type': 'iso-8601'}, } - def __init__(self, *, location: str, description: str, severity: int, enabled: bool, evaluation_frequency, window_size, criteria, tags=None, scopes=None, actions=None, **kwargs) -> None: + def __init__(self, *, location: str, description: str, severity: int, enabled: bool, evaluation_frequency, window_size, criteria, tags=None, scopes=None, auto_mitigate: bool=None, actions=None, **kwargs) -> None: super(MetricAlertResource, self).__init__(location=location, tags=tags, **kwargs) self.description = description self.severity = severity @@ -97,5 +101,6 @@ def __init__(self, *, location: str, description: str, severity: int, enabled: b self.evaluation_frequency = evaluation_frequency self.window_size = window_size self.criteria = criteria + self.auto_mitigate = auto_mitigate self.actions = actions self.last_updated_time = None diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_single_resource_multiple_metric_criteria_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_single_resource_multiple_metric_criteria_py3.py index 171a2bff719d..7e74e7a90272 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_single_resource_multiple_metric_criteria_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_alert_single_resource_multiple_metric_criteria_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .metric_alert_criteria import MetricAlertCriteria +from .metric_alert_criteria_py3 import MetricAlertCriteria class MetricAlertSingleResourceMultipleMetricCriteria(MetricAlertCriteria): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_email_action_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_email_action_py3.py index ebc3c723dacf..4c871a13da37 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_email_action_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_email_action_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .rule_action import RuleAction +from .rule_action_py3 import RuleAction class RuleEmailAction(RuleAction): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_management_event_data_source_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_management_event_data_source_py3.py index 5bf22d45150d..83398e8909b4 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_management_event_data_source_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_management_event_data_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .rule_data_source import RuleDataSource +from .rule_data_source_py3 import RuleDataSource class RuleManagementEventDataSource(RuleDataSource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_metric_data_source_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_metric_data_source_py3.py index d29e9ecf9fd1..ad28d6387bb5 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_metric_data_source_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_metric_data_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .rule_data_source import RuleDataSource +from .rule_data_source_py3 import RuleDataSource class RuleMetricDataSource(RuleDataSource): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_webhook_action_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_webhook_action_py3.py index 20ac0fd328e0..4f0803555d93 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_webhook_action_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/rule_webhook_action_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .rule_action import RuleAction +from .rule_action_py3 import RuleAction class RuleWebhookAction(RuleAction): diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/source.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/source.py index 00ff167884b7..3f3ba2b7687a 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/source.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/source.py @@ -21,9 +21,9 @@ class Source(Model): :type query: str :param authorized_resources: List of Resource referred into query :type authorized_resources: list[str] - :param data_source_id: Required. The resource uri over which log search + :param datasource_id: Required. The resource uri over which log search query is to be run. - :type data_source_id: str + :type datasource_id: str :param query_type: Set value to ResultCount if query should be returning search result count. Set it to Number if its a metric query. Possible values include: 'ResultCount' @@ -32,13 +32,13 @@ class Source(Model): _validation = { 'query': {'required': True}, - 'data_source_id': {'required': True}, + 'datasource_id': {'required': True}, } _attribute_map = { 'query': {'key': 'query', 'type': 'str'}, 'authorized_resources': {'key': 'authorizedResources', 'type': '[str]'}, - 'data_source_id': {'key': 'dataSourceId', 'type': 'str'}, + 'datasource_id': {'key': 'datasourceId', 'type': 'str'}, 'query_type': {'key': 'queryType', 'type': 'str'}, } @@ -46,5 +46,5 @@ def __init__(self, **kwargs): super(Source, self).__init__(**kwargs) self.query = kwargs.get('query', None) self.authorized_resources = kwargs.get('authorized_resources', None) - self.data_source_id = kwargs.get('data_source_id', None) + self.datasource_id = kwargs.get('datasource_id', None) self.query_type = kwargs.get('query_type', None) diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/source_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/source_py3.py index e06241180a82..aaaba5c0cc01 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/source_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/source_py3.py @@ -21,9 +21,9 @@ class Source(Model): :type query: str :param authorized_resources: List of Resource referred into query :type authorized_resources: list[str] - :param data_source_id: Required. The resource uri over which log search + :param datasource_id: Required. The resource uri over which log search query is to be run. - :type data_source_id: str + :type datasource_id: str :param query_type: Set value to ResultCount if query should be returning search result count. Set it to Number if its a metric query. Possible values include: 'ResultCount' @@ -32,19 +32,19 @@ class Source(Model): _validation = { 'query': {'required': True}, - 'data_source_id': {'required': True}, + 'datasource_id': {'required': True}, } _attribute_map = { 'query': {'key': 'query', 'type': 'str'}, 'authorized_resources': {'key': 'authorizedResources', 'type': '[str]'}, - 'data_source_id': {'key': 'dataSourceId', 'type': 'str'}, + 'datasource_id': {'key': 'datasourceId', 'type': 'str'}, 'query_type': {'key': 'queryType', 'type': 'str'}, } - def __init__(self, *, query: str, data_source_id: str, authorized_resources=None, query_type=None, **kwargs) -> None: + def __init__(self, *, query: str, datasource_id: str, authorized_resources=None, query_type=None, **kwargs) -> None: super(Source, self).__init__(**kwargs) self.query = query self.authorized_resources = authorized_resources - self.data_source_id = data_source_id + self.datasource_id = datasource_id self.query_type = query_type diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/threshold_rule_condition_py3.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/threshold_rule_condition_py3.py index e2f2340c02b0..8fbff1f8930e 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/threshold_rule_condition_py3.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/threshold_rule_condition_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .rule_condition import RuleCondition +from .rule_condition_py3 import RuleCondition class ThresholdRuleCondition(RuleCondition):