Skip to content

Commit 2d384a8

Browse files
authored
Merge pull request #211091 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 113676b + 9bdd741 commit 2d384a8

File tree

10 files changed

+24
-19
lines changed

10 files changed

+24
-19
lines changed

articles/azure-arc/data/create-sql-managed-instance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ az sql mi-arc create -n sqldemo --storage-class-backups mybackups --k8s-namespac
4646
### [Directly connected mode](#tab/directly)
4747

4848
```azurecli
49-
az sql mi-arc create --name <name> --resource-group <group> --location <Azure location> -–subscription <subscription> --custom-location <custom-location> --storage-class-backups <RWX capable storageclass>
49+
az sql mi-arc create --name <name> --resource-group <group> -–subscription <subscription> --custom-location <custom-location> --storage-class-backups <RWX capable storageclass>
5050
```
5151

5252
Example:
5353

5454
```azurecli
55-
az sql mi-arc create --name sqldemo --resource-group rg --location uswest2 -–subscription xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --custom-location private-location --storage-class-backups mybackups
55+
az sql mi-arc create --name sqldemo --resource-group rg -–subscription xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --custom-location private-location --storage-class-backups mybackups
5656
```
5757

5858
---

articles/azure-resource-manager/bicep/quickstart-create-bicep-use-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This quickstart guides you through the steps to create a [Bicep file](overview.m
1515

1616
- Azure Subscription. If you don't have an Azure subscription, [create a free account](https://azure.microsoft.com/free/) before you begin.
1717
- Visual Studio version 17.3.0 preview 3 or newer. See [Visual Studio Preview](https://visualstudio.microsoft.com/vs/preview/).
18-
- Visual Studio Bicep extension. See [Visual Studio Marketplace](https://marketplace.visualstudio.com/).
18+
- Visual Studio Bicep extension. See [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.visualstudiobicep).
1919
- Bicep file deployment requires either the latest [Azure CLI](/cli/azure/) or the latest [Azure PowerShell module](/powershell/azure/new-azureps-module-az).
2020

2121
## Add resource snippet

articles/cloud-shell/troubleshooting.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ In order to **export** the user settings Cloud Shell saves for you such as prefe
161161
Bash:
162162

163163
```
164-
token="Bearer $(curl http://localhost:50342/oauth2/token --data "resource=https://management.azure.com/" -H Metadata:true -s | jq -r ".access_token")"
165-
curl https://management.azure.com/providers/Microsoft.Portal/usersettings/cloudconsole?api-version=2017-12-01-preview -H Authorization:"$token" -s | jq
164+
token="Bearer $(curl http://localhost:50342/oauth2/token --data "resource=https://management.azure.com/" -H Metadata:true -s | jq -r ".accessToken")"
165+
curl https://management.azure.com/providers/Microsoft.Portal/usersettings/cloudconsole?api-version=2017-12-01-preview -H Authorization:"Bearer $token" -s | jq
166166
```
167167

168168
PowerShell:
@@ -185,8 +185,8 @@ In order to **delete** your user settings Cloud Shell saves for you such as pref
185185
Bash:
186186

187187
```
188-
token=(az account get-access-token --resource "https://management.azure.com/" | jq -r ".access_token")
189-
curl -X DELETE https://management.azure.com/providers/Microsoft.Portal/usersettings/cloudconsole?api-version=2017-12-01-preview -H Authorization:"$token"
188+
token=$(az account get-access-token --resource "https://management.azure.com/" | jq -r ".accessToken")
189+
curl -X DELETE https://management.azure.com/providers/Microsoft.Portal/usersettings/cloudconsole?api-version=2017-12-01-preview -H Authorization:"Bearer $token"
190190
```
191191

192192
PowerShell:

articles/data-factory/connector-dynamics-crm-office-365.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ For Dynamics 365 specifically, the following application types are supported:
5858
- Dynamics 365 for Field Service
5959
- Dynamics 365 for Project Service Automation
6060
- Dynamics 365 for Marketing
61+
6162
This connector doesn't support other application types like Finance, Operations, and Talent.
6263

6364
>[!TIP]

articles/defender-for-cloud/quickstart-onboard-aws.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ The following IAM permissions are needed to discover AWS resources:
377377
| GuardDute | `guardduty:DescribeOrganizationConfiguration` <br> `guardduty:DescribePublishingDestination` <br> `guardduty:List*` |
378378
| IAM | `iam:Generate*` <br> `iam:Get*` <br> `iam:List*` <br> `iam:Simulate*` |
379379
| KMS | `kms:Describe*` <br> `kms:List*` |
380-
| LAMDBA | `lambda:GetPolicy` <br> `lambda:List*` |
380+
| LAMBDA | `lambda:GetPolicy` <br> `lambda:List*` |
381381
| Network firewall | `network-firewall:DescribeFirewall` <br> `network-firewall:DescribeFirewallPolicy` <br> `network-firewall:DescribeLoggingConfiguration` <br> `network-firewall:DescribeResourcePolicy` <br> `network-firewall:DescribeRuleGroup` <br> `network-firewall:DescribeRuleGroupMetadata` <br> `network-firewall:ListFirewallPolicies` <br> `network-firewall:ListFirewalls` <br> `network-firewall:ListRuleGroups` <br> `network-firewall:ListTagsForResource` |
382382
| RDS | `rds:Describe*` <br> `rds:List*` |
383383
| RedShift | `redshift:Describe*` |

articles/openshift/howto-gpu-workloads.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ARO supports the following GPU workers:
4545
* NC4as T4 v3
4646
* NC8as T4 v3
4747
* NC16as T4 v3
48-
* NC464as T4 v3
48+
* NC64as T4 v3
4949

5050
> [!NOTE]
5151
> When requesting quota, remember that Azure is per core. To request a single NC4as T4 v3 node, you will need to request quota in groups of 4. If you wish to request an NC16as T4 v3, you will need to request quota of 16.

articles/openshift/support-policies-v4.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ Azure Red Hat OpenShift 4 supports node instances on the following virtual machi
6161
|G*|Standard_G5|32|448|
6262
|G|Standard_GS5|32|448|
6363
|Mms|Standard_M128ms|128|3892|
64-
|NC4asT4v3|Standard_NC4as_T4_v3|4|28|
65-
|NC8asT4v3|Standard_NC8as_T4_v3|8|56|
66-
|NC16asT4v3|Standard_NC16as_T4_v3|16|110|
67-
|NC64asT4v3|Standard_NC64as_T4_v3|64|440|
6864

6965
\*Does not support Premium_LRS OS Disk, StandardSSD_LRS is used instead
7066

@@ -117,7 +113,6 @@ Azure Red Hat OpenShift 4 supports node instances on the following virtual machi
117113
|Mms|Standard_M128ms|128|3892|
118114

119115
### Storage optimized
120-
121116
|Series|Size|vCPU|Memory: GiB|
122117
|-|-|-|-|
123118
|L4s|Standard_L4s|4|32|
@@ -130,11 +125,19 @@ Azure Red Hat OpenShift 4 supports node instances on the following virtual machi
130125
|L48s_v2|Standard_L48s_v2|32|384|
131126
|L64s_v2|Standard_L48s_v2|64|512|
132127

128+
### GPU workload
129+
|Series|Size|vCPU|Memory: GiB|
130+
|-|-|-|-|
131+
|NC4asT4v3|Standard_NC4as_T4_v3|4|28|
132+
|NC8asT4v3|Standard_NC8as_T4_v3|8|56|
133+
|NC16asT4v3|Standard_NC16as_T4_v3|16|110|
134+
|NC64asT4v3|Standard_NC64as_T4_v3|64|440|
135+
133136
### Memory and storage optimized
134137

135138
|Series|Size|vCPU|Memory: GiB|
136139
|-|-|-|-|
137140
|G*|Standard_G5|32|448|
138141
|G|Standard_GS5|32|448|
139142

140-
\*Does not support Premium_LRS OS Disk, StandardSSD_LRS is used instead
143+
\*Does not support Premium_LRS OS Disk, StandardSSD_LRS is used instead

articles/sentinel/normalization-develop-parsers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ In many cases, the original value extracted needs to be normalized. For example,
203203

204204
Also, ensuring that parser output fields matches type defined in the schema is critical for parsers to work. For example, you may need to convert a string representing date and time to a datetime field. Functions such as `todatetime` and `tohex` are helpful in these cases.
205205

206-
For example, the original unique event ID may be sent as an integer, but ASIM requires the value to be a string, to ensure broad compatibility among data sources. Therefore, when assigning the source field use `extned` and `tostring` instead of `project-rename`:
206+
For example, the original unique event ID may be sent as an integer, but ASIM requires the value to be a string, to ensure broad compatibility among data sources. Therefore, when assigning the source field use `extend` and `tostring` instead of `project-rename`:
207207

208208
```KQL
209209
| extend EventOriginalUid = tostring(ReportId),
@@ -500,4 +500,4 @@ Learn more about the ASIM in general:
500500
- Watch the [Deep Dive Webinar on Microsoft Sentinel Normalizing Parsers and Normalized Content](https://www.youtube.com/watch?v=zaqblyjQW6k) or review the [slides](https://1drv.ms/b/s!AnEPjr8tHcNmjGtoRPQ2XYe3wQDz?e=R3dWeM)
501501
- [Advanced Security Information Model (ASIM) overview](normalization.md)
502502
- [Advanced Security Information Model (ASIM) schemas](normalization-about-schemas.md)
503-
- [Advanced Security Information Model (ASIM) content](normalization-content.md)
503+
- [Advanced Security Information Model (ASIM) content](normalization-content.md)

articles/storage/blobs/upgrade-to-data-lake-storage-gen2-how-to.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Upgrade Azure Blob Storage with Azure Data Lake Storage Gen2 capabilities | Microsoft Docs
3-
description: Shows you how to use Resource Manager templates to upgrade from Azure Blob storage to Data Lake Storage.
3+
description: Shows you how to use Resource Manager templates to upgrade from Azure Blob Storage to Data Lake Storage.
44
author: normesta
55
ms.service: storage
66
ms.topic: conceptual

articles/virtual-machines/workloads/sap/get-started.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ In the SAP workload documentation space, you can find the following areas:
6666

6767
## Change Log
6868

69+
- September 14, 2022 Release of updated SAP on Oracle guide with new and updated content [Azure Virtual Machines Oracle DBMS deployment for SAP workload](./dbms_guide_oracle.md)
6970
- September 8, 2022: Change in [SAP HANA scale-out HSR with Pacemaker on Azure VMs on SLES](./sap-hana-high-availability-scale-out-hsr-suse.md) to add instructions for deploying /hana/shared (only) on NFS on Azure Files
7071
- September 6, 2022: Add managed identity for pacemaker fence agent [Set up Pacemaker on SUSE Linux Enterprise Server (SLES) in Azure](high-availability-guide-suse-pacemaker.md) on SLES and [Setting up Pacemaker on RHEL in Azure](high-availability-guide-rhel-pacemaker.md) RHEL
7172
- August 22, 2022: Release of cost optimization scenario [Deploy PAS and AAS with SAP NetWeaver HA cluster](high-availability-guide-rhel-with-dialog-instance.md) on RHEL
@@ -201,4 +202,4 @@ In the SAP workload documentation space, you can find the following areas:
201202
- June 23, 2020: Changes to [Azure Virtual Machines planning and implementation for SAP NetWeaver](./planning-guide.md) guide and introduction of [Azure Storage types for SAP workload](./planning-guide-storage.md) guide
202203
- June 22, 2020: Add installation steps for new VM Extension for SAP to the [Deployment Guide](deployment-guide.md)
203204
- June 16, 2020: Change in [Public endpoint connectivity for VMs using Azure Standard ILB in SAP HA scenarios](./high-availability-guide-standard-load-balancer-outbound-connections.md) to add a link to SUSE Public Cloud Infrastructure 101 documentation
204-
- June 10, 2020: Adding new HLI SKUs into [Available SKUs for HLI](./hana-available-skus.md) and [SAP HANA (Large Instances) storage architecture](./hana-storage-architecture.md)
205+
- June 10, 2020: Adding new HLI SKUs into [Available SKUs for HLI](./hana-available-skus.md) and [SAP HANA (Large Instances) storage architecture](./hana-storage-architecture.md)

0 commit comments

Comments
 (0)