Update from master

AzureSDKAutomation · May 26, 2020 · ee13069 · ee13069
1 parent cde2a10
commit ee13069
Show file tree

Hide file tree

Showing 7 changed files with 193 additions and 116 deletions.
diff --git a/sdk/timeseriesinsights/azure-mgmt-timeseriesinsights/README.md b/sdk/timeseriesinsights/azure-mgmt-timeseriesinsights/README.md
@@ -1,30 +1,21 @@
-## Microsoft Azure SDK for Python
-
-This is the Microsoft Azure TimeSeriesInsights Management Client
-Library.
-
-Azure Resource Manager (ARM) is the next generation of management APIs
-that replace the old Azure Service Management (ASM).
+# Microsoft Azure SDK for Python
 
+This is the Microsoft Azure TimeSeriesInsights Management Client Library.
 This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+For a more complete view of Azure libraries, see the [Github repo](https://github.com/Azure/azure-sdk-for-python/)
 
-For the older Azure Service Management (ASM) libraries, see
-[azure-servicemanagement-legacy](https://pypi.python.org/pypi/azure-servicemanagement-legacy)
-library.
-
-For a more complete set of Azure libraries, see the
-[azure](https://pypi.python.org/pypi/azure) bundle package.
 
-## Usage
+# Usage
 
-For code examples, see [TimeSeriesInsights
-Management](https://docs.microsoft.com/python/api/overview/azure/timeseriesinsights)
+For code examples, see [TimeSeriesInsights Management](https://docs.microsoft.com/python/api/overview/azure/timeseriesinsights)
 on docs.microsoft.com.
 
-## Provide Feedback
 
-If you encounter any bugs or have suggestions, please file an issue in
-the [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
+# Provide Feedback
+
+If you encounter any bugs or have suggestions, please file an issue in the
+[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
 section of the project.
 
-![image](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-timeseriesinsights%2FREADME.png)
+
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-timeseriesinsights%2FREADME.png)
diff --git a/...esinsights/azure-mgmt-timeseriesinsights/azure/mgmt/timeseriesinsights/models/__init__.py b/...esinsights/azure-mgmt-timeseriesinsights/azure/mgmt/timeseriesinsights/models/__init__.py
@@ -62,6 +62,7 @@
     from ._models_py3 import TimeSeriesIdProperty
     from ._models_py3 import TrackedResource
     from ._models_py3 import WarmStorageEnvironmentStatus
+    from ._models_py3 import WarmStoreConfigurationProperties
 except (SyntaxError, ImportError):
     from ._models import AccessPolicyCreateOrUpdateParameters
     from ._models import AccessPolicyListResponse
@@ -115,6 +116,7 @@
     from ._models import TimeSeriesIdProperty
     from ._models import TrackedResource
     from ._models import WarmStorageEnvironmentStatus
+    from ._models import WarmStoreConfigurationProperties
 from ._paged_models import OperationPaged
 from ._time_series_insights_client_enums import (
     ProvisioningState,
@@ -182,6 +184,7 @@
     'TimeSeriesIdProperty',
     'TrackedResource',
     'WarmStorageEnvironmentStatus',
+    'WarmStoreConfigurationProperties',
     'OperationPaged',
     'ProvisioningState',
     'SkuName',

diff --git a/...iesinsights/azure-mgmt-timeseriesinsights/azure/mgmt/timeseriesinsights/models/_models.py b/...iesinsights/azure-mgmt-timeseriesinsights/azure/mgmt/timeseriesinsights/models/_models.py
@@ -709,6 +709,13 @@ class EventSourceCreateOrUpdateParameters(CreateOrUpdateTrackedResourcePropertie
     :type location: str
     :param tags: Key-value pairs of additional properties for the resource.
     :type tags: dict[str, str]
+    :param local_timestamp: An object that represents the local timestamp
+     property. It contains the format of local timestamp that needs to be used
+     and the corresponding timezone offset information. If a value isn't
+     specified for localTimestamp, or if null, then the local timestamp will
+     not be ingressed with the events.
+    :type local_timestamp:
+     ~azure.mgmt.timeseriesinsights.models.LocalTimestamp
     :param kind: Required. Constant filled by server.
     :type kind: str
     """
@@ -721,6 +728,7 @@ class EventSourceCreateOrUpdateParameters(CreateOrUpdateTrackedResourcePropertie
     _attribute_map = {
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
+        'local_timestamp': {'key': 'localTimestamp', 'type': 'LocalTimestamp'},
         'kind': {'key': 'kind', 'type': 'str'},
     }
 
@@ -730,6 +738,7 @@ class EventSourceCreateOrUpdateParameters(CreateOrUpdateTrackedResourcePropertie
 
     def __init__(self, **kwargs):
         super(EventSourceCreateOrUpdateParameters, self).__init__(**kwargs)
+        self.local_timestamp = kwargs.get('local_timestamp', None)
         self.kind = None
         self.kind = 'EventSourceCreateOrUpdateParameters'
 
@@ -747,6 +756,13 @@ class EventHubEventSourceCreateOrUpdateParameters(EventSourceCreateOrUpdateParam
     :type location: str
     :param tags: Key-value pairs of additional properties for the resource.
     :type tags: dict[str, str]
+    :param local_timestamp: An object that represents the local timestamp
+     property. It contains the format of local timestamp that needs to be used
+     and the corresponding timezone offset information. If a value isn't
+     specified for localTimestamp, or if null, then the local timestamp will
+     not be ingressed with the events.
+    :type local_timestamp:
+     ~azure.mgmt.timeseriesinsights.models.LocalTimestamp
     :param kind: Required. Constant filled by server.
     :type kind: str
     :param provisioning_state: Provisioning state of the resource. Possible
@@ -797,6 +813,7 @@ class EventHubEventSourceCreateOrUpdateParameters(EventSourceCreateOrUpdateParam
     _attribute_map = {
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
+        'local_timestamp': {'key': 'localTimestamp', 'type': 'LocalTimestamp'},
         'kind': {'key': 'kind', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
@@ -868,7 +885,7 @@ class EventSourceResource(TrackedResource):
     }
 
     _subtype_map = {
-        'kind': {'Microsoft.EventHub': 'EventHubEventSourceResource', 'Microsoft.IotHub': 'IoTHubEventSourceResource'}
+        'kind': {'Microsoft.EventHub': 'EventHubEventSourceResource', 'Microsoft.IoTHub': 'IoTHubEventSourceResource'}
     }
 
     def __init__(self, **kwargs):
@@ -1169,6 +1186,13 @@ class IoTHubEventSourceCreateOrUpdateParameters(EventSourceCreateOrUpdateParamet
     :type location: str
     :param tags: Key-value pairs of additional properties for the resource.
     :type tags: dict[str, str]
+    :param local_timestamp: An object that represents the local timestamp
+     property. It contains the format of local timestamp that needs to be used
+     and the corresponding timezone offset information. If a value isn't
+     specified for localTimestamp, or if null, then the local timestamp will
+     not be ingressed with the events.
+    :type local_timestamp:
+     ~azure.mgmt.timeseriesinsights.models.LocalTimestamp
     :param kind: Required. Constant filled by server.
     :type kind: str
     :param provisioning_state: Provisioning state of the resource. Possible
@@ -1215,6 +1239,7 @@ class IoTHubEventSourceCreateOrUpdateParameters(EventSourceCreateOrUpdateParamet
     _attribute_map = {
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
+        'local_timestamp': {'key': 'localTimestamp', 'type': 'LocalTimestamp'},
         'kind': {'key': 'kind', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
@@ -1323,7 +1348,7 @@ def __init__(self, **kwargs):
         self.iot_hub_name = kwargs.get('iot_hub_name', None)
         self.consumer_group_name = kwargs.get('consumer_group_name', None)
         self.key_name = kwargs.get('key_name', None)
-        self.kind = 'Microsoft.IotHub'
+        self.kind = 'Microsoft.IoTHub'
 
 
 class IoTHubEventSourceUpdateParameters(EventSourceUpdateParameters):
@@ -1372,8 +1397,7 @@ class LocalTimestamp(Model):
     or if null, then the local timestamp will not be ingressed with the events.
 
     :param format: An enum that represents the format of the local timestamp
-     property that needs to be set. Possible values include: 'Embedded',
-     'Iana', 'TimeSpan'
+     property that needs to be set. Possible values include: 'Embedded'
     :type format: str or
      ~azure.mgmt.timeseriesinsights.models.LocalTimestampFormat
     :param time_zone_offset: An object that represents the offset information
@@ -1444,10 +1468,11 @@ class LongTermEnvironmentCreateOrUpdateParameters(EnvironmentCreateOrUpdateParam
      environment's data.
     :type storage_configuration:
      ~azure.mgmt.timeseriesinsights.models.LongTermStorageConfigurationInput
-    :param data_retention: Required. ISO8601 timespan specifying the number of
-     days the environment's events will be available for query from the warm
-     store.
-    :type data_retention: timedelta
+    :param warm_store_configuration: The warm store configuration provides the
+     details to create a warm store cache that will retain a copy of the
+     environment's data available for faster query.
+    :type warm_store_configuration:
+     ~azure.mgmt.timeseriesinsights.models.WarmStoreConfigurationProperties
     """
 
     _validation = {
@@ -1456,7 +1481,6 @@ class LongTermEnvironmentCreateOrUpdateParameters(EnvironmentCreateOrUpdateParam
         'kind': {'required': True},
         'time_series_id_properties': {'required': True},
         'storage_configuration': {'required': True},
-        'data_retention': {'required': True},
     }
 
     _attribute_map = {
@@ -1466,14 +1490,14 @@ class LongTermEnvironmentCreateOrUpdateParameters(EnvironmentCreateOrUpdateParam
         'kind': {'key': 'kind', 'type': 'str'},
         'time_series_id_properties': {'key': 'properties.timeSeriesIdProperties', 'type': '[TimeSeriesIdProperty]'},
         'storage_configuration': {'key': 'properties.storageConfiguration', 'type': 'LongTermStorageConfigurationInput'},
-        'data_retention': {'key': 'properties.warmStoreConfiguration.dataRetention', 'type': 'duration'},
+        'warm_store_configuration': {'key': 'properties.warmStoreConfiguration', 'type': 'WarmStoreConfigurationProperties'},
     }
 
     def __init__(self, **kwargs):
         super(LongTermEnvironmentCreateOrUpdateParameters, self).__init__(**kwargs)
         self.time_series_id_properties = kwargs.get('time_series_id_properties', None)
         self.storage_configuration = kwargs.get('storage_configuration', None)
-        self.data_retention = kwargs.get('data_retention', None)
+        self.warm_store_configuration = kwargs.get('warm_store_configuration', None)
         self.kind = 'LongTerm'
 
 
@@ -1532,10 +1556,11 @@ class LongTermEnvironmentResource(EnvironmentResource):
      environment's data.
     :type storage_configuration:
      ~azure.mgmt.timeseriesinsights.models.LongTermStorageConfigurationOutput
-    :param data_retention: Required. ISO8601 timespan specifying the number of
-     days the environment's events will be available for query from the warm
-     store.
-    :type data_retention: timedelta
+    :param warm_store_configuration: The warm store configuration provides the
+     details to create a warm store cache that will retain a copy of the
+     environment's data available for faster query.
+    :type warm_store_configuration:
+     ~azure.mgmt.timeseriesinsights.models.WarmStoreConfigurationProperties
     """
 
     _validation = {
@@ -1550,7 +1575,6 @@ class LongTermEnvironmentResource(EnvironmentResource):
         'creation_time': {'readonly': True},
         'time_series_id_properties': {'required': True},
         'storage_configuration': {'required': True},
-        'data_retention': {'required': True},
     }
 
     _attribute_map = {
@@ -1568,7 +1592,7 @@ class LongTermEnvironmentResource(EnvironmentResource):
         'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
         'time_series_id_properties': {'key': 'properties.timeSeriesIdProperties', 'type': '[TimeSeriesIdProperty]'},
         'storage_configuration': {'key': 'properties.storageConfiguration', 'type': 'LongTermStorageConfigurationOutput'},
-        'data_retention': {'key': 'properties.warmStoreConfiguration.dataRetention', 'type': 'duration'},
+        'warm_store_configuration': {'key': 'properties.warmStoreConfiguration', 'type': 'WarmStoreConfigurationProperties'},
     }
 
     def __init__(self, **kwargs):
@@ -1580,16 +1604,14 @@ def __init__(self, **kwargs):
         self.creation_time = None
         self.time_series_id_properties = kwargs.get('time_series_id_properties', None)
         self.storage_configuration = kwargs.get('storage_configuration', None)
-        self.data_retention = kwargs.get('data_retention', None)
+        self.warm_store_configuration = kwargs.get('warm_store_configuration', None)
         self.kind = 'LongTerm'
 
 
 class LongTermEnvironmentUpdateParameters(EnvironmentUpdateParameters):
     """Parameters supplied to the Update Environment operation to update a
     long-term environment.
 
-    All required parameters must be populated in order to send to Azure.
-
     :param tags: Key-value pairs of additional properties for the environment.
     :type tags: dict[str, str]
     :param storage_configuration: The storage configuration provides the
@@ -1598,26 +1620,23 @@ class LongTermEnvironmentUpdateParameters(EnvironmentUpdateParameters):
      data.
     :type storage_configuration:
      ~azure.mgmt.timeseriesinsights.models.LongTermStorageConfigurationMutableProperties
-    :param data_retention: Required. ISO8601 timespan specifying the number of
-     days the environment's events will be available for query from the warm
-     store.
-    :type data_retention: timedelta
+    :param warm_store_configuration: The warm store configuration provides the
+     details to create a warm store cache that will retain a copy of the
+     environment's data available for faster query.
+    :type warm_store_configuration:
+     ~azure.mgmt.timeseriesinsights.models.WarmStoreConfigurationProperties
     """
 
-    _validation = {
-        'data_retention': {'required': True},
-    }
-
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
         'storage_configuration': {'key': 'properties.storageConfiguration', 'type': 'LongTermStorageConfigurationMutableProperties'},
-        'data_retention': {'key': 'properties.warmStoreConfiguration.dataRetention', 'type': 'duration'},
+        'warm_store_configuration': {'key': 'properties.warmStoreConfiguration', 'type': 'WarmStoreConfigurationProperties'},
     }
 
     def __init__(self, **kwargs):
         super(LongTermEnvironmentUpdateParameters, self).__init__(**kwargs)
         self.storage_configuration = kwargs.get('storage_configuration', None)
-        self.data_retention = kwargs.get('data_retention', None)
+        self.warm_store_configuration = kwargs.get('warm_store_configuration', None)
 
 
 class LongTermStorageConfigurationInput(Model):
@@ -2004,7 +2023,8 @@ class StandardEnvironmentCreateOrUpdateParameters(EnvironmentCreateOrUpdateParam
     :type storage_limit_exceeded_behavior: str or
      ~azure.mgmt.timeseriesinsights.models.StorageLimitExceededBehavior
     :param partition_key_properties: The list of event properties which will
-     be used to partition data in the environment.
+     be used to partition data in the environment. Currently, only a single
+     partition key property is supported.
     :type partition_key_properties:
      list[~azure.mgmt.timeseriesinsights.models.TimeSeriesIdProperty]
     """
@@ -2075,7 +2095,8 @@ class StandardEnvironmentResource(EnvironmentResource):
     :type storage_limit_exceeded_behavior: str or
      ~azure.mgmt.timeseriesinsights.models.StorageLimitExceededBehavior
     :param partition_key_properties: The list of event properties which will
-     be used to partition data in the environment.
+     be used to partition data in the environment. Currently, only a single
+     partition key property is supported.
     :type partition_key_properties:
      list[~azure.mgmt.timeseriesinsights.models.TimeSeriesIdProperty]
     :ivar data_access_id: An id used to access the environment data, e.g. to
@@ -2162,26 +2183,20 @@ class StandardEnvironmentUpdateParameters(EnvironmentUpdateParameters):
      'PauseIngress'
     :type storage_limit_exceeded_behavior: str or
      ~azure.mgmt.timeseriesinsights.models.StorageLimitExceededBehavior
-    :param partition_key_properties: The list of event properties which will
-     be used to partition data in the environment.
-    :type partition_key_properties:
-     list[~azure.mgmt.timeseriesinsights.models.TimeSeriesIdProperty]
     """
 
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
         'sku': {'key': 'sku', 'type': 'Sku'},
         'data_retention_time': {'key': 'properties.dataRetentionTime', 'type': 'duration'},
         'storage_limit_exceeded_behavior': {'key': 'properties.storageLimitExceededBehavior', 'type': 'str'},
-        'partition_key_properties': {'key': 'properties.partitionKeyProperties', 'type': '[TimeSeriesIdProperty]'},
     }
 
     def __init__(self, **kwargs):
         super(StandardEnvironmentUpdateParameters, self).__init__(**kwargs)
         self.sku = kwargs.get('sku', None)
         self.data_retention_time = kwargs.get('data_retention_time', None)
         self.storage_limit_exceeded_behavior = kwargs.get('storage_limit_exceeded_behavior', None)
-        self.partition_key_properties = kwargs.get('partition_key_properties', None)
 
 
 class TimeSeriesIdProperty(Model):
@@ -2239,3 +2254,29 @@ def __init__(self, **kwargs):
         self.state = kwargs.get('state', None)
         self.current_count = kwargs.get('current_count', None)
         self.max_count = kwargs.get('max_count', None)
+
+
+class WarmStoreConfigurationProperties(Model):
+    """The warm store configuration provides the details to create a warm store
+    cache that will retain a copy of the environment's data available for
+    faster query.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param data_retention: Required. ISO8601 timespan specifying the number of
+     days the environment's events will be available for query from the warm
+     store.
+    :type data_retention: timedelta
+    """
+
+    _validation = {
+        'data_retention': {'required': True},
+    }
+
+    _attribute_map = {
+        'data_retention': {'key': 'dataRetention', 'type': 'duration'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WarmStoreConfigurationProperties, self).__init__(**kwargs)
+        self.data_retention = kwargs.get('data_retention', None)