Skip to content

Commit 0c8f1d7

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pv2Sector
2 parents 29a6bbc + 7bb2ccf commit 0c8f1d7

File tree

14 files changed

+148
-91
lines changed

14 files changed

+148
-91
lines changed

articles/azure-resource-manager/management/delete-resource-group.md

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
title: Delete resource group and resources
33
description: Describes how to delete resource groups and resources. It describes how Azure Resource Manager orders the deletion of resources when a deleting a resource group. It describes the response codes and how Resource Manager handles them to determine if the deletion succeeded.
44
ms.topic: conceptual
5-
ms.date: 10/13/2022
5+
ms.date: 04/10/2023
66
ms.custom: seodec18, devx-track-arm-template
77
---
88

99
# Azure Resource Manager resource group and resource deletion
1010

1111
This article shows how to delete resource groups and resources. It describes how Azure Resource Manager orders the deletion of resources when you delete a resource group.
1212

13+
[!INCLUDE [AI attribution](../../../includes/ai-generated-attribution.md)]
14+
1315
## How order of deletion is determined
1416

1517
When you delete a resource group, Resource Manager determines the order to delete resources. It uses the following order:
@@ -78,6 +80,21 @@ az group delete --name ExampleResourceGroup
7880

7981
1. To confirm the deletion, type the name of the resource group
8082

83+
# [Python](#tab/azure-python)
84+
85+
```python
86+
import os
87+
from azure.identity import AzureCliCredential
88+
from azure.mgmt.resource import ResourceManagementClient
89+
90+
credential = AzureCliCredential()
91+
subscription_id = os.environ["AZURE_SUBSCRIPTION_ID"]
92+
93+
resource_client = ResourceManagementClient(credential, subscription_id)
94+
95+
rg_result = resource_client.resource_groups.begin_delete("exampleGroup")
96+
```
97+
8198
---
8299

83100
## Delete resource
@@ -112,6 +129,29 @@ az resource delete \
112129

113130
1. When prompted, confirm the deletion.
114131

132+
# [Python](#tab/azure-python)
133+
134+
```python
135+
import os
136+
from azure.identity import AzureCliCredential
137+
from azure.mgmt.resource import ResourceManagementClient
138+
139+
credential = AzureCliCredential()
140+
subscription_id = os.environ["AZURE_SUBSCRIPTION_ID"]
141+
142+
resource_client = ResourceManagementClient(credential, subscription_id)
143+
144+
resource_client.resources.begin_delete_by_id(
145+
"/subscriptions/{}/resourceGroups/{}/providers/{}/{}".format(
146+
subscription_id,
147+
"exampleGroup",
148+
"Microsoft.Compute",
149+
"virtualMachines/exampleVM"
150+
),
151+
"2022-11-01"
152+
)
153+
```
154+
115155
---
116156

117157
## Required access and deletion failures

articles/cognitive-services/language-service/summarization/includes/regional-availability.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ ms.custom: references_regions, ignite-2022
1111
---
1212

1313
> [!IMPORTANT]
14+
> * Starting April 10th, 2023, customers get access to all summarization capabilities in the Language service (document abstractive summarization, conversation issue and resolution summarization and conversation narrative summarization with chapters) for batch-only requests. For near real time requests, except for extractive summarization, please [submit a request for approval](https://aka.ms/applyforgatedsummarizationfeatures).
1415
> * To use gated summarization features, e.g. document abstractive summarization, conversation issue and resolution summarization, and conversation narrative summarization with chapters, you must [submit an online request and have it approved](https://aka.ms/applyforgatedsummarizationfeatures).
15-
> * These gated summarization features are only available through Language resources in the following regions:
16+
> * Document abstractive summarization, conversation issue and resolution summarization and conversation narrative summarization with chapters features are only available through Language resources in the following regions:
1617
> * North Europe
1718
> * East US
1819
> * UK South

articles/cognitive-services/language-service/summarization/language-support.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ Use this article to learn which natural languages are supported by document and
3838

3939
| Language | Language code | Notes |
4040
|-----------------------|---------------|---------------------|
41+
| Chinese-Simplified | `zh-hans` | `zh` also accepted |
4142
| English | `en` | |
43+
| French | `fr` | |
44+
| German | `de` | |
45+
| Italian | `it` | |
46+
| Japanese | `ja` | |
47+
| Korean | `ko` | |
48+
| Spanish | `es` | |
49+
| Portuguese | `pt` | |
4250

4351
# [Conversation summarization (preview)](#tab/conversation-summarization)
4452

articles/defender-for-iot/device-builders/tutorial-investigate-security-alerts.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ In this tutorial you'll learn how to:
2727

2828
- You must have [enabled Microsoft Defender for IoT on your Azure IoT Hub](quickstart-onboard-iot-hub.md).
2929

30-
- You must have [added a resource group to your IoT solution](quickstart-configure-your-solution.md)
30+
- You must have [added a resource group to your IoT solution](quickstart-configure-your-solution.md).
3131

3232
- You must have [created a Defender for IoT micro agent module twin](quickstart-create-micro-agent-module-twin.md).
3333

34-
- You must have [installed the Defender for IoT micro agent](quickstart-standalone-agent-binary-installation.md)
34+
- You must have [installed the Defender for IoT micro agent](quickstart-standalone-agent-binary-installation.md).
3535

36-
- You must have [configured the Microsoft Defender for IoT agent-based solution](how-to-configure-agent-based-solution.md)
36+
- You must have [configured the Microsoft Defender for IoT agent-based solution](how-to-configure-agent-based-solution.md).
3737

38-
- Learned how to [investigate security recommendations](quickstart-investigate-security-recommendations.md)
38+
- Learned how to [investigate security recommendations](quickstart-investigate-security-recommendations.md).
3939

4040
## Investigate security alerts
4141

@@ -51,7 +51,7 @@ The Defender for IoT security alert list displays all of the aggregated security
5151

5252
## Investigate security alert details
5353

54-
Opening each aggregated alert displays the detailed alert description, remediation steps, and device ID for each device that triggered an alert. The alert severity, and direct investigation is accessible using Log Analytics.
54+
Opening each aggregated alert displays the detailed alert description, remediation steps, and device ID for each device that triggered an alert. The alert severity and direct investigation is accessible using Log Analytics.
5555

5656
**To investigate security alert details**:
5757

@@ -61,15 +61,15 @@ Opening each aggregated alert displays the detailed alert description, remediati
6161

6262
1. Select any security alert from the list to open it.
6363

64-
1. Review the alert **description**, **severity**, **source of the detection**, **device details** of all devices that issued this alert in the aggregation period.
64+
1. Review the alert **description**, **severity**, **source of the detection**, and **device details** of all devices that issued this alert in the aggregation period.
6565

6666
:::image type="content" source="media/quickstart/drill-down-iot-alert-details.png" alt-text="Investigate and review the details of each device in an aggregated alert." lightbox="media/quickstart/drill-down-iot-alert-details-expanded.png":::
6767

68-
1. After reviewing the alert specifics, use the **manual remediation step** instructions to help remediate, and resolve the issue that caused the alert.
68+
1. After reviewing the alert specifics, use the **manual remediation step** instructions to help remediate and resolve the issue that caused the alert.
6969

7070
:::image type="content" source="media/quickstart/iot-alert-manual-remediation-steps.png" alt-text="Follow the manual remediation steps to help resolve or remediate your device security alerts":::
7171

72-
## Investigate alerts in Log Analytics workspace
72+
## Investigate alerts in your Log Analytics workspace
7373

7474
You can access your alerts and investigate them with the Log Analytics workspace.
7575

articles/storage/blobs/secure-file-transfer-protocol-known-issues.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following clients are known to be incompatible with SFTP for Azure Blob Stor
3030
- paramiko 1.16.0
3131
- SSH.NET 2016.1.0
3232

33-
The unsupported client list above is not exhaustive and may change over time.
33+
The unsupported client list above isn't exhaustive and may change over time.
3434

3535
## Client settings
3636

@@ -47,7 +47,7 @@ To transfer files to or from Azure Blob Storage via SFTP clients, see the follow
4747

4848
| Category | Unsupported operations |
4949
|---|---|
50-
| ACLs | <li>`chgrp` - change group<li>`chmod` - change permissions/mode<li>`chown` - change owner<li>`put/get -p` - preserving permissions |
50+
| ACLs | <li>`chgrp` - change group<li>`chmod` - change permissions/mode<li>`chown` - change owner<li>`put/get -p` - preserving properties such as permissions and timestamps |
5151
| Resuming Uploads | `reput`. `put -a` |
5252
| Random writes and appends | <li>Operations that include both READ and WRITE flags. For example: [SSH.NET create API](https://github.com/sshnet/SSH.NET/blob/develop/src/Renci.SshNet/SftpClient.cs#:~:text=public%20SftpFileStream-,Create,-(string%20path))<li>Operations that include APPEND flag. For example: [SSH.NET append API](https://github.com/sshnet/SSH.NET/blob/develop/src/Renci.SshNet/SftpClient.cs#:~:text=public%20void-,AppendAllLines,-(string%20path%2C%20IEnumerable%3Cstring%3E%20contents)). |
5353
| Links |<li>`symlink` - creating symbolic links<li>`ln` - creating hard links<li>Reading links not supported |
@@ -71,11 +71,11 @@ To learn more, see [SFTP permission model](secure-file-transfer-protocol-support
7171

7272
- To access the storage account using SFTP, your network must allow traffic on port 22.
7373

74-
- Static IP addresses aren't supported for storage accounts. This is not an SFTP specific limitation.
74+
- Static IP addresses aren't supported for storage accounts. This isn't an SFTP specific limitation.
7575

76-
- Internet routing is not supported. Use Microsoft network routing.
76+
- Internet routing isn't supported. Use Microsoft network routing.
7777

78-
- There's a 2 minute time out for idle or inactive connections. OpenSSH will appear to stop responding and then disconnect. Some clients reconnect automatically.
78+
- There's a 2-minute time out for idle or inactive connections. OpenSSH will appear to stop responding and then disconnect. Some clients reconnect automatically.
7979

8080
## Other
8181

@@ -97,7 +97,7 @@ To learn more, see [SFTP permission model](secure-file-transfer-protocol-support
9797

9898
## Troubleshooting
9999

100-
- To resolve the `Failed to update SFTP settings for account 'accountname'. Error: The value 'True' is not allowed for property isSftpEnabled.` error, ensure that the following pre-requisites are met at the storage account level:
100+
- To resolve the `Failed to update SFTP settings for account 'accountname'. Error: The value 'True' isn't allowed for property isSftpEnabled.` error, ensure that the following prerequisites are met at the storage account level:
101101

102102
- The account needs to be a general-purpose v2 and premium block blob accounts.
103103

0 commit comments

Comments
 (0)