Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Time Series Insights - Fixes on existing api-versions #8758

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
08a54da
Fix or suppress spec violations
sandshadow Jan 10, 2018
58142ef
Try removing 2nd top-level heading, which _may_ have been causing a l…
sandshadow Jan 10, 2018
b3536fb
Fix extra indention which prevented linter from running.
sandshadow Jan 11, 2018
a268824
Added dataStringComparisonBehavior parameter to reference data put/up…
yeskarthik Mar 15, 2018
d515933
Fixed grammar.
yeskarthik Mar 15, 2018
06794ac
Merge pull request #4 from TimeSeriesInsights/add-spec-RefDataSet-New…
yeskarthik Mar 15, 2018
6098a47
Merge remote-tracking branch 'upstream/master'
Apr 3, 2018
78f6408
adding partitionkeyProperty to environmentInfo
Apr 3, 2018
2123814
changing property name
Apr 8, 2018
6afef06
Merge pull request #5 from TimeSeriesInsights/EnvironmentInfo-Partiti…
yeskarthik Apr 13, 2018
4639ecd
changing modelAsString
Apr 18, 2018
60a9c05
Merge pull request #6 from TimeSeriesInsights/partionKeyProperty-Mode…
ravikumarsureshbabu Apr 18, 2018
58cedb8
Merge remote-tracking branch 'upstream/master'
sandshadow Aug 20, 2018
d81181f
Initial checkin of spec. Unchanged from GA release other than version.
sandshadow Aug 20, 2018
726ac9e
Merge remote-tracking branch 'upstream/master'
sandshadow Aug 21, 2018
345a65a
Remove .orig files
sandshadow Aug 21, 2018
422b05c
Fix validation error by removing IoTHub ES from List ES example response
sandshadow Aug 21, 2018
55d47fe
Add extra example that was missing from preview spec.
sandshadow Aug 21, 2018
97ff060
Add long-term environment to resource hierarchy, and update examples.
sandshadow Aug 21, 2018
e99ad0b
Switch to model-as-string for enums. Restore EnvironmentResource's in…
sandshadow Aug 24, 2018
32ffd48
Upsate sku description
sandshadow Sep 7, 2018
2a64ead
Merge pull request #7 from sandshadow/master
sandshadow Sep 11, 2018
cff8d73
Merge remote-tracking branch 'upstream/master'
sandshadow Nov 28, 2018
22ec422
Add new TSI preview api-version to readme.md.
sandshadow Nov 28, 2018
caad40d
Add suppressions for false-positive linter failures.
sandshadow Nov 28, 2018
1886cea
Test suppression failures
sandshadow Nov 28, 2018
d3516c6
Adding preview package tag to several other places in readme.md
sandshadow Nov 28, 2018
d3e40d6
Add preview package to the readme.go.md file
sandshadow Nov 28, 2018
3f293e0
Remove invalid required property from EnvironmentCreateOrUpdateParame…
sandshadow Nov 28, 2018
acbfe92
Merge from upstream/master
dmdenmsft Apr 10, 2019
6b96d95
Initial version of data plane swagger spec for PAYG (Preview) SKU.
dmdenmsft Apr 10, 2019
b69711c
Merge pull request #9 from TimeSeriesInsights/feat-tsi-data-plane
dmdenmsft Apr 10, 2019
e33e334
Added missing Readme.md
dmdenmsft Apr 10, 2019
49adf6a
Merge pull request #10 from TimeSeriesInsights/feat-tsi-data-plane
dmdenmsft Apr 10, 2019
7363e85
Fixed name of readme
dmdenmsft Apr 11, 2019
eaafd61
Merge pull request #11 from TimeSeriesInsights/feat-tsi-data-plane
dmdenmsft Apr 11, 2019
0b5c4e4
Fixed path to swagger json
dmdenmsft Apr 11, 2019
2ea96c4
Merge pull request #12 from TimeSeriesInsights/feat-tsi-data-plane
dmdenmsft Apr 11, 2019
4e4d2f1
Attempt to fix readme
dmdenmsft Apr 11, 2019
d9dfc3d
Merge pull request #13 from TimeSeriesInsights/feat-tsi-data-plane
dmdenmsft Apr 11, 2019
a9279f9
Apply suggestions from code review
nschonni Apr 11, 2019
5796016
Update timeseriesinsights.json
yeskarthik Apr 12, 2019
9075f64
Update timeseriesinsights.json
yeskarthik Apr 12, 2019
cc0eef5
Removed id as required field from TimeSeriesHierarchy and TimeSeriesT…
yeskarthik Apr 12, 2019
b6d5037
Added link to oav issue
dmdenmsft Apr 12, 2019
2980515
Fixed merge conflicts.
yeskarthik Apr 17, 2019
d766f8e
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
yeskarthik May 14, 2019
ffc75f0
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
yeskarthik Oct 23, 2019
5638bb4
Merge remote-tracking branch 'upstream/master'
riserrad Mar 16, 2020
7413873
Merge remote-tracking branch 'upstream/master'
riserrad Mar 18, 2020
2044e35
Changing creation time to RFC1123 when TSI Environments are part of t…
riserrad Mar 18, 2020
0f15242
Renaming $expand to expand
riserrad Mar 18, 2020
cabcd31
Fixing patch Environment supporting S* and L1 parameters
riserrad Mar 18, 2020
4f64e61
Reverting creationTime format change
riserrad Mar 19, 2020
c2fb868
Tweaking Environments_Update to support inheritance
riserrad Mar 20, 2020
6501235
Fixing grammar
riserrad Mar 21, 2020
556f8d5
Fixing Microsoft.IoTHub namespace
riserrad Mar 24, 2020
bb4fa23
Reverting environmentUpdateParameters renaming
riserrad Mar 24, 2020
bef175a
Renaming expand back to $expand
riserrad Apr 2, 2020
1f24ae7
Applying updates based on feedbacks
riserrad Apr 9, 2020
8e04db2
Removing partitionKeyProperties from StandardEnvironmentMutableProper…
riserrad Apr 15, 2020
db6b924
Changing partitionKeyProperty description
riserrad Apr 15, 2020
eaaa1df
Removing the flattening from warmStoreConfiguration
riserrad Apr 20, 2020
94b2adc
Removing maxlength from array
riserrad Apr 20, 2020
57cee57
Removing support for other LocalTimeStamp formats than Embedded
riserrad Apr 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"environmentName": "env1",
"standardEnvironmentUpdateParameters": {
"sku": {
"name": "S1",
"capacity": 10
"environmentUpdateParameters": {
"tags": {
"someTag": "someTagValue"
}
},
"api-version": "2018-08-15-preview"
Expand All @@ -19,7 +18,9 @@
"name": "env1",
"type": "Microsoft.TimeSeriesInsights/Environments",
"kind": "Standard",
"tags": {},
"tags": {
"someTag": "someTagValue"
},
"properties": {
"dataRetentionTime": "P31D",
"provisioningState": "Succeeded",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
"operationId": "Environments_Update",
"x-ms-examples": {
"EnvironmentsUpdate": {
"$ref": "./examples/EnvironmentsPatchSkuCapacity.json"
"$ref": "./examples/EnvironmentsPatchTags.json"
}
},
"x-ms-long-running-operation": true,
Expand All @@ -197,11 +197,11 @@
"$ref": "#/parameters/EnvironmentNameParameter"
},
{
"name": "standardEnvironmentUpdateParameters",
"name": "environmentUpdateParameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/StandardEnvironmentUpdateParameters"
"$ref": "#/definitions/EnvironmentUpdateParameters"
},
"description": "Request object that contains the updated information for the environment."
},
Expand All @@ -211,7 +211,7 @@
],
"responses": {
"200": {
"description": "The environment definition was successfully updated and is in the response. If the environment was updated synchronously, the response will include a provisioningState value of \"Succeeded\". If the environment was updated asynchronous, the response will include a provisioningState value of \"Updating\". You can periodically get your environment definition and monitor progress of the update via the provisioningState property.",
"description": "The environment definition was successfully updated and is in the response. If the environment was updated synchronously, the response will include a provisioningState value of \"Succeeded\". If the environment was updated asynchronously, the response will include a provisioningState value of \"Updating\". You can periodically get your environment definition and monitor progress of the update via the provisioningState property.",
"schema": {
"$ref": "#/definitions/EnvironmentResource"
}
Expand Down Expand Up @@ -1547,7 +1547,7 @@
"items": {
"$ref": "#/definitions/TimeSeriesIdProperty"
},
"description": "The list of event properties which will be used to partition data in the environment."
"description": "The list of event properties which will be used to partition data in the environment. Currently, only a single partition key property is supported."
}
},
"required": [
Expand All @@ -1569,7 +1569,7 @@
"description": "The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data."
},
"warmStoreConfiguration": {
"x-ms-client-flatten": true,
"x-ms-client-flatten": false,
"$ref": "#/definitions/WarmStoreConfigurationProperties",
"description": "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."
}
Expand Down Expand Up @@ -1636,7 +1636,7 @@
"description": "The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data."
},
"warmStoreConfiguration": {
"x-ms-client-flatten": true,
"x-ms-client-flatten": false,
"$ref": "#/definitions/WarmStoreConfigurationProperties",
"description": "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."
}
Expand Down Expand Up @@ -1675,13 +1675,6 @@
"name": "StorageLimitExceededBehavior",
"modelAsString": true
}
},
"partitionKeyProperties": {
"type": "array",
"items": {
"$ref": "#/definitions/TimeSeriesIdProperty"
},
"description": "The list of event properties which will be used to partition data in the environment."
}
}
},
Expand All @@ -1694,7 +1687,7 @@
"description": "The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data."
},
"warmStoreConfiguration": {
"x-ms-client-flatten": true,
"x-ms-client-flatten": false,
"$ref": "#/definitions/WarmStoreConfigurationProperties",
"description": "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."
}
Expand Down Expand Up @@ -1848,6 +1841,10 @@
"name": "Kind",
"modelAsString": true
}
},
"localTimestamp": {
"$ref": "#/definitions/LocalTimestamp",
"description": "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."
}
},
"required": [
Expand Down Expand Up @@ -1911,6 +1908,7 @@
},
"EventHubEventSourceUpdateParameters": {
"type": "object",
"x-ms-discriminator-value": "Microsoft.EventHub",
"properties": {
"properties": {
"x-ms-client-flatten": true,
Expand All @@ -1926,6 +1924,7 @@
"description": "Parameters supplied to the Update Event Source operation to update an EventHub event source."
},
"IoTHubEventSourceUpdateParameters": {
"x-ms-discriminator-value": "Microsoft.IoTHub",
"type": "object",
"properties": {
"properties": {
Expand Down Expand Up @@ -1995,7 +1994,7 @@
"description": "An event source that receives its data from an Azure EventHub."
},
"IoTHubEventSourceResource": {
"x-ms-discriminator-value": "Microsoft.IotHub",
"x-ms-discriminator-value": "Microsoft.IoTHub",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, this fixes the incorrect Python SDK: https://github.com/Azure/azure-sdk-for-python/blob/91de6c7df3fe84a90cbb28a88469e58a74a03407/sdk/timeseriesinsights/azure-mgmt-timeseriesinsights/azure/mgmt/timeseriesinsights/models/_models_py3.py#L871

- 'kind': {'Microsoft.EventHub': 'EventHubEventSourceResource', 'Microsoft.IotHub': 'IoTHubEventSourceResource'}
+ 'kind': {'Microsoft.EventHub': 'EventHubEventSourceResource', 'Microsoft.IoTHub': 'IoTHubEventSourceResource'}
                                                                             ^

"properties": {
"properties": {
"x-ms-client-flatten": true,
Expand Down Expand Up @@ -2160,9 +2159,7 @@
"description": "An enum that represents the format of the local timestamp property that needs to be set.",
"type": "string",
"enum": [
"Embedded",
"Iana",
"TimeSpan"
"Embedded"
],
"x-ms-enum": {
"name": "LocalTimestampFormat",
Expand Down