Skip to content

Commit f58f6fd

Browse files
authored
test,version,CHANGELOG (Azure#15360)
1 parent 1d09bd7 commit f58f6fd

31 files changed

+4956
-3403
lines changed

sdk/monitor/azure-mgmt-monitor/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Release History
22

3+
## 0.12.0 (2020-11-17)
4+
5+
**Features**
6+
7+
- Added operation ScheduledQueryRulesOperations.list_by_resource_group
8+
- Added operation ScheduledQueryRulesOperations.list_by_subscription
9+
10+
**Breaking changes**
11+
12+
- Model Resource no longer has parameter location
13+
- Model Resource no longer has parameter tags
14+
- Model ErrorResponse has a new signature
15+
- Model Action has a new signature
16+
317
## 0.11.0 (2020-07-15)
418

519
**Features**

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/_monitor_management_client.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
116116
* 2019-03-01: :mod:`v2019_03_01.models<azure.mgmt.monitor.v2019_03_01.models>`
117117
* 2019-06-01: :mod:`v2019_06_01.models<azure.mgmt.monitor.v2019_06_01.models>`
118118
* 2019-10-17-preview: :mod:`v2019_10_17.models<azure.mgmt.monitor.v2019_10_17.models>`
119+
* 2019-11-01-preview: :mod:`v2019_11_01_preview.models<azure.mgmt.monitor.v2019_11_01_preview.models>`
119120
* 2020-01-01-preview: :mod:`v2020_01_01_preview.models<azure.mgmt.monitor.v2020_01_01_preview.models>`
121+
* 2020-05-01-preview: :mod:`v2020_05_01_preview.models<azure.mgmt.monitor.v2020_05_01_preview.models>`
120122
"""
121123
if api_version == '2015-04-01':
122124
from .v2015_04_01 import models
@@ -172,9 +174,15 @@ def models(cls, api_version=DEFAULT_API_VERSION):
172174
elif api_version == '2019-10-17-preview':
173175
from .v2019_10_17 import models
174176
return models
177+
elif api_version == '2019-11-01-preview':
178+
from .v2019_11_01_preview import models
179+
return models
175180
elif api_version == '2020-01-01-preview':
176181
from .v2020_01_01_preview import models
177182
return models
183+
elif api_version == '2020-05-01-preview':
184+
from .v2020_05_01_preview import models
185+
return models
178186
raise NotImplementedError("APIVersion {} is not available".format(api_version))
179187

180188
@property
@@ -296,6 +304,32 @@ def baselines(self):
296304
raise NotImplementedError("APIVersion {} is not available".format(api_version))
297305
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
298306

307+
@property
308+
def data_collection_rule_associations(self):
309+
"""Instance depends on the API version:
310+
311+
* 2019-11-01-preview: :class:`DataCollectionRuleAssociationsOperations<azure.mgmt.monitor.v2019_11_01_preview.operations.DataCollectionRuleAssociationsOperations>`
312+
"""
313+
api_version = self._get_api_version('data_collection_rule_associations')
314+
if api_version == '2019-11-01-preview':
315+
from .v2019_11_01_preview.operations import DataCollectionRuleAssociationsOperations as OperationClass
316+
else:
317+
raise NotImplementedError("APIVersion {} is not available".format(api_version))
318+
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
319+
320+
@property
321+
def data_collection_rules(self):
322+
"""Instance depends on the API version:
323+
324+
* 2019-11-01-preview: :class:`DataCollectionRulesOperations<azure.mgmt.monitor.v2019_11_01_preview.operations.DataCollectionRulesOperations>`
325+
"""
326+
api_version = self._get_api_version('data_collection_rules')
327+
if api_version == '2019-11-01-preview':
328+
from .v2019_11_01_preview.operations import DataCollectionRulesOperations as OperationClass
329+
else:
330+
raise NotImplementedError("APIVersion {} is not available".format(api_version))
331+
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
332+
299333
@property
300334
def diagnostic_settings(self):
301335
"""Instance depends on the API version:
@@ -563,10 +597,13 @@ def scheduled_query_rules(self):
563597
"""Instance depends on the API version:
564598
565599
* 2018-04-16: :class:`ScheduledQueryRulesOperations<azure.mgmt.monitor.v2018_04_16.operations.ScheduledQueryRulesOperations>`
600+
* 2020-05-01-preview: :class:`ScheduledQueryRulesOperations<azure.mgmt.monitor.v2020_05_01_preview.operations.ScheduledQueryRulesOperations>`
566601
"""
567602
api_version = self._get_api_version('scheduled_query_rules')
568603
if api_version == '2018-04-16':
569604
from .v2018_04_16.operations import ScheduledQueryRulesOperations as OperationClass
605+
elif api_version == '2020-05-01-preview':
606+
from .v2020_05_01_preview.operations import ScheduledQueryRulesOperations as OperationClass
570607
else:
571608
raise NotImplementedError("APIVersion {} is not available".format(api_version))
572609
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/v2018_03_01/models/_models.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,10 @@ class MultiMetricCriteria(Model):
332332
:param dimensions: List of dimension conditions.
333333
:type dimensions:
334334
list[~azure.mgmt.monitor.v2018_03_01.models.MetricDimension]
335+
:param skip_metric_validation: Allows creating an alert rule on a custom
336+
metric that isn't yet emitted, by causing the metric validation to be
337+
skipped.
338+
:type skip_metric_validation: bool
335339
:param criterion_type: Required. Constant filled by server.
336340
:type criterion_type: str
337341
"""
@@ -350,6 +354,7 @@ class MultiMetricCriteria(Model):
350354
'metric_namespace': {'key': 'metricNamespace', 'type': 'str'},
351355
'time_aggregation': {'key': 'timeAggregation', 'type': 'object'},
352356
'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'},
357+
'skip_metric_validation': {'key': 'skipMetricValidation', 'type': 'bool'},
353358
'criterion_type': {'key': 'criterionType', 'type': 'str'},
354359
}
355360

@@ -365,6 +370,7 @@ def __init__(self, **kwargs):
365370
self.metric_namespace = kwargs.get('metric_namespace', None)
366371
self.time_aggregation = kwargs.get('time_aggregation', None)
367372
self.dimensions = kwargs.get('dimensions', None)
373+
self.skip_metric_validation = kwargs.get('skip_metric_validation', None)
368374
self.criterion_type = None
369375

370376

@@ -387,6 +393,10 @@ class DynamicMetricCriteria(MultiMetricCriteria):
387393
:param dimensions: List of dimension conditions.
388394
:type dimensions:
389395
list[~azure.mgmt.monitor.v2018_03_01.models.MetricDimension]
396+
:param skip_metric_validation: Allows creating an alert rule on a custom
397+
metric that isn't yet emitted, by causing the metric validation to be
398+
skipped.
399+
:type skip_metric_validation: bool
390400
:param criterion_type: Required. Constant filled by server.
391401
:type criterion_type: str
392402
:param operator: Required. The operator used to compare the metric value
@@ -427,6 +437,7 @@ class DynamicMetricCriteria(MultiMetricCriteria):
427437
'metric_namespace': {'key': 'metricNamespace', 'type': 'str'},
428438
'time_aggregation': {'key': 'timeAggregation', 'type': 'object'},
429439
'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'},
440+
'skip_metric_validation': {'key': 'skipMetricValidation', 'type': 'bool'},
430441
'criterion_type': {'key': 'criterionType', 'type': 'str'},
431442
'operator': {'key': 'operator', 'type': 'str'},
432443
'alert_sensitivity': {'key': 'alertSensitivity', 'type': 'str'},
@@ -1057,6 +1068,10 @@ class MetricCriteria(MultiMetricCriteria):
10571068
:param dimensions: List of dimension conditions.
10581069
:type dimensions:
10591070
list[~azure.mgmt.monitor.v2018_03_01.models.MetricDimension]
1071+
:param skip_metric_validation: Allows creating an alert rule on a custom
1072+
metric that isn't yet emitted, by causing the metric validation to be
1073+
skipped.
1074+
:type skip_metric_validation: bool
10601075
:param criterion_type: Required. Constant filled by server.
10611076
:type criterion_type: str
10621077
:param operator: Required. the criteria operator. Possible values include:
@@ -1084,6 +1099,7 @@ class MetricCriteria(MultiMetricCriteria):
10841099
'metric_namespace': {'key': 'metricNamespace', 'type': 'str'},
10851100
'time_aggregation': {'key': 'timeAggregation', 'type': 'object'},
10861101
'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'},
1102+
'skip_metric_validation': {'key': 'skipMetricValidation', 'type': 'bool'},
10871103
'criterion_type': {'key': 'criterionType', 'type': 'str'},
10881104
'operator': {'key': 'operator', 'type': 'str'},
10891105
'threshold': {'key': 'threshold', 'type': 'float'},

sdk/monitor/azure-mgmt-monitor/azure/mgmt/monitor/v2018_03_01/models/_models_py3.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,10 @@ class MultiMetricCriteria(Model):
332332
:param dimensions: List of dimension conditions.
333333
:type dimensions:
334334
list[~azure.mgmt.monitor.v2018_03_01.models.MetricDimension]
335+
:param skip_metric_validation: Allows creating an alert rule on a custom
336+
metric that isn't yet emitted, by causing the metric validation to be
337+
skipped.
338+
:type skip_metric_validation: bool
335339
:param criterion_type: Required. Constant filled by server.
336340
:type criterion_type: str
337341
"""
@@ -350,21 +354,23 @@ class MultiMetricCriteria(Model):
350354
'metric_namespace': {'key': 'metricNamespace', 'type': 'str'},
351355
'time_aggregation': {'key': 'timeAggregation', 'type': 'object'},
352356
'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'},
357+
'skip_metric_validation': {'key': 'skipMetricValidation', 'type': 'bool'},
353358
'criterion_type': {'key': 'criterionType', 'type': 'str'},
354359
}
355360

356361
_subtype_map = {
357362
'criterion_type': {'StaticThresholdCriterion': 'MetricCriteria', 'DynamicThresholdCriterion': 'DynamicMetricCriteria'}
358363
}
359364

360-
def __init__(self, *, name: str, metric_name: str, time_aggregation, additional_properties=None, metric_namespace: str=None, dimensions=None, **kwargs) -> None:
365+
def __init__(self, *, name: str, metric_name: str, time_aggregation, additional_properties=None, metric_namespace: str=None, dimensions=None, skip_metric_validation: bool=None, **kwargs) -> None:
361366
super(MultiMetricCriteria, self).__init__(**kwargs)
362367
self.additional_properties = additional_properties
363368
self.name = name
364369
self.metric_name = metric_name
365370
self.metric_namespace = metric_namespace
366371
self.time_aggregation = time_aggregation
367372
self.dimensions = dimensions
373+
self.skip_metric_validation = skip_metric_validation
368374
self.criterion_type = None
369375

370376

@@ -387,6 +393,10 @@ class DynamicMetricCriteria(MultiMetricCriteria):
387393
:param dimensions: List of dimension conditions.
388394
:type dimensions:
389395
list[~azure.mgmt.monitor.v2018_03_01.models.MetricDimension]
396+
:param skip_metric_validation: Allows creating an alert rule on a custom
397+
metric that isn't yet emitted, by causing the metric validation to be
398+
skipped.
399+
:type skip_metric_validation: bool
390400
:param criterion_type: Required. Constant filled by server.
391401
:type criterion_type: str
392402
:param operator: Required. The operator used to compare the metric value
@@ -427,15 +437,16 @@ class DynamicMetricCriteria(MultiMetricCriteria):
427437
'metric_namespace': {'key': 'metricNamespace', 'type': 'str'},
428438
'time_aggregation': {'key': 'timeAggregation', 'type': 'object'},
429439
'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'},
440+
'skip_metric_validation': {'key': 'skipMetricValidation', 'type': 'bool'},
430441
'criterion_type': {'key': 'criterionType', 'type': 'str'},
431442
'operator': {'key': 'operator', 'type': 'str'},
432443
'alert_sensitivity': {'key': 'alertSensitivity', 'type': 'str'},
433444
'failing_periods': {'key': 'failingPeriods', 'type': 'DynamicThresholdFailingPeriods'},
434445
'ignore_data_before': {'key': 'ignoreDataBefore', 'type': 'iso-8601'},
435446
}
436447

437-
def __init__(self, *, name: str, metric_name: str, time_aggregation, operator, alert_sensitivity, failing_periods, additional_properties=None, metric_namespace: str=None, dimensions=None, ignore_data_before=None, **kwargs) -> None:
438-
super(DynamicMetricCriteria, self).__init__(additional_properties=additional_properties, name=name, metric_name=metric_name, metric_namespace=metric_namespace, time_aggregation=time_aggregation, dimensions=dimensions, **kwargs)
448+
def __init__(self, *, name: str, metric_name: str, time_aggregation, operator, alert_sensitivity, failing_periods, additional_properties=None, metric_namespace: str=None, dimensions=None, skip_metric_validation: bool=None, ignore_data_before=None, **kwargs) -> None:
449+
super(DynamicMetricCriteria, self).__init__(additional_properties=additional_properties, name=name, metric_name=metric_name, metric_namespace=metric_namespace, time_aggregation=time_aggregation, dimensions=dimensions, skip_metric_validation=skip_metric_validation, **kwargs)
439450
self.operator = operator
440451
self.alert_sensitivity = alert_sensitivity
441452
self.failing_periods = failing_periods
@@ -1057,6 +1068,10 @@ class MetricCriteria(MultiMetricCriteria):
10571068
:param dimensions: List of dimension conditions.
10581069
:type dimensions:
10591070
list[~azure.mgmt.monitor.v2018_03_01.models.MetricDimension]
1071+
:param skip_metric_validation: Allows creating an alert rule on a custom
1072+
metric that isn't yet emitted, by causing the metric validation to be
1073+
skipped.
1074+
:type skip_metric_validation: bool
10601075
:param criterion_type: Required. Constant filled by server.
10611076
:type criterion_type: str
10621077
:param operator: Required. the criteria operator. Possible values include:
@@ -1084,13 +1099,14 @@ class MetricCriteria(MultiMetricCriteria):
10841099
'metric_namespace': {'key': 'metricNamespace', 'type': 'str'},
10851100
'time_aggregation': {'key': 'timeAggregation', 'type': 'object'},
10861101
'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'},
1102+
'skip_metric_validation': {'key': 'skipMetricValidation', 'type': 'bool'},
10871103
'criterion_type': {'key': 'criterionType', 'type': 'str'},
10881104
'operator': {'key': 'operator', 'type': 'str'},
10891105
'threshold': {'key': 'threshold', 'type': 'float'},
10901106
}
10911107

1092-
def __init__(self, *, name: str, metric_name: str, time_aggregation, operator, threshold: float, additional_properties=None, metric_namespace: str=None, dimensions=None, **kwargs) -> None:
1093-
super(MetricCriteria, self).__init__(additional_properties=additional_properties, name=name, metric_name=metric_name, metric_namespace=metric_namespace, time_aggregation=time_aggregation, dimensions=dimensions, **kwargs)
1108+
def __init__(self, *, name: str, metric_name: str, time_aggregation, operator, threshold: float, additional_properties=None, metric_namespace: str=None, dimensions=None, skip_metric_validation: bool=None, **kwargs) -> None:
1109+
super(MetricCriteria, self).__init__(additional_properties=additional_properties, name=name, metric_name=metric_name, metric_namespace=metric_namespace, time_aggregation=time_aggregation, dimensions=dimensions, skip_metric_validation=skip_metric_validation, **kwargs)
10941110
self.operator = operator
10951111
self.threshold = threshold
10961112
self.criterion_type = 'StaticThresholdCriterion'
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from ._configuration import MonitorManagementClientConfiguration
13+
from ._monitor_management_client import MonitorManagementClient
14+
__all__ = ['MonitorManagementClient', 'MonitorManagementClientConfiguration']
15+
16+
from .version import VERSION
17+
18+
__version__ = VERSION
19+
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
from msrestazure import AzureConfiguration
12+
13+
from .version import VERSION
14+
15+
16+
class MonitorManagementClientConfiguration(AzureConfiguration):
17+
"""Configuration for MonitorManagementClient
18+
Note that all parameters used to create this instance are saved as instance
19+
attributes.
20+
21+
:param credentials: Credentials needed for the client to connect to Azure.
22+
:type credentials: :mod:`A msrestazure Credentials
23+
object<msrestazure.azure_active_directory>`
24+
:param subscription_id: The ID of the target subscription.
25+
:type subscription_id: str
26+
:param str base_url: Service URL
27+
"""
28+
29+
def __init__(
30+
self, credentials, subscription_id, base_url=None):
31+
32+
if credentials is None:
33+
raise ValueError("Parameter 'credentials' must not be None.")
34+
if subscription_id is None:
35+
raise ValueError("Parameter 'subscription_id' must not be None.")
36+
if not base_url:
37+
base_url = 'https://management.azure.com'
38+
39+
super(MonitorManagementClientConfiguration, self).__init__(base_url)
40+
41+
# Starting Autorest.Python 4.0.64, make connection pool activated by default
42+
self.keep_alive = True
43+
44+
self.add_user_agent('azure-mgmt-monitor/{}'.format(VERSION))
45+
self.add_user_agent('Azure-SDK-For-Python')
46+
47+
self.credentials = credentials
48+
self.subscription_id = subscription_id

0 commit comments

Comments
 (0)