From 9b5d24a6e4a8e41259a30fea9b9a9e57d8022bbf Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 16 Feb 2018 21:34:32 +0000 Subject: [PATCH 1/3] Generated from 25392731dd0415e1e5700412428dd5a96a2d7813 Fix PR comments 1 --- .../azure/mgmt/monitor/models/__init__.py | 2 - .../monitor/models/action_group_resource.py | 7 +-- .../mgmt/monitor/models/metric_definition.py | 12 +++++- .../azure/mgmt/monitor/models/response.py | 11 ++++- .../mgmt/monitor/models/voice_receiver.py | 43 ------------------- .../mgmt/monitor/monitor_management_client.py | 11 +++-- .../operations/action_groups_operations.py | 4 +- .../metric_definitions_operations.py | 6 ++- .../monitor/operations/metrics_operations.py | 6 ++- 9 files changed, 40 insertions(+), 62 deletions(-) delete mode 100644 azure-mgmt-monitor/azure/mgmt/monitor/models/voice_receiver.py diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/__init__.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/__init__.py index 2222f1bc6a4b..8f9add947966 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/__init__.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/__init__.py @@ -58,7 +58,6 @@ from .itsm_receiver import ItsmReceiver from .azure_app_push_receiver import AzureAppPushReceiver from .automation_runbook_receiver import AutomationRunbookReceiver -from .voice_receiver import VoiceReceiver from .action_group_resource import ActionGroupResource from .enable_request import EnableRequest from .action_group_patch_body import ActionGroupPatchBody @@ -161,7 +160,6 @@ 'ItsmReceiver', 'AzureAppPushReceiver', 'AutomationRunbookReceiver', - 'VoiceReceiver', 'ActionGroupResource', 'EnableRequest', 'ActionGroupPatchBody', diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/action_group_resource.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/action_group_resource.py index 4a57003b0446..9d4b8d20865e 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/action_group_resource.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/action_group_resource.py @@ -55,9 +55,6 @@ class ActionGroupResource(Resource): receivers that are part of this action group. :type automation_runbook_receivers: list[~azure.mgmt.monitor.models.AutomationRunbookReceiver] - :param voice_receivers: The list of voice receivers that are part of this - action group. - :type voice_receivers: list[~azure.mgmt.monitor.models.VoiceReceiver] """ _validation = { @@ -83,10 +80,9 @@ class ActionGroupResource(Resource): 'itsm_receivers': {'key': 'properties.itsmReceivers', 'type': '[ItsmReceiver]'}, 'azure_app_push_receivers': {'key': 'properties.azureAppPushReceivers', 'type': '[AzureAppPushReceiver]'}, 'automation_runbook_receivers': {'key': 'properties.automationRunbookReceivers', 'type': '[AutomationRunbookReceiver]'}, - 'voice_receivers': {'key': 'properties.voiceReceivers', 'type': '[VoiceReceiver]'}, } - def __init__(self, location, group_short_name, tags=None, enabled=True, email_receivers=None, sms_receivers=None, webhook_receivers=None, itsm_receivers=None, azure_app_push_receivers=None, automation_runbook_receivers=None, voice_receivers=None): + def __init__(self, location, group_short_name, tags=None, enabled=True, email_receivers=None, sms_receivers=None, webhook_receivers=None, itsm_receivers=None, azure_app_push_receivers=None, automation_runbook_receivers=None): super(ActionGroupResource, self).__init__(location=location, tags=tags) self.group_short_name = group_short_name self.enabled = enabled @@ -96,4 +92,3 @@ def __init__(self, location, group_short_name, tags=None, enabled=True, email_re self.itsm_receivers = itsm_receivers self.azure_app_push_receivers = azure_app_push_receivers self.automation_runbook_receivers = automation_runbook_receivers - self.voice_receivers = voice_receivers diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_definition.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_definition.py index 95c436ba5818..321a5a0781f2 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_definition.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/metric_definition.py @@ -21,6 +21,8 @@ class MetricDefinition(Model): :param resource_id: the resource identifier of the resource that emitted the metric. :type resource_id: str + :param namespace: the namespace the metric blongs to. + :type namespace: str :param name: the name and the display name of the metric, i.e. it is a localizable string. :type name: ~azure.mgmt.monitor.models.LocalizableString @@ -33,6 +35,10 @@ class MetricDefinition(Model): 'None', 'Average', 'Count', 'Minimum', 'Maximum', 'Total' :type primary_aggregation_type: str or ~azure.mgmt.monitor.models.AggregationType + :param supported_aggregation_types: the collection of what aggregation + types are supported. + :type supported_aggregation_types: list[str or + ~azure.mgmt.monitor.models.AggregationType] :param metric_availabilities: the collection of what aggregation intervals are available to be queried. :type metric_availabilities: @@ -47,21 +53,25 @@ class MetricDefinition(Model): _attribute_map = { 'is_dimension_required': {'key': 'isDimensionRequired', 'type': 'bool'}, 'resource_id': {'key': 'resourceId', 'type': 'str'}, + 'namespace': {'key': 'namespace', 'type': 'str'}, 'name': {'key': 'name', 'type': 'LocalizableString'}, 'unit': {'key': 'unit', 'type': 'Unit'}, 'primary_aggregation_type': {'key': 'primaryAggregationType', 'type': 'AggregationType'}, + 'supported_aggregation_types': {'key': 'supportedAggregationTypes', 'type': '[AggregationType]'}, 'metric_availabilities': {'key': 'metricAvailabilities', 'type': '[MetricAvailability]'}, 'id': {'key': 'id', 'type': 'str'}, 'dimensions': {'key': 'dimensions', 'type': '[LocalizableString]'}, } - def __init__(self, is_dimension_required=None, resource_id=None, name=None, unit=None, primary_aggregation_type=None, metric_availabilities=None, id=None, dimensions=None): + def __init__(self, is_dimension_required=None, resource_id=None, namespace=None, name=None, unit=None, primary_aggregation_type=None, supported_aggregation_types=None, metric_availabilities=None, id=None, dimensions=None): super(MetricDefinition, self).__init__() self.is_dimension_required = is_dimension_required self.resource_id = resource_id + self.namespace = namespace self.name = name self.unit = unit self.primary_aggregation_type = primary_aggregation_type + self.supported_aggregation_types = supported_aggregation_types self.metric_availabilities = metric_availabilities self.id = id self.dimensions = dimensions diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/response.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/response.py index 36b9b4dfe381..3f62025c3d5a 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/response.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/response.py @@ -28,6 +28,11 @@ class Response(Model): what was originally requested. This is not present if a metadata request was made. :type interval: timedelta + :param namespace: The namespace of the metrics been queried + :type namespace: str + :param resourceregion: The region of the resource been queried for + metrics. + :type resourceregion: str :param value: the value of the collection. :type value: list[~azure.mgmt.monitor.models.Metric] """ @@ -42,12 +47,16 @@ class Response(Model): 'cost': {'key': 'cost', 'type': 'float'}, 'timespan': {'key': 'timespan', 'type': 'str'}, 'interval': {'key': 'interval', 'type': 'duration'}, + 'namespace': {'key': 'namespace', 'type': 'str'}, + 'resourceregion': {'key': 'resourceregion', 'type': 'str'}, 'value': {'key': 'value', 'type': '[Metric]'}, } - def __init__(self, timespan, value, cost=None, interval=None): + def __init__(self, timespan, value, cost=None, interval=None, namespace=None, resourceregion=None): super(Response, self).__init__() self.cost = cost self.timespan = timespan self.interval = interval + self.namespace = namespace + self.resourceregion = resourceregion self.value = value diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/voice_receiver.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/voice_receiver.py deleted file mode 100644 index 9cf626334e5f..000000000000 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/voice_receiver.py +++ /dev/null @@ -1,43 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# 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 Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class VoiceReceiver(Model): - """An voice receiver. - - :param name: The name of the voice receiver. Names must be unique across - all receivers within an action group. - :type name: str - :param country_code: The country code of the voice receiver. - :type country_code: str - :param phone_number: The phone number of the voice receiver. - :type phone_number: str - """ - - _validation = { - 'name': {'required': True}, - 'country_code': {'required': True}, - 'phone_number': {'required': True}, - } - - _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'country_code': {'key': 'countryCode', 'type': 'str'}, - 'phone_number': {'key': 'phoneNumber', 'type': 'str'}, - } - - def __init__(self, name, country_code, phone_number): - super(VoiceReceiver, self).__init__() - self.name = name - self.country_code = country_code - self.phone_number = phone_number diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/monitor_management_client.py b/azure-mgmt-monitor/azure/mgmt/monitor/monitor_management_client.py index 8ba664998175..518a1bccefdf 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/monitor_management_client.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/monitor_management_client.py @@ -41,11 +41,13 @@ class MonitorManagementClientConfiguration(AzureConfiguration): object` :param subscription_id: The Azure subscription Id. :type subscription_id: str + :param metricnamespace: Metric namespace to query metric definitions for. + :type metricnamespace: str :param str base_url: Service URL """ def __init__( - self, credentials, subscription_id, base_url=None): + self, credentials, subscription_id, metricnamespace=None, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") @@ -61,6 +63,7 @@ def __init__( self.credentials = credentials self.subscription_id = subscription_id + self.metricnamespace = metricnamespace class MonitorManagementClient(object): @@ -105,13 +108,15 @@ class MonitorManagementClient(object): object` :param subscription_id: The Azure subscription Id. :type subscription_id: str + :param metricnamespace: Metric namespace to query metric definitions for. + :type metricnamespace: str :param str base_url: Service URL """ def __init__( - self, credentials, subscription_id, base_url=None): + self, credentials, subscription_id, metricnamespace=None, base_url=None): - self.config = MonitorManagementClientConfiguration(credentials, subscription_id, base_url) + self.config = MonitorManagementClientConfiguration(credentials, subscription_id, metricnamespace, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/operations/action_groups_operations.py b/azure-mgmt-monitor/azure/mgmt/monitor/operations/action_groups_operations.py index 01d36f0735cf..88fd6c92ff0f 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/operations/action_groups_operations.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/operations/action_groups_operations.py @@ -22,7 +22,7 @@ class ActionGroupsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2018-03-01". + :ivar api_version: Client Api Version. Constant value: "2017-04-01". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01" + self.api_version = "2017-04-01" self.config = config diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/operations/metric_definitions_operations.py b/azure-mgmt-monitor/azure/mgmt/monitor/operations/metric_definitions_operations.py index a2f5e5694fe2..19b4ba3c84d4 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/operations/metric_definitions_operations.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/operations/metric_definitions_operations.py @@ -22,7 +22,7 @@ class MetricDefinitionsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2017-05-01-preview". + :ivar api_version: Client Api Version. Constant value: "2018-01-01". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-05-01-preview" + self.api_version = "2018-01-01" self.config = config @@ -66,6 +66,8 @@ def internal_paging(next_link=None, raw=False): # Construct parameters query_parameters = {} query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + if self.config.metricnamespace is not None: + query_parameters['metricnamespace'] = self._serialize.query("self.config.metricnamespace", self.config.metricnamespace, 'str') else: url = next_link diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/operations/metrics_operations.py b/azure-mgmt-monitor/azure/mgmt/monitor/operations/metrics_operations.py index e7779d026c28..5f638cae2d13 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/operations/metrics_operations.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/operations/metrics_operations.py @@ -22,7 +22,7 @@ class MetricsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2017-05-01-preview". + :ivar api_version: Client Api Version. Constant value: "2018-01-01". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-05-01-preview" + self.api_version = "2018-01-01" self.config = config @@ -113,6 +113,8 @@ def list( if result_type is not None: query_parameters['resultType'] = self._serialize.query("result_type", result_type, 'ResultType') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + if self.config.metricnamespace is not None: + query_parameters['metricnamespace'] = self._serialize.query("self.config.metricnamespace", self.config.metricnamespace, 'str') # Construct headers header_parameters = {} From 7f7e79d9d1ba520a2d5f53fc824df31250742330 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 16 Feb 2018 23:52:02 +0000 Subject: [PATCH 2/3] Generated from f6739fd0e07e3d040fc0b1f47f3297a7a4a69cba Fixing top/orderby names, Please be reminded, there is no code change, it's just a typo of the names. --- .../azure/mgmt/monitor/operations/metrics_operations.py | 4 ++-- azure-mgmt-monitor/azure/mgmt/monitor/version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/operations/metrics_operations.py b/azure-mgmt-monitor/azure/mgmt/monitor/operations/metrics_operations.py index 5f638cae2d13..2ad03c03eaa1 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/operations/metrics_operations.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/operations/metrics_operations.py @@ -105,9 +105,9 @@ def list( if aggregation is not None: query_parameters['aggregation'] = self._serialize.query("aggregation", aggregation, 'str') if top is not None: - query_parameters['$top'] = self._serialize.query("top", top, 'float') + query_parameters['top'] = self._serialize.query("top", top, 'float') if orderby is not None: - query_parameters['$orderby'] = self._serialize.query("orderby", orderby, 'str') + query_parameters['orderby'] = self._serialize.query("orderby", orderby, 'str') if filter is not None: query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if result_type is not None: diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/version.py b/azure-mgmt-monitor/azure/mgmt/monitor/version.py index 53a203f32aaf..266f5a486d79 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/version.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "" +VERSION = "0.5.0" From 5b33de39e1c2574d0396763420108b1d6bdd45c6 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 20 Feb 2018 18:07:41 +0000 Subject: [PATCH 3/3] Generated from 8ddf699be2bc7bd7a429b97db29d4abb3f238cad Fix meta data sample as well. --- .../azure/mgmt/monitor/models/event_data.py | 179 ++++++++---------- .../azure/mgmt/monitor/version.py | 2 +- 2 files changed, 78 insertions(+), 103 deletions(-) diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/models/event_data.py b/azure-mgmt-monitor/azure/mgmt/monitor/models/event_data.py index 990e7e16a3d8..e0b9021b3d3e 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/models/event_data.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/models/event_data.py @@ -15,66 +15,62 @@ class EventData(Model): """The Azure event log entries are of type EventData. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar authorization: - :vartype authorization: ~azure.mgmt.monitor.models.SenderAuthorization - :ivar claims: key value pairs to identify ARM permissions. - :vartype claims: dict[str, str] - :ivar caller: the email address of the user who has performed the + :param authorization: + :type authorization: ~azure.mgmt.monitor.models.SenderAuthorization + :param claims: key value pairs to identify ARM permissions. + :type claims: dict[str, str] + :param caller: the email address of the user who has performed the operation, the UPN claim or SPN claim based on availability. - :vartype caller: str - :ivar description: the description of the event. - :vartype description: str - :ivar id: the Id of this event as required by ARM for RBAC. It contains + :type caller: str + :param description: the description of the event. + :type description: str + :param id: the Id of this event as required by ARM for RBAC. It contains the EventDataID and a timestamp information. - :vartype id: str - :ivar event_data_id: the event data Id. This is a unique identifier for an - event. - :vartype event_data_id: str - :ivar correlation_id: the correlation Id, usually a GUID in the string + :type id: str + :param event_data_id: the event data Id. This is a unique identifier for + an event. + :type event_data_id: str + :param correlation_id: the correlation Id, usually a GUID in the string format. The correlation Id is shared among the events that belong to the same uber operation. - :vartype correlation_id: str - :ivar event_name: the event name. This value should not be confused with + :type correlation_id: str + :param event_name: the event name. This value should not be confused with OperationName. For practical purposes, OperationName might be more appealing to end users. - :vartype event_name: ~azure.mgmt.monitor.models.LocalizableString - :ivar category: the event category. - :vartype category: ~azure.mgmt.monitor.models.LocalizableString - :ivar http_request: the HTTP request info. Usually includes the + :type event_name: ~azure.mgmt.monitor.models.LocalizableString + :param category: the event category. + :type category: ~azure.mgmt.monitor.models.LocalizableString + :param http_request: the HTTP request info. Usually includes the 'clientRequestId', 'clientIpAddress' (IP address of the user who initiated the event) and 'method' (HTTP method e.g. PUT). - :vartype http_request: ~azure.mgmt.monitor.models.HttpRequestInfo - :ivar level: the event level. Possible values include: 'Critical', + :type http_request: ~azure.mgmt.monitor.models.HttpRequestInfo + :param level: the event level. Possible values include: 'Critical', 'Error', 'Warning', 'Informational', 'Verbose' - :vartype level: str or ~azure.mgmt.monitor.models.EventLevel - :ivar resource_group_name: the resource group name of the impacted + :type level: str or ~azure.mgmt.monitor.models.EventLevel + :param resource_group_name: the resource group name of the impacted resource. - :vartype resource_group_name: str - :ivar resource_provider_name: the resource provider name of the impacted + :type resource_group_name: str + :param resource_provider_name: the resource provider name of the impacted resource. - :vartype resource_provider_name: - ~azure.mgmt.monitor.models.LocalizableString - :ivar resource_id: the resource uri that uniquely identifies the resource + :type resource_provider_name: ~azure.mgmt.monitor.models.LocalizableString + :param resource_id: the resource uri that uniquely identifies the resource that caused this event. - :vartype resource_id: str - :ivar resource_type: the resource type - :vartype resource_type: ~azure.mgmt.monitor.models.LocalizableString - :ivar operation_id: It is usually a GUID shared among the events + :type resource_id: str + :param resource_type: the resource type + :type resource_type: ~azure.mgmt.monitor.models.LocalizableString + :param operation_id: It is usually a GUID shared among the events corresponding to single operation. This value should not be confused with EventName. - :vartype operation_id: str - :ivar operation_name: the operation name. - :vartype operation_name: ~azure.mgmt.monitor.models.LocalizableString - :ivar properties: the set of pairs (usually a + :type operation_id: str + :param operation_name: the operation name. + :type operation_name: ~azure.mgmt.monitor.models.LocalizableString + :param properties: the set of pairs (usually a Dictionary) that includes details about the event. - :vartype properties: dict[str, str] - :ivar status: a string describing the status of the operation. Some + :type properties: dict[str, str] + :param status: a string describing the status of the operation. Some typical values are: Started, In progress, Succeeded, Failed, Resolved. - :vartype status: ~azure.mgmt.monitor.models.LocalizableString - :ivar sub_status: the event sub status. Most of the time, when included, + :type status: ~azure.mgmt.monitor.models.LocalizableString + :param sub_status: the event sub status. Most of the time, when included, this captures the HTTP status code of the REST call. Common values are: OK (HTTP Status Code: 200), Created (HTTP Status Code: 201), Accepted (HTTP Status Code: 202), No Content (HTTP Status Code: 204), Bad Request(HTTP @@ -82,48 +78,27 @@ class EventData(Model): Status Code: 409), Internal Server Error (HTTP Status Code: 500), Service Unavailable (HTTP Status Code:503), Gateway Timeout (HTTP Status Code: 504) - :vartype sub_status: ~azure.mgmt.monitor.models.LocalizableString - :ivar event_timestamp: the timestamp of when the event was generated by + :type sub_status: ~azure.mgmt.monitor.models.LocalizableString + :param event_timestamp: the timestamp of when the event was generated by the Azure service processing the request corresponding the event. It in ISO 8601 format. - :vartype event_timestamp: datetime - :ivar submission_timestamp: the timestamp of when the event became + :type event_timestamp: datetime + :param submission_timestamp: the timestamp of when the event became available for querying via this API. It is in ISO 8601 format. This value should not be confused eventTimestamp. As there might be a delay between the occurrence time of the event, and the time that the event is submitted to the Azure logging infrastructure. - :vartype submission_timestamp: datetime - :ivar subscription_id: the Azure subscription Id usually a GUID. - :vartype subscription_id: str - :ivar tenant_id: the Azure tenant Id - :vartype tenant_id: str + :type submission_timestamp: datetime + :param subscription_id: the Azure subscription Id usually a GUID. + :type subscription_id: str + :param tenant_id: the Azure tenant Id + :type tenant_id: str """ _validation = { - 'authorization': {'readonly': True}, - 'claims': {'readonly': True}, - 'caller': {'readonly': True}, - 'description': {'readonly': True}, - 'id': {'readonly': True}, - 'event_data_id': {'readonly': True}, - 'correlation_id': {'readonly': True}, - 'event_name': {'readonly': True}, - 'category': {'readonly': True}, - 'http_request': {'readonly': True}, - 'level': {'readonly': True}, - 'resource_group_name': {'readonly': True}, - 'resource_provider_name': {'readonly': True}, - 'resource_id': {'readonly': True}, - 'resource_type': {'readonly': True}, - 'operation_id': {'readonly': True}, - 'operation_name': {'readonly': True}, - 'properties': {'readonly': True}, - 'status': {'readonly': True}, - 'sub_status': {'readonly': True}, - 'event_timestamp': {'readonly': True}, - 'submission_timestamp': {'readonly': True}, - 'subscription_id': {'readonly': True}, - 'tenant_id': {'readonly': True}, + 'level': {'required': True}, + 'event_timestamp': {'required': True}, + 'submission_timestamp': {'required': True}, } _attribute_map = { @@ -153,29 +128,29 @@ class EventData(Model): 'tenant_id': {'key': 'tenantId', 'type': 'str'}, } - def __init__(self): + def __init__(self, level, event_timestamp, submission_timestamp, authorization=None, claims=None, caller=None, description=None, id=None, event_data_id=None, correlation_id=None, event_name=None, category=None, http_request=None, resource_group_name=None, resource_provider_name=None, resource_id=None, resource_type=None, operation_id=None, operation_name=None, properties=None, status=None, sub_status=None, subscription_id=None, tenant_id=None): super(EventData, self).__init__() - self.authorization = None - self.claims = None - self.caller = None - self.description = None - self.id = None - self.event_data_id = None - self.correlation_id = None - self.event_name = None - self.category = None - self.http_request = None - self.level = None - self.resource_group_name = None - self.resource_provider_name = None - self.resource_id = None - self.resource_type = None - self.operation_id = None - self.operation_name = None - self.properties = None - self.status = None - self.sub_status = None - self.event_timestamp = None - self.submission_timestamp = None - self.subscription_id = None - self.tenant_id = None + self.authorization = authorization + self.claims = claims + self.caller = caller + self.description = description + self.id = id + self.event_data_id = event_data_id + self.correlation_id = correlation_id + self.event_name = event_name + self.category = category + self.http_request = http_request + self.level = level + self.resource_group_name = resource_group_name + self.resource_provider_name = resource_provider_name + self.resource_id = resource_id + self.resource_type = resource_type + self.operation_id = operation_id + self.operation_name = operation_name + self.properties = properties + self.status = status + self.sub_status = sub_status + self.event_timestamp = event_timestamp + self.submission_timestamp = submission_timestamp + self.subscription_id = subscription_id + self.tenant_id = tenant_id diff --git a/azure-mgmt-monitor/azure/mgmt/monitor/version.py b/azure-mgmt-monitor/azure/mgmt/monitor/version.py index 266f5a486d79..53a203f32aaf 100644 --- a/azure-mgmt-monitor/azure/mgmt/monitor/version.py +++ b/azure-mgmt-monitor/azure/mgmt/monitor/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.5.0" +VERSION = ""