Skip to content

Commit 22281e3

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into upcoming-deprecation
2 parents 0161cdc + ef64384 commit 22281e3

File tree

6 files changed

+49
-43
lines changed

6 files changed

+49
-43
lines changed

articles/azure-monitor/logs/customer-managed-keys.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,8 @@ N/A
279279
# [Azure CLI](#tab/azure-cli)
280280

281281
```azurecli
282+
az account set —subscription "storage-account-subscription-id"
283+
282284
$storageAccountId = '/subscriptions/<subscription-id>/resourceGroups/<resource-group-name>/providers/Microsoft.Storage/storageAccounts/<storage name>'
283285
284286
az account set —subscription "workspace-subscription-id"
@@ -289,11 +291,13 @@ az monitor log-analytics workspace linked-storage create —type Query —resour
289291
# [PowerShell](#tab/powershell)
290292

291293
```powershell
292-
$storageAccount.Id = Get-AzStorageAccount -ResourceGroupName "resource-group-name" -Name "storage-account-name"
294+
Select-AzSubscription "StorageAccount-subscription-id"
295+
296+
$storageAccountId = (Get-AzStorageAccount -ResourceGroupName "resource-group-name" -Name "storage-account-name").id
293297
294298
Select-AzSubscription "workspace-subscription-id"
295299
296-
New-AzOperationalInsightsLinkedStorageAccount -ResourceGroupName "resource-group-name" -WorkspaceName "workspace-name" -DataSourceType Query -StorageAccountIds $storageAccount.Id
300+
New-AzOperationalInsightsLinkedStorageAccount -ResourceGroupName "resource-group-name" -WorkspaceName "workspace-name" -DataSourceType Query -StorageAccountIds $storageAccountId
297301
```
298302

299303
# [REST](#tab/rest)
@@ -329,6 +333,8 @@ N/A
329333
# [Azure CLI](#tab/azure-cli)
330334

331335
```azurecli
336+
az account set —subscription "storage-account-subscription-id"
337+
332338
$storageAccountId = '/subscriptions/<subscription-id>/resourceGroups/<resource-group-name>/providers/Microsoft.Storage/storageAccounts/<storage name>'
333339
334340
az account set —subscription "workspace-subscription-id"
@@ -339,11 +345,13 @@ az monitor log-analytics workspace linked-storage create —type ALerts —resou
339345
# [PowerShell](#tab/powershell)
340346

341347
```powershell
342-
$storageAccount.Id = Get-AzStorageAccount -ResourceGroupName "resource-group-name" -Name "storage-account-name"
348+
Select-AzSubscription "StorageAccount-subscription-id"
349+
350+
$storageAccountId = (Get-AzStorageAccount -ResourceGroupName "resource-group-name" -Name "storage-account-name").id
343351
344352
Select-AzSubscription "workspace-subscription-id"
345353
346-
New-AzOperationalInsightsLinkedStorageAccount -ResourceGroupName "resource-group-name" -WorkspaceName "workspace-name" -DataSourceType Alerts -StorageAccountIds $storageAccount.Id
354+
New-AzOperationalInsightsLinkedStorageAccount -ResourceGroupName "resource-group-name" -WorkspaceName "workspace-name" -DataSourceType Alerts -StorageAccountIds $storageAccountId
347355
```
348356

349357
# [REST](#tab/rest)

articles/azure-monitor/logs/logs-data-export.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Log Analytics workspace data export continuously exports data that is sent to yo
3939
- You can define up to 10 enabled rules in your workspace. More rules are allowed when disabled.
4040
- Destinations must be in the same region as the Log Analytics workspace.
4141
- Storage Account must be unique across rules in workspace.
42-
- Tables names can be no longer than 60 characters when exporting to Storage Account and 47 characters to Event Hubs. Tables with longer names will not be exported.
42+
- Tables names can be 60 characters long when exporting to Storage Account, and 47 characters to Event Hubs. Tables with longer names won't be exported.
4343
- Data export isn't supported in China currently.
4444

4545
## Data completeness
@@ -151,8 +151,7 @@ If you have configured your Storage Account to allow access from selected networ
151151
Data export rule defines the destination and tables for which data is exported. You can create 10 rules in 'enable' state in your workspace, more rules are allowed in 'disable' state. Storage Account must be unique across rules in workspace. Multiple rules can use the same Event Hubs namespace when sending to separate Event Hubs.
152152

153153
> [!NOTE]
154-
> - You can include tables that aren't yet supported in export, and no data will be exported for these until the tables are supported.
155-
> - The legacy custom log won’t be supported in export. The next generation of custom log available in preview early 2022 can be exported.
154+
> - You can include tables that aren't yet supported in rules, but no data will be exported for these until tables get supported.
156155
> - Export to Storage Account - a separate container is created in Storage Account for each table.
157156
> - Export to Event Hubs - if Event Hubs name isn't provided, a separate Event Hubs is created for each table. The [number of supported Event Hubs in 'Basic' and 'Standard' namespaces tiers is 10](../../event-hubs/event-hubs-quotas.md#common-limits-for-all-tiers). When exporting more than 10 tables to these tiers, either split the tables between several export rules to different Event Hubs namespaces, or provide an Event Hubs name in the rule to export all tables to it.
158157

articles/cognitive-services/Speech-Service/how-to-speech-synthesis-viseme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: speech-service
1010
ms.topic: how-to
11-
ms.date: 09/16/2022
11+
ms.date: 10/23/2022
1212
ms.author: yulili
1313
ms.devlang: cpp, csharp, java, javascript, python
1414
ms.custom: references_regions
@@ -243,7 +243,7 @@ Here's an example of the viseme output.
243243

244244
# [2D SVG](#tab/2dsvg)
245245

246-
The SVG output is a xml string that contains the animation.
246+
The SVG output is an xml string that contains the animation.
247247
Render the SVG animation along with the synthesized speech to see the mouth movement.
248248

249249
```xml

articles/defender-for-cloud/concept-cloud-security-posture-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Defender for Cloud continually assesses your resources, subscriptions, and organ
1717
|Aspect|Details|
1818
|----|:----|
1919
|Release state:| Foundational CSPM capabilities: GA <br> Defender Cloud Security Posture Management (CSPM): Preview |
20-
|Clouds:|:::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="./media/icons/yes-icon.png"::: National (Azure Government, Azure China 21Vianet)<br>:::image type="icon" source="./media/icons/no-icon.png"::: Connected AWS accounts <br>:::image type="icon" source="./media/icons/no-icon.png"::: Connected GCP projects|
20+
|Clouds:| **Foundational CSPM capabilities** <br> :::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="./media/icons/yes-icon.png"::: National (Azure Government, Azure China 21Vianet)<br>:::image type="icon" source="./media/icons/no-icon.png"::: Connected AWS accounts <br>:::image type="icon" source="./media/icons/no-icon.png"::: Connected GCP projects <br> <br> **Defender Cloud Security Posture Management (CSPM)** <br> :::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="./media/icons/no-icon.png"::: National (Azure Government, Azure China 21Vianet)<br>:::image type="icon" source="./media/icons/no-icon.png"::: Connected AWS accounts <br>:::image type="icon" source="./media/icons/no-icon.png"::: Connected GCP projects |
2121

2222
## Defender CSPM plan options
2323

0 commit comments

Comments
 (0)