One Monitor client

azure-mgmt-monitor/HISTORY.rst

@@ -3,8 +3,27 @@
 Release History
 ===============
 
-unreleased (2017-XX-XX)
-+++++++++++++++++++++++
+0.4.0 (2017-10-25)
+++++++++++++++++++
+
+**Features**
+
+- Merge into this package the "azure-monitor" package including following operations groups
+
+  - event categories
+  - activity log
+  - tenant activity log
+  - metrics definitions
+  - metrics
+
+- Adding new multi-dimensional metrics API
+
+**Breaking changes**
+
+- Some exceptions have moved from CloudError to ErrorResponseException
+- "service_diagnostic_settings" renamed to "diagnostic_settings"
+
+- Update API version of "metrics". Migrating from "azure-monitor" to "metrics" here needs to be rewritten.
 
 **Bug fixes**
 

azure-mgmt-monitor/azure/mgmt/monitor/models/__init__.py

@@ -24,6 +24,9 @@
 from .autoscale_setting_resource import AutoscaleSettingResource
 from .autoscale_setting_resource_patch import AutoscaleSettingResourcePatch
 from .error_response import ErrorResponse, ErrorResponseException
+from .operation_display import OperationDisplay
+from .operation import Operation
+from .operation_list_result import OperationListResult
 from .incident import Incident
 from .rule_data_source import RuleDataSource
 from .rule_condition import RuleCondition
@@ -42,10 +45,13 @@
 from .retention_policy import RetentionPolicy
 from .log_profile_resource import LogProfileResource
 from .log_profile_resource_patch import LogProfileResourcePatch
+from .proxy_only_resource import ProxyOnlyResource
 from .metric_settings import MetricSettings
 from .log_settings import LogSettings
-from .service_diagnostic_settings_resource import ServiceDiagnosticSettingsResource
-from .service_diagnostic_settings_resource_patch import ServiceDiagnosticSettingsResourcePatch
+from .diagnostic_settings_resource import DiagnosticSettingsResource
+from .diagnostic_settings_resource_collection import DiagnosticSettingsResourceCollection
+from .diagnostic_settings_category_resource import DiagnosticSettingsCategoryResource
+from .diagnostic_settings_category_resource_collection import DiagnosticSettingsCategoryResourceCollection
 from .email_receiver import EmailReceiver
 from .sms_receiver import SmsReceiver
 from .webhook_receiver import WebhookReceiver
@@ -57,12 +63,26 @@
 from .activity_log_alert_action_list import ActivityLogAlertActionList
 from .activity_log_alert_resource import ActivityLogAlertResource
 from .activity_log_alert_patch_body import ActivityLogAlertPatchBody
+from .localizable_string import LocalizableString
+from .sender_authorization import SenderAuthorization
+from .http_request_info import HttpRequestInfo
+from .event_data import EventData
+from .metric_availability import MetricAvailability
+from .metric_definition import MetricDefinition
+from .metric_value import MetricValue
+from .metadata_value import MetadataValue
+from .time_series_element import TimeSeriesElement
+from .metric import Metric
+from .response import Response
 from .autoscale_setting_resource_paged import AutoscaleSettingResourcePaged
 from .incident_paged import IncidentPaged
 from .alert_rule_resource_paged import AlertRuleResourcePaged
 from .log_profile_resource_paged import LogProfileResourcePaged
 from .action_group_resource_paged import ActionGroupResourcePaged
 from .activity_log_alert_resource_paged import ActivityLogAlertResourcePaged
+from .event_data_paged import EventDataPaged
+from .localizable_string_paged import LocalizableStringPaged
+from .metric_definition_paged import MetricDefinitionPaged
 from .monitor_management_client_enums import (
     MetricStatisticType,
     TimeAggregationType,
@@ -72,7 +92,12 @@
     RecurrenceFrequency,
     ConditionOperator,
     TimeAggregationOperator,
+    CategoryType,
     ReceiverStatus,
+    EventLevel,
+    Unit,
+    AggregationType,
+    ResultType,
 )
 
 __all__ = [
@@ -91,6 +116,9 @@
     'AutoscaleSettingResource',
     'AutoscaleSettingResourcePatch',
     'ErrorResponse', 'ErrorResponseException',
+    'OperationDisplay',
+    'Operation',
+    'OperationListResult',
     'Incident',
     'RuleDataSource',
     'RuleCondition',
@@ -109,10 +137,13 @@
     'RetentionPolicy',
     'LogProfileResource',
     'LogProfileResourcePatch',
+    'ProxyOnlyResource',
     'MetricSettings',
     'LogSettings',
-    'ServiceDiagnosticSettingsResource',
-    'ServiceDiagnosticSettingsResourcePatch',
+    'DiagnosticSettingsResource',
+    'DiagnosticSettingsResourceCollection',
+    'DiagnosticSettingsCategoryResource',
+    'DiagnosticSettingsCategoryResourceCollection',
     'EmailReceiver',
     'SmsReceiver',
     'WebhookReceiver',
@@ -124,12 +155,26 @@
     'ActivityLogAlertActionList',
     'ActivityLogAlertResource',
     'ActivityLogAlertPatchBody',
+    'LocalizableString',
+    'SenderAuthorization',
+    'HttpRequestInfo',
+    'EventData',
+    'MetricAvailability',
+    'MetricDefinition',
+    'MetricValue',
+    'MetadataValue',
+    'TimeSeriesElement',
+    'Metric',
+    'Response',
     'AutoscaleSettingResourcePaged',
     'IncidentPaged',
     'AlertRuleResourcePaged',
     'LogProfileResourcePaged',
     'ActionGroupResourcePaged',
     'ActivityLogAlertResourcePaged',
+    'EventDataPaged',
+    'LocalizableStringPaged',
+    'MetricDefinitionPaged',
     'MetricStatisticType',
     'TimeAggregationType',
     'ComparisonOperationType',
@@ -138,5 +183,10 @@
     'RecurrenceFrequency',
     'ConditionOperator',
     'TimeAggregationOperator',
+    'CategoryType',
     'ReceiverStatus',
+    'EventLevel',
+    'Unit',
+    'AggregationType',
+    'ResultType',
 ]

azure-mgmt-monitor/azure/mgmt/monitor/models/action_group_resource.py

@@ -27,26 +27,23 @@ class ActionGroupResource(Resource):
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
-    :type tags: dict
+    :type tags: dict[str, str]
     :param group_short_name: The short name of the action group. This will be
      used in SMS messages.
     :type group_short_name: str
     :param enabled: Indicates whether this action group is enabled. If an
-     action group is not enabled, then none of its receviers will receive
+     action group is not enabled, then none of its receivers will receive
      communications. Default value: True .
     :type enabled: bool
     :param email_receivers: The list of email receivers that are part of this
      action group.
-    :type email_receivers: list of :class:`EmailReceiver
-     <azure.mgmt.monitor.models.EmailReceiver>`
+    :type email_receivers: list[~azure.mgmt.monitor.models.EmailReceiver]
     :param sms_receivers: The list of SMS receivers that are part of this
      action group.
-    :type sms_receivers: list of :class:`SmsReceiver
-     <azure.mgmt.monitor.models.SmsReceiver>`
+    :type sms_receivers: list[~azure.mgmt.monitor.models.SmsReceiver]
     :param webhook_receivers: The list of webhook receivers that are part of
      this action group.
-    :type webhook_receivers: list of :class:`WebhookReceiver
-     <azure.mgmt.monitor.models.WebhookReceiver>`
+    :type webhook_receivers: list[~azure.mgmt.monitor.models.WebhookReceiver]
     """
 
     _validation = {

azure-mgmt-monitor/azure/mgmt/monitor/models/activity_log_alert_action_group.py

@@ -20,7 +20,7 @@ class ActivityLogAlertActionGroup(Model):
     :type action_group_id: str
     :param webhook_properties: the dictionary of custom properties to include
      with the post operation. These data are appended to the webhook payload.
-    :type webhook_properties: dict
+    :type webhook_properties: dict[str, str]
     """
 
     _validation = {

azure-mgmt-monitor/azure/mgmt/monitor/models/activity_log_alert_action_list.py

@@ -16,8 +16,8 @@ class ActivityLogAlertActionList(Model):
     """A list of activity log alert actions.
 
     :param action_groups: The list of activity log alerts.
-    :type action_groups: list of :class:`ActivityLogAlertActionGroup
-     <azure.mgmt.monitor.models.ActivityLogAlertActionGroup>`
+    :type action_groups:
+     list[~azure.mgmt.monitor.models.ActivityLogAlertActionGroup]
     """
 
     _attribute_map = {

azure-mgmt-monitor/azure/mgmt/monitor/models/activity_log_alert_all_of_condition.py

@@ -17,8 +17,8 @@ class ActivityLogAlertAllOfCondition(Model):
     are met.
 
     :param all_of: The list of activity log alert conditions.
-    :type all_of: list of :class:`ActivityLogAlertLeafCondition
-     <azure.mgmt.monitor.models.ActivityLogAlertLeafCondition>`
+    :type all_of:
+     list[~azure.mgmt.monitor.models.ActivityLogAlertLeafCondition]
     """
 
     _validation = {

azure-mgmt-monitor/azure/mgmt/monitor/models/activity_log_alert_patch_body.py

@@ -16,7 +16,7 @@ class ActivityLogAlertPatchBody(Model):
     """An activity log alert object for the body of patch operations.
 
     :param tags: Resource tags
-    :type tags: dict
+    :type tags: dict[str, str]
     :param enabled: Indicates whether this activity log alert is enabled. If
      an activity log alert is not enabled, then none of its actions will be
      activated. Default value: True .

azure-mgmt-monitor/azure/mgmt/monitor/models/activity_log_alert_resource.py

@@ -27,21 +27,19 @@ class ActivityLogAlertResource(Resource):
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
-    :type tags: dict
+    :type tags: dict[str, str]
     :param scopes: A list of resourceIds that will be used as prefixes. The
      alert will only apply to activityLogs with resourceIds that fall under one
      of these prefixes. This list must include at least one item.
-    :type scopes: list of str
+    :type scopes: list[str]
     :param enabled: Indicates whether this activity log alert is enabled. If
      an activity log alert is not enabled, then none of its actions will be
      activated. Default value: True .
     :type enabled: bool
-    :param condition: The conditon that will cause this alert to activate.
-    :type condition: :class:`ActivityLogAlertAllOfCondition
-     <azure.mgmt.monitor.models.ActivityLogAlertAllOfCondition>`
+    :param condition: The condition that will cause this alert to activate.
+    :type condition: ~azure.mgmt.monitor.models.ActivityLogAlertAllOfCondition
     :param actions: The actions that will activate when the condition is met.
-    :type actions: :class:`ActivityLogAlertActionList
-     <azure.mgmt.monitor.models.ActivityLogAlertActionList>`
+    :type actions: ~azure.mgmt.monitor.models.ActivityLogAlertActionList
     :param description: A description of this activity log alert.
     :type description: str
     """

azure-mgmt-monitor/azure/mgmt/monitor/models/alert_rule_resource.py

@@ -27,7 +27,7 @@ class AlertRuleResource(Resource):
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
-    :type tags: dict
+    :type tags: dict[str, str]
     :param alert_rule_resource_name: the name of the alert rule.
     :type alert_rule_resource_name: str
     :param description: the description of the alert rule that will be
@@ -38,12 +38,10 @@ class AlertRuleResource(Resource):
     :type is_enabled: bool
     :param condition: the condition that results in the alert rule being
      activated.
-    :type condition: :class:`RuleCondition
-     <azure.mgmt.monitor.models.RuleCondition>`
+    :type condition: ~azure.mgmt.monitor.models.RuleCondition
     :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 of :class:`RuleAction
-     <azure.mgmt.monitor.models.RuleAction>`
+    :type actions: list[~azure.mgmt.monitor.models.RuleAction]
     :ivar last_updated_time: Last time the rule was updated in ISO8601 format.
     :vartype last_updated_time: datetime
     """

azure-mgmt-monitor/azure/mgmt/monitor/models/alert_rule_resource_patch.py

@@ -19,7 +19,7 @@ class AlertRuleResourcePatch(Model):
     sending a request.
 
     :param tags: Resource tags
-    :type tags: dict
+    :type tags: dict[str, str]
     :param name: the name of the alert rule.
     :type name: str
     :param description: the description of the alert rule that will be
@@ -30,12 +30,10 @@ class AlertRuleResourcePatch(Model):
     :type is_enabled: bool
     :param condition: the condition that results in the alert rule being
      activated.
-    :type condition: :class:`RuleCondition
-     <azure.mgmt.monitor.models.RuleCondition>`
+    :type condition: ~azure.mgmt.monitor.models.RuleCondition
     :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 of :class:`RuleAction
-     <azure.mgmt.monitor.models.RuleAction>`
+    :type actions: list[~azure.mgmt.monitor.models.RuleAction]
     :ivar last_updated_time: Last time the rule was updated in ISO8601 format.
     :vartype last_updated_time: datetime
     """

azure-mgmt-monitor/azure/mgmt/monitor/models/autoscale_notification.py

@@ -22,11 +22,9 @@ class AutoscaleNotification(Model):
      value must be "scale". Default value: "Scale" .
     :vartype operation: str
     :param email: the email notification.
-    :type email: :class:`EmailNotification
-     <azure.mgmt.monitor.models.EmailNotification>`
+    :type email: ~azure.mgmt.monitor.models.EmailNotification
     :param webhooks: the collection of webhook notifications.
-    :type webhooks: list of :class:`WebhookNotification
-     <azure.mgmt.monitor.models.WebhookNotification>`
+    :type webhooks: list[~azure.mgmt.monitor.models.WebhookNotification]
     """
 
     _validation = {

azure-mgmt-monitor/azure/mgmt/monitor/models/autoscale_profile.py

@@ -19,20 +19,16 @@ class AutoscaleProfile(Model):
     :type name: str
     :param capacity: the number of instances that can be used during this
      profile.
-    :type capacity: :class:`ScaleCapacity
-     <azure.mgmt.monitor.models.ScaleCapacity>`
+    :type capacity: ~azure.mgmt.monitor.models.ScaleCapacity
     :param rules: the collection of rules that provide the triggers and
      parameters for the scaling action. A maximum of 10 rules can be specified.
-    :type rules: list of :class:`ScaleRule
-     <azure.mgmt.monitor.models.ScaleRule>`
+    :type rules: list[~azure.mgmt.monitor.models.ScaleRule]
     :param fixed_date: the specific date-time for the profile. This element is
      not used if the Recurrence element is used.
-    :type fixed_date: :class:`TimeWindow
-     <azure.mgmt.monitor.models.TimeWindow>`
+    :type fixed_date: ~azure.mgmt.monitor.models.TimeWindow
     :param recurrence: the repeating times at which this profile begins. This
      element is not used if the FixedDate element is used.
-    :type recurrence: :class:`Recurrence
-     <azure.mgmt.monitor.models.Recurrence>`
+    :type recurrence: ~azure.mgmt.monitor.models.Recurrence
     """
 
     _validation = {

azure-mgmt-monitor/azure/mgmt/monitor/models/autoscale_setting_resource.py

@@ -27,15 +27,14 @@ class AutoscaleSettingResource(Resource):
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
-    :type tags: dict
+    :type tags: dict[str, str]
     :param profiles: the collection of automatic scaling profiles that specify
      different scaling parameters for different time periods. A maximum of 20
      profiles can be specified.
-    :type profiles: list of :class:`AutoscaleProfile
-     <azure.mgmt.monitor.models.AutoscaleProfile>`
+    :type profiles: list[~azure.mgmt.monitor.models.AutoscaleProfile]
     :param notifications: the collection of notifications.
-    :type notifications: list of :class:`AutoscaleNotification
-     <azure.mgmt.monitor.models.AutoscaleNotification>`
+    :type notifications:
+     list[~azure.mgmt.monitor.models.AutoscaleNotification]
     :param enabled: the enabled flag. Specifies whether automatic scaling is
      enabled for the resource. The default value is 'true'. Default value: True
      .

azure-mgmt-monitor/azure/mgmt/monitor/models/autoscale_setting_resource_patch.py

@@ -16,15 +16,14 @@ class AutoscaleSettingResourcePatch(Model):
     """The autoscale setting object for patch operations.
 
     :param tags: Resource tags
-    :type tags: dict
+    :type tags: dict[str, str]
     :param profiles: the collection of automatic scaling profiles that specify
      different scaling parameters for different time periods. A maximum of 20
      profiles can be specified.
-    :type profiles: list of :class:`AutoscaleProfile
-     <azure.mgmt.monitor.models.AutoscaleProfile>`
+    :type profiles: list[~azure.mgmt.monitor.models.AutoscaleProfile]
     :param notifications: the collection of notifications.
-    :type notifications: list of :class:`AutoscaleNotification
-     <azure.mgmt.monitor.models.AutoscaleNotification>`
+    :type notifications:
+     list[~azure.mgmt.monitor.models.AutoscaleNotification]
     :param enabled: the enabled flag. Specifies whether automatic scaling is
      enabled for the resource. The default value is 'true'. Default value: True
      .