Skip to content

Commit 6e658cd

Browse files
PRMerger17PRMerger17
authored
Merge pull request #134895 from tfitzmac/1021tag
update tag and complete
2 parents e685c50 + 162bdb4 commit 6e658cd

File tree

2 files changed

+93
-16
lines changed

2 files changed

+93
-16
lines changed

‎articles/azure-resource-manager/management/tag-support.md

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Tag support for resources
33
description: Shows which Azure resource types support tags. Provides details for all Azure services.
44
ms.topic: conceptual
5-
ms.date: 09/21/2020
5+
ms.date: 10/21/2020
66
---
77

88
# Tag support for Azure resources
@@ -32,6 +32,7 @@ Jump to a resource provider namespace:
3232
> - [Microsoft.AzureData](#microsoftazuredata)
3333
> - [Microsoft.AzureStack](#microsoftazurestack)
3434
> - [Microsoft.AzureStackHCI](#microsoftazurestackhci)
35+
> - [Microsoft.BareMetalInfrastructure](#microsoftbaremetalinfrastructure)
3536
> - [Microsoft.Batch](#microsoftbatch)
3637
> - [Microsoft.Billing](#microsoftbilling)
3738
> - [Microsoft.BingMaps](#microsoftbingmaps)
@@ -162,6 +163,7 @@ Jump to a resource provider namespace:
162163
> - [Microsoft.ServiceFabricMesh](#microsoftservicefabricmesh)
163164
> - [Microsoft.Services](#microsoftservices)
164165
> - [Microsoft.SignalRService](#microsoftsignalrservice)
166+
> - [Microsoft.Singularity](#microsoftsingularity)
165167
> - [Microsoft.SoftwarePlan](#microsoftsoftwareplan)
166168
> - [Microsoft.Solutions](#microsoftsolutions)
167169
> - [Microsoft.SQL](#microsoftsql)
@@ -356,6 +358,7 @@ Jump to a resource provider namespace:
356358
> | Resource type | Supports tags | Tag in cost report |
357359
> | ------------- | ----------- | ----------- |
358360
> | privateClouds | Yes | Yes |
361+
> | privateClouds / addons | No | No |
359362
> | privateClouds / authorizations | No | No |
360363
> | privateClouds / clusters | No | No |
361364
> | privateClouds / globalReachConnections | No | No |
@@ -418,12 +421,21 @@ Jump to a resource provider namespace:
418421
> | ------------- | ----------- | ----------- |
419422
> | clusters | Yes | Yes |
420423
424+
## Microsoft.BareMetalInfrastructure
425+
426+
> [!div class="mx-tableFixed"]
427+
> | Resource type | Supports tags | Tag in cost report |
428+
> | ------------- | ----------- | ----------- |
429+
> | bareMetalInstances | Yes | Yes |
430+
421431
## Microsoft.Batch
422432

423433
> [!div class="mx-tableFixed"]
424434
> | Resource type | Supports tags | Tag in cost report |
425435
> | ------------- | ----------- | ----------- |
426436
> | batchAccounts | Yes | Yes |
437+
> | batchAccounts / certificates | No | No |
438+
> | batchAccounts / pools | No | No |
427439
428440
## Microsoft.Billing
429441

@@ -732,7 +744,7 @@ Jump to a resource provider namespace:
732744
> [!div class="mx-tableFixed"]
733745
> | Resource type | Supports tags | Tag in cost report |
734746
> | ------------- | ----------- | ----------- |
735-
> | plans | Yes | Yes |
747+
> | plans | Yes | No |
736748
> | registeredSubscriptions | No | No |
737749
738750
## Microsoft.CognitiveServices
@@ -968,7 +980,6 @@ Jump to a resource provider namespace:
968980
> | ------------- | ----------- | ----------- |
969981
> | workspaces | Yes | Yes |
970982
> | workspaces / dbWorkspaces | No | No |
971-
> | workspaces / storageEncryption | No | No |
972983
> | workspaces / virtualNetworkPeerings | No | No |
973984
974985
## Microsoft.DataCatalog
@@ -1127,6 +1138,7 @@ Jump to a resource provider namespace:
11271138
> | applicationgroups / desktops | No | No |
11281139
> | applicationgroups / startmenuitems | No | No |
11291140
> | hostpools | Yes | Yes |
1141+
> | hostpools / msixpackages | No | No |
11301142
> | hostpools / sessionhosts | No | No |
11311143
> | hostpools / sessionhosts / usersessions | No | No |
11321144
> | hostpools / usersessions | No | No |
@@ -1379,12 +1391,14 @@ Jump to a resource provider namespace:
13791391
> | Resource type | Supports tags | Tag in cost report |
13801392
> | ------------- | ----------- | ----------- |
13811393
> | devices | Yes | Yes |
1394+
> | networkFunctions | Yes | Yes |
1395+
> | networkFunctionVendors | No | No |
13821396
> | registeredSubscriptions | No | No |
13831397
> | vendors | No | No |
1384-
> | vendors / vendorskus | No | No |
1385-
> | vendors / vendorskus / previewSubscriptions | No | No |
1386-
> | virtualnetworkfunctions | Yes | Yes |
1387-
> | virtualnetworkfunctionvendors | No | No |
1398+
> | vendors / vendorSkus | No | No |
1399+
> | vendors / vendorSkus / previewSubscriptions | No | No |
1400+
> | virtualNetworkFunctions | Yes | Yes |
1401+
> | virtualNetworkFunctionVendors | No | No |
13881402
13891403
## Microsoft.Hydra
13901404

@@ -1532,9 +1546,20 @@ Jump to a resource provider namespace:
15321546
> | Resource type | Supports tags | Tag in cost report |
15331547
> | ------------- | ----------- | ----------- |
15341548
> | workspaces | Yes | Yes |
1549+
> | workspaces / batchEndpoints | Yes | Yes |
1550+
> | workspaces / batchEndpoints / deployments | Yes | Yes |
1551+
> | workspaces / codes | No | No |
1552+
> | workspaces / codes / versions | No | No |
15351553
> | workspaces / computes | No | No |
1554+
> | workspaces / datastores | No | No |
15361555
> | workspaces / eventGridFilters | No | No |
1556+
> | workspaces / jobs | No | No |
1557+
> | workspaces / labelingJobs | No | No |
15371558
> | workspaces / linkedServices | No | No |
1559+
> | workspaces / models | No | No |
1560+
> | workspaces / models / versions | No | No |
1561+
> | workspaces / onlineEndpoints | Yes | Yes |
1562+
> | workspaces / onlineEndpoints / deployments | Yes | Yes |
15381563
15391564
## Microsoft.Maintenance
15401565

@@ -2189,6 +2214,17 @@ Jump to a resource provider namespace:
21892214
> | SignalR | Yes | Yes |
21902215
> | SignalR / eventGridFilters | No | No |
21912216
2217+
## Microsoft.Singularity
2218+
2219+
> [!div class="mx-tableFixed"]
2220+
> | Resource type | Supports tags | Tag in cost report |
2221+
> | ------------- | ----------- | ----------- |
2222+
> | accounts | Yes | Yes |
2223+
> | accounts / accountQuotaPolicies | No | No |
2224+
> | accounts / groupPolicies | No | No |
2225+
> | accounts / jobs | No | No |
2226+
> | accounts / storageContainers | No | No |
2227+
21922228
## Microsoft.SoftwarePlan
21932229

21942230
> [!div class="mx-tableFixed"]
@@ -2327,6 +2363,7 @@ Jump to a resource provider namespace:
23272363
> | Resource type | Supports tags | Tag in cost report |
23282364
> | ------------- | ----------- | ----------- |
23292365
> | clusters | Yes | Yes |
2366+
> | clusters / privateEndpoints | No | No |
23302367
> | streamingjobs | Yes (see note below) | Yes |
23312368
23322369
> [!NOTE]
@@ -2428,8 +2465,8 @@ Jump to a resource provider namespace:
24282465
> [!div class="mx-tableFixed"]
24292466
> | Resource type | Supports tags | Tag in cost report |
24302467
> | ------------- | ----------- | ----------- |
2431-
> | accounts | Yes | Yes |
2432-
> | plans | Yes | Yes |
2468+
> | accounts | Yes | No |
2469+
> | plans | Yes | No |
24332470
> | registeredSubscriptions | No | No |
24342471
24352472
## Microsoft.Web
@@ -2464,6 +2501,8 @@ Jump to a resource provider namespace:
24642501
> | runtimes | No | No |
24652502
> | serverFarms | Yes | Yes |
24662503
> | serverFarms / eventGridFilters | No | No |
2504+
> | serverFarms / firstPartyApps | No | No |
2505+
> | serverFarms / firstPartyApps / keyVaultSettings | No | No |
24672506
> | sites | Yes | Yes |
24682507
> | sites / config | No | No |
24692508
> | sites / eventGridFilters | No | No |

‎articles/azure-resource-manager/templates/complete-mode-deletion.md

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Complete mode deletion
33
description: Shows how resource types handle complete mode deletion in Azure Resource Manager templates.
44
ms.topic: conceptual
5-
ms.date: 10/06/2020
5+
ms.date: 10/21/2020
66
---
77

88
# Deletion of Azure resources for complete mode deployments
@@ -19,7 +19,6 @@ The resources are listed by resource provider namespace. To match a resource pro
1919

2020
> [!NOTE]
2121
> Always use the [what-if operation](template-deploy-what-if.md) before deploying a template in complete mode. What-if shows you which resources will be created, deleted, or modified. Use what-if to avoid unintentionally deleting resources.
22-
2322
Jump to a resource provider namespace:
2423
> [!div class="op_single_selector"]
2524
> - [Microsoft.AAD](#microsoftaad)
@@ -42,6 +41,7 @@ Jump to a resource provider namespace:
4241
> - [Microsoft.AzureData](#microsoftazuredata)
4342
> - [Microsoft.AzureStack](#microsoftazurestack)
4443
> - [Microsoft.AzureStackHCI](#microsoftazurestackhci)
44+
> - [Microsoft.BareMetalInfrastructure](#microsoftbaremetalinfrastructure)
4545
> - [Microsoft.Batch](#microsoftbatch)
4646
> - [Microsoft.Billing](#microsoftbilling)
4747
> - [Microsoft.BingMaps](#microsoftbingmaps)
@@ -171,6 +171,7 @@ Jump to a resource provider namespace:
171171
> - [Microsoft.ServiceFabricMesh](#microsoftservicefabricmesh)
172172
> - [Microsoft.Services](#microsoftservices)
173173
> - [Microsoft.SignalRService](#microsoftsignalrservice)
174+
> - [Microsoft.Singularity](#microsoftsingularity)
174175
> - [Microsoft.SoftwarePlan](#microsoftsoftwareplan)
175176
> - [Microsoft.Solutions](#microsoftsolutions)
176177
> - [Microsoft.SQL](#microsoftsql)
@@ -359,6 +360,7 @@ Jump to a resource provider namespace:
359360
> | Resource type | Complete mode deletion |
360361
> | ------------- | ----------- |
361362
> | privateClouds | Yes |
363+
> | privateClouds / addons | No |
362364
> | privateClouds / authorizations | No |
363365
> | privateClouds / clusters | No |
364366
> | privateClouds / globalReachConnections | No |
@@ -421,12 +423,21 @@ Jump to a resource provider namespace:
421423
> | ------------- | ----------- |
422424
> | clusters | Yes |
423425
426+
## Microsoft.BareMetalInfrastructure
427+
428+
> [!div class="mx-tableFixed"]
429+
> | Resource type | Complete mode deletion |
430+
> | ------------- | ----------- |
431+
> | bareMetalInstances | Yes |
432+
424433
## Microsoft.Batch
425434

426435
> [!div class="mx-tableFixed"]
427436
> | Resource type | Complete mode deletion |
428437
> | ------------- | ----------- |
429438
> | batchAccounts | Yes |
439+
> | batchAccounts / certificates | No |
440+
> | batchAccounts / pools | No |
430441
431442
## Microsoft.Billing
432443

@@ -968,7 +979,6 @@ Jump to a resource provider namespace:
968979
> | ------------- | ----------- |
969980
> | workspaces | Yes |
970981
> | workspaces / dbWorkspaces | No |
971-
> | workspaces / storageEncryption | No |
972982
> | workspaces / virtualNetworkPeerings | No |
973983
974984
## Microsoft.DataCatalog
@@ -1124,6 +1134,7 @@ Jump to a resource provider namespace:
11241134
> | applicationgroups / desktops | No |
11251135
> | applicationgroups / startmenuitems | No |
11261136
> | hostpools | Yes |
1137+
> | hostpools / msixpackages | No |
11271138
> | hostpools / sessionhosts | No |
11281139
> | hostpools / sessionhosts / usersessions | No |
11291140
> | hostpools / usersessions | No |
@@ -1376,12 +1387,14 @@ Jump to a resource provider namespace:
13761387
> | Resource type | Complete mode deletion |
13771388
> | ------------- | ----------- |
13781389
> | devices | Yes |
1390+
> | networkFunctions | Yes |
1391+
> | networkFunctionVendors | No |
13791392
> | registeredSubscriptions | No |
13801393
> | vendors | No |
1381-
> | vendors / vendorskus | No |
1382-
> | vendors / vendorskus / previewSubscriptions | No |
1383-
> | virtualnetworkfunctions | Yes |
1384-
> | virtualnetworkfunctionvendors | No |
1394+
> | vendors / vendorSkus | No |
1395+
> | vendors / vendorSkus / previewSubscriptions | No |
1396+
> | virtualNetworkFunctions | Yes |
1397+
> | virtualNetworkFunctionVendors | No |
13851398
13861399
## Microsoft.Hydra
13871400

@@ -1502,9 +1515,20 @@ Jump to a resource provider namespace:
15021515
> | Resource type | Complete mode deletion |
15031516
> | ------------- | ----------- |
15041517
> | workspaces | Yes |
1518+
> | workspaces / batchEndpoints | Yes |
1519+
> | workspaces / batchEndpoints / deployments | Yes |
1520+
> | workspaces / codes | No |
1521+
> | workspaces / codes / versions | No |
15051522
> | workspaces / computes | No |
1523+
> | workspaces / datastores | No |
15061524
> | workspaces / eventGridFilters | No |
1525+
> | workspaces / jobs | No |
1526+
> | workspaces / labelingJobs | No |
15071527
> | workspaces / linkedServices | No |
1528+
> | workspaces / models | No |
1529+
> | workspaces / models / versions | No |
1530+
> | workspaces / onlineEndpoints | Yes |
1531+
> | workspaces / onlineEndpoints / deployments | Yes |
15081532
15091533
## Microsoft.Maintenance
15101534

@@ -2152,6 +2176,17 @@ Jump to a resource provider namespace:
21522176
> | SignalR | Yes |
21532177
> | SignalR / eventGridFilters | No |
21542178
2179+
## Microsoft.Singularity
2180+
2181+
> [!div class="mx-tableFixed"]
2182+
> | Resource type | Complete mode deletion |
2183+
> | ------------- | ----------- |
2184+
> | accounts | Yes |
2185+
> | accounts / accountQuotaPolicies | No |
2186+
> | accounts / groupPolicies | No |
2187+
> | accounts / jobs | No |
2188+
> | accounts / storageContainers | No |
2189+
21552190
## Microsoft.SoftwarePlan
21562191

21572192
> [!div class="mx-tableFixed"]
@@ -2284,6 +2319,7 @@ Jump to a resource provider namespace:
22842319
> | Resource type | Complete mode deletion |
22852320
> | ------------- | ----------- |
22862321
> | clusters | Yes |
2322+
> | clusters / privateEndpoints | No |
22872323
> | streamingjobs | Yes |
22882324
22892325
## Microsoft.Subscription
@@ -2418,6 +2454,8 @@ Jump to a resource provider namespace:
24182454
> | runtimes | No |
24192455
> | serverFarms | Yes |
24202456
> | serverFarms / eventGridFilters | No |
2457+
> | serverFarms / firstPartyApps | No |
2458+
> | serverFarms / firstPartyApps / keyVaultSettings | No |
24212459
> | sites | Yes |
24222460
> | sites/config | No |
24232461
> | sites / eventGridFilters | No |

0 commit comments

Comments
 (0)