Skip to content

{Monitor} Migrate monitor to track2 #16551

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.

Sign up for GitHub

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

Merged
yonzhan merged 3 commits into from
Jan 20, 2021
Merged

{Monitor} Migrate monitor to track2 #16551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8222f3d
{Monitor} Migrate monitor to track2
jsntcy Jan 15, 2021
96e5418
Resolve code conflict
jsntcy Jan 18, 2021
83d8d17
Revert change
jsntcy Jan 20, 2021
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
4 changes: 3 additions & 1 deletion scripts/sdk_process/patch_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,9 @@ def find_autorest_generated_folder(module_prefix="azure.mgmt"):
'azure.mgmt.keyvault',
'azure.mgmt.storage',
'azure.mgmt.compute',
'azure.mgmt.network'
'azure.mgmt.network',
'azure.mgmt.monitor',
'azure-mgmt-loganalytics'
]
prefix = sys.argv[1] if len(sys.argv) >= 2 else "azure.mgmt"
for autorest_package in find_autorest_generated_folder(prefix):
Expand Down
76 changes: 33 additions & 43 deletions ...li/azure/cli/command_modules/acr/tests/latest/recordings/test_acr_create_with_audits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ interactions:
ParameterSetName:
- -g -n
User-Agent:
- python/3.7.9 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
- python/3.7.8 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
azure-mgmt-resource/10.3.0 Azure-SDK-For-Python AZURECLI/2.16.0
accept-language:
- en-US
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2020-10-01
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2020-12-22T21:38:59Z"},"properties":{"provisioningState":"Succeeded"}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2021-01-15T06:52:03Z"},"properties":{"provisioningState":"Succeeded"}}'
headers:
cache-control:
- no-cache
Expand All @@ -30,7 +30,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Tue, 22 Dec 2020 21:39:01 GMT
- Fri, 15 Jan 2021 06:52:06 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -59,30 +59,27 @@ interactions:
Content-Length:
- '115'
Content-Type:
- application/json; charset=utf-8
- application/json
ParameterSetName:
- -g -n
User-Agent:
- python/3.7.9 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
azure-mgmt-loganalytics/0.7.0 Azure-SDK-For-Python AZURECLI/2.16.0
accept-language:
- en-US
- AZURECLI/2.16.0 azsdk-python-mgmt-loganalytics/8.0.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.OperationalInsights/workspaces/wprkspace000003?api-version=2020-03-01-preview
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.OperationalInsights/workspaces/wprkspace000003?api-version=2020-08-01
response:
body:
string: "{\r\n \"properties\": {\r\n \"source\": \"Azure\",\r\n \"customerId\":
\"47f46e43-9983-4bde-98b9-59a0afda0223\",\r\n \"provisioningState\": \"Creating\",\r\n
\"357b8444-70a3-477d-ad8d-f0d835cd0e8c\",\r\n \"provisioningState\": \"Creating\",\r\n
\ \"sku\": {\r\n \"name\": \"pergb2018\",\r\n \"maxCapacityReservationLevel\":
3000,\r\n \"lastSkuUpdate\": \"Tue, 22 Dec 2020 21:39:04 GMT\"\r\n },\r\n
3000,\r\n \"lastSkuUpdate\": \"Fri, 15 Jan 2021 06:52:12 GMT\"\r\n },\r\n
\ \"retentionInDays\": 30,\r\n \"features\": {\r\n \"legacy\": 0,\r\n
\ \"searchVersion\": 1,\r\n \"enableLogAccessUsingOnlyResourcePermissions\":
true\r\n },\r\n \"workspaceCapping\": {\r\n \"dailyQuotaGb\": -1.0,\r\n
\ \"quotaNextResetTime\": \"Wed, 23 Dec 2020 12:00:00 GMT\",\r\n \"dataIngestionStatus\":
\ \"quotaNextResetTime\": \"Fri, 15 Jan 2021 11:00:00 GMT\",\r\n \"dataIngestionStatus\":
\"RespectQuota\"\r\n },\r\n \"publicNetworkAccessForIngestion\": \"Enabled\",\r\n
\ \"publicNetworkAccessForQuery\": \"Enabled\",\r\n \"createdDate\":
\"Tue, 22 Dec 2020 21:39:04 GMT\",\r\n \"modifiedDate\": \"Tue, 22 Dec
2020 21:39:04 GMT\"\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/microsoft.operationalinsights/workspaces/wprkspace000003\",\r\n
\"Fri, 15 Jan 2021 06:52:12 GMT\",\r\n \"modifiedDate\": \"Fri, 15 Jan
2021 06:52:12 GMT\"\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/microsoft.operationalinsights/workspaces/wprkspace000003\",\r\n
\ \"name\": \"wprkspace000003\",\r\n \"type\": \"Microsoft.OperationalInsights/workspaces\",\r\n
\ \"location\": \"westus\"\r\n}"
headers:
Expand All @@ -93,7 +90,7 @@ interactions:
content-type:
- application/json
date:
- Tue, 22 Dec 2020 21:39:04 GMT
- Fri, 15 Jan 2021 06:52:14 GMT
pragma:
- no-cache
server:
Expand All @@ -115,7 +112,7 @@ interactions:
body: null
headers:
Accept:
- application/json
- '*/*'
Accept-Encoding:
- gzip, deflate
CommandName:
Expand All @@ -125,24 +122,23 @@ interactions:
ParameterSetName:
- -g -n
User-Agent:
- python/3.7.9 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
azure-mgmt-loganalytics/0.7.0 Azure-SDK-For-Python AZURECLI/2.16.0
- AZURECLI/2.16.0 azsdk-python-mgmt-loganalytics/8.0.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.OperationalInsights/workspaces/wprkspace000003?api-version=2020-03-01-preview
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.OperationalInsights/workspaces/wprkspace000003?api-version=2020-08-01
response:
body:
string: "{\r\n \"properties\": {\r\n \"source\": \"Azure\",\r\n \"customerId\":
\"47f46e43-9983-4bde-98b9-59a0afda0223\",\r\n \"provisioningState\": \"Succeeded\",\r\n
\"357b8444-70a3-477d-ad8d-f0d835cd0e8c\",\r\n \"provisioningState\": \"Succeeded\",\r\n
\ \"sku\": {\r\n \"name\": \"pergb2018\",\r\n \"maxCapacityReservationLevel\":
3000,\r\n \"lastSkuUpdate\": \"Tue, 22 Dec 2020 21:39:04 GMT\"\r\n },\r\n
3000,\r\n \"lastSkuUpdate\": \"Fri, 15 Jan 2021 06:52:12 GMT\"\r\n },\r\n
\ \"retentionInDays\": 30,\r\n \"features\": {\r\n \"legacy\": 0,\r\n
\ \"searchVersion\": 1,\r\n \"enableLogAccessUsingOnlyResourcePermissions\":
true\r\n },\r\n \"workspaceCapping\": {\r\n \"dailyQuotaGb\": -1.0,\r\n
\ \"quotaNextResetTime\": \"Wed, 23 Dec 2020 12:00:00 GMT\",\r\n \"dataIngestionStatus\":
\ \"quotaNextResetTime\": \"Fri, 15 Jan 2021 11:00:00 GMT\",\r\n \"dataIngestionStatus\":
\"RespectQuota\"\r\n },\r\n \"publicNetworkAccessForIngestion\": \"Enabled\",\r\n
\ \"publicNetworkAccessForQuery\": \"Enabled\",\r\n \"createdDate\":
\"Tue, 22 Dec 2020 21:39:04 GMT\",\r\n \"modifiedDate\": \"Tue, 22 Dec
2020 21:39:07 GMT\"\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/microsoft.operationalinsights/workspaces/wprkspace000003\",\r\n
\"Fri, 15 Jan 2021 06:52:12 GMT\",\r\n \"modifiedDate\": \"Fri, 15 Jan
2021 06:52:13 GMT\"\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/microsoft.operationalinsights/workspaces/wprkspace000003\",\r\n
\ \"name\": \"wprkspace000003\",\r\n \"type\": \"Microsoft.OperationalInsights/workspaces\",\r\n
\ \"location\": \"westus\"\r\n}"
headers:
Expand All @@ -153,7 +149,7 @@ interactions:
content-type:
- application/json
date:
- Tue, 22 Dec 2020 21:39:35 GMT
- Fri, 15 Jan 2021 06:52:44 GMT
pragma:
- no-cache
server:
Expand Down Expand Up @@ -187,15 +183,15 @@ interactions:
ParameterSetName:
- -n -g --sku --workspace
User-Agent:
- python/3.7.9 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
- python/3.7.8 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
azure-mgmt-resource/10.3.0 Azure-SDK-For-Python AZURECLI/2.16.0
accept-language:
- en-US
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2020-10-01
response:
body:
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2020-12-22T21:38:59Z"},"properties":{"provisioningState":"Succeeded"}}'
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2021-01-15T06:52:03Z"},"properties":{"provisioningState":"Succeeded"}}'
headers:
cache-control:
- no-cache
Expand All @@ -204,7 +200,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Tue, 22 Dec 2020 21:39:36 GMT
- Fri, 15 Jan 2021 06:52:45 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -237,24 +233,24 @@ interactions:
ParameterSetName:
- -n -g --sku --workspace
User-Agent:
- python/3.7.9 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
- python/3.7.8 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
azure-mgmt-containerregistry/3.0.0rc16 Azure-SDK-For-Python AZURECLI/2.16.0
accept-language:
- en-US
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/clireg000002?api-version=2020-11-01-preview
response:
body:
string: '{"sku":{"name":"Basic","tier":"Basic"},"type":"Microsoft.ContainerRegistry/registries","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/clireg000002","name":"clireg000002","location":"westus","tags":{},"systemData":{"createdBy":"oladewal@microsoft.com","createdByType":"User","createdAt":"2020-12-22T21:39:38.4517307+00:00","lastModifiedBy":"oladewal@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2020-12-22T21:39:38.4517307+00:00"},"properties":{"loginServer":"clireg000002.azurecr.io","creationDate":"2020-12-22T21:39:38.4517307Z","provisioningState":"Succeeded","adminUserEnabled":false,"policies":{"quarantinePolicy":{"status":"disabled"},"trustPolicy":{"type":"Notary","status":"disabled"},"retentionPolicy":{"days":7,"lastUpdatedTime":"2020-12-22T21:39:39.7609218+00:00","status":"disabled"}},"encryption":{"status":"disabled"},"dataEndpointEnabled":false,"dataEndpointHostNames":[],"privateEndpointConnections":[],"publicNetworkAccess":"Enabled","networkRuleBypassOptions":"AzureServices","zoneRedundancy":"Disabled"}}'
string: '{"sku":{"name":"Basic","tier":"Basic"},"type":"Microsoft.ContainerRegistry/registries","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/clireg000002","name":"clireg000002","location":"westus","tags":{},"systemData":{"createdBy":"ychenu@microsoft.com","createdByType":"User","createdAt":"2021-01-15T06:52:52.1745099+00:00","lastModifiedBy":"ychenu@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2021-01-15T06:52:52.1745099+00:00"},"properties":{"loginServer":"clireg000002.azurecr.io","creationDate":"2021-01-15T06:52:52.1745099Z","provisioningState":"Succeeded","adminUserEnabled":false,"policies":{"quarantinePolicy":{"status":"disabled"},"trustPolicy":{"type":"Notary","status":"disabled"},"retentionPolicy":{"days":7,"lastUpdatedTime":"2021-01-15T06:52:54.1020014+00:00","status":"disabled"}},"encryption":{"status":"disabled"},"dataEndpointEnabled":false,"dataEndpointHostNames":[],"privateEndpointConnections":[],"publicNetworkAccess":"Enabled","networkRuleBypassOptions":"AzureServices","zoneRedundancy":"Disabled"}}'
headers:
cache-control:
- no-cache
content-length:
- '1213'
- '1209'
content-type:
- application/json; charset=utf-8
date:
- Tue, 22 Dec 2020 21:39:40 GMT
- Fri, 15 Jan 2021 06:52:54 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -292,14 +288,11 @@ interactions:
Content-Length:
- '595'
Content-Type:
- application/json; charset=utf-8
- application/json
ParameterSetName:
- -n -g --sku --workspace
User-Agent:
- python/3.7.9 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
azure-mgmt-monitor/0.11.0 Azure-SDK-For-Python AZURECLI/2.16.0
accept-language:
- en-US
- AZURECLI/2.16.0 azsdk-python-azure-mgmt-monitor/2.0.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/clireg000002/providers/microsoft.insights/diagnosticSettings/clireg000002-diagnostic-settings?api-version=2017-05-01-preview
response:
Expand All @@ -313,7 +306,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Tue, 22 Dec 2020 21:39:43 GMT
- Fri, 15 Jan 2021 06:53:00 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -347,10 +340,7 @@ interactions:
ParameterSetName:
- -g --resource -n
User-Agent:
- python/3.7.9 (Windows-10-10.0.19041-SP0) msrest/0.6.18 msrest_azure/0.6.3
azure-mgmt-monitor/0.11.0 Azure-SDK-For-Python AZURECLI/2.16.0
accept-language:
- en-US
- AZURECLI/2.16.0 azsdk-python-azure-mgmt-monitor/2.0.0 Python/3.7.8 (Windows-10-10.0.19041-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/clireg000002/providers/microsoft.insights/diagnosticSettings/clireg000002-diagnostic-settings?api-version=2017-05-01-preview
response:
Expand All @@ -364,7 +354,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Tue, 22 Dec 2020 21:39:44 GMT
- Fri, 15 Jan 2021 06:53:03 GMT
expires:
- '-1'
pragma:
Expand Down
12 changes: 6 additions & 6 deletions ...e/cli/command_modules/databoxedge/tests/latest/test_device_scenario_coverage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
|Scenario|Result|ErrorMessage|ErrorStack|ErrorNormalized|StartDt|EndDt|
|step_device_create|successed||||2020-12-22 05:51:21.548213|2020-12-22 05:51:21.739031|
|step_device_show|successed||||2020-12-22 05:51:21.931000|2020-12-22 05:51:22.011748|
|step_device_list|successed||||2020-12-22 05:51:22.049533|2020-12-22 05:51:22.096941|
|step_device_list2|successed||||2020-12-22 05:51:21.845737|2020-12-22 05:51:21.880256|
|step_device_update|successed||||2020-12-22 05:51:21.880256|2020-12-22 05:51:21.931000|
|step_device_delete|successed||||2020-12-22 05:51:22.011748|2020-12-22 05:51:22.049533|
|step_device_create|successed||||2021-01-13 08:31:38.209522|2021-01-13 08:31:43.981223|
|step_device_show|successed||||2021-01-13 08:31:56.811539|2021-01-13 08:31:59.056123|
|step_device_list|successed||||2021-01-13 08:32:01.747769|2021-01-13 08:32:05.003301|
|step_device_list2|successed||||2021-01-13 08:31:52.250896|2021-01-13 08:31:54.480896|
|step_device_update|successed||||2021-01-13 08:31:54.481895|2021-01-13 08:31:56.810543|
|step_device_delete|successed||||2021-01-13 08:31:59.068123|2021-01-13 08:32:01.747769|
Coverage: 6/6
10 changes: 8 additions & 2 deletions .../cli/command_modules/databoxedge/tests/latest/test_general_scenario_coverage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
|Scenario|Result|ErrorMessage|ErrorStack|ErrorNormalized|StartDt|EndDt|
|step_list_sku|successed||||2020-12-18 07:01:59.621791|2020-12-18 07:01:59.717812|
Coverage: 1/1
|step_device_create|successed||||2021-01-13 08:31:38.209522|2021-01-13 08:31:43.981223|
|step_device_show|successed||||2021-01-13 08:31:56.811539|2021-01-13 08:31:59.056123|
|step_device_list|successed||||2021-01-13 08:32:01.747769|2021-01-13 08:32:05.003301|
|step_device_list2|successed||||2021-01-13 08:31:52.250896|2021-01-13 08:31:54.480896|
|step_device_update|successed||||2021-01-13 08:31:54.481895|2021-01-13 08:31:56.810543|
|step_device_delete|successed||||2021-01-13 08:31:59.068123|2021-01-13 08:32:01.747769|
|step_list_sku|successed||||2021-01-13 08:32:06.498815|2021-01-13 08:32:08.619873|
Coverage: 7/7
19 changes: 12 additions & 7 deletions ...re/cli/command_modules/databoxedge/tests/latest/test_order_scenario_coverage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
|Scenario|Result|ErrorMessage|ErrorStack|ErrorNormalized|StartDt|EndDt|
|step_device_create|successed||||2020-12-18 07:01:59.623792|2020-12-18 07:01:59.719814|
|step_order_create|successed||||2020-12-18 07:01:59.720814|2020-12-18 07:02:01.463902|
|step_order_show|successed||||2020-12-18 07:02:01.464914|2020-12-18 07:02:01.515960|
|step_order_list|successed||||2020-12-18 07:02:02.895995|2020-12-18 07:02:02.924028|
|step_order_delete|successed||||2020-12-18 07:02:01.545989|2020-12-18 07:02:02.895995|
|step_device_delete|successed||||2020-12-18 07:02:02.924997|2020-12-18 07:02:02.952027|
Coverage: 6/6
|step_device_create|successed||||2021-01-13 08:32:10.699869|2021-01-13 08:32:12.736978|
|step_device_show|successed||||2021-01-13 08:31:56.811539|2021-01-13 08:31:59.056123|
|step_device_list|successed||||2021-01-13 08:32:01.747769|2021-01-13 08:32:05.003301|
|step_device_list2|successed||||2021-01-13 08:31:52.250896|2021-01-13 08:31:54.480896|
|step_device_update|successed||||2021-01-13 08:31:54.481895|2021-01-13 08:31:56.810543|
|step_device_delete|successed||||2021-01-13 08:33:48.089181|2021-01-13 08:33:50.416737|
|step_list_sku|successed||||2021-01-13 08:32:06.498815|2021-01-13 08:32:08.619873|
|step_order_create|successed||||2021-01-13 08:32:12.736978|2021-01-13 08:32:33.590531|
|step_order_show|successed||||2021-01-13 08:32:33.591531|2021-01-13 08:32:36.247526|
|step_order_list|successed||||2021-01-13 08:33:45.576627|2021-01-13 08:33:48.088182|
|step_order_delete|successed||||2021-01-13 08:32:38.831555|2021-01-13 08:33:45.574626|
Coverage: 11/11
Loading