Skip to content

Commit e85a232

Browse files
authored
Merge pull request #262664 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 9f2fed0 + 55a5128 commit e85a232

10 files changed

+20
-18
lines changed

articles/aks/access-control-managed-azure-ad.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ ms.custom: devx-track-azurecli
88

99
# Cluster access control with AKS-managed Microsoft Entra integration
1010

11-
When you integrate Microsoft Entra ID with your AKS cluster, you can use [Conditional Access][aad-conditional-access] or Privileged Identity Management (PIM) for just-in-time requests to control access to your cluster. This article shows you how to enable Conditional Access and PIM on your AKS clusters.
11+
When you integrate Microsoft Entra ID with your AKS cluster, you can use [Conditional Access][aad-conditional-access] or [Privileged Identity Management (PIM)][pim-configure] for just-in-time requests to control access to your cluster. This article shows you how to enable Conditional Access and PIM on your AKS clusters.
1212

1313
> [!NOTE]
14-
> Microsoft Entra Conditional Access and Privileged Identity Management are Microsoft Entra ID P1 or P2 capabilities requiring a Premium P2 SKU. For more on Microsoft Entra ID SKUs, see the [pricing guide][aad-pricing].
14+
> Microsoft Entra Conditional Access and Privileged Identity Management (PIM) are Microsoft Entra ID P1, P2 or Governance capabilities requiring a Premium P2 SKU. For more on Microsoft Entra ID licenses and SKUs, see [Microsoft Entra ID Governance licensing fundamentals][licensing-fundamentals] and [pricing guide][aad-pricing].
1515
1616
## Before you begin
1717

@@ -169,6 +169,8 @@ Make sure the admin of the security group has given your account an *Active* ass
169169

170170
<!-- LINKS - Internal -->
171171
[aad-conditional-access]: ../active-directory/conditional-access/overview.md
172+
[pim-configure]: /entra/id-governance/privileged-identity-management/pim-configure
173+
[licensing-fundamentals]: /entra/id-governance/licensing-fundamentals
172174
[az-aks-get-credentials]: /cli/azure/aks#az_aks_get_credentials
173175
[az-role-assignment-create]: /cli/azure/role/assignment#az_role_assignment_create
174176
[aad-assignments]: ../active-directory/privileged-identity-management/groups-assign-member-owner.md#assign-an-owner-or-member-of-a-group

articles/aks/azure-ad-rbac.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ AKSDEV_ID=$(az ad user create \
134134
--display-name "AKS Dev" \
135135
--user-principal-name $AAD_DEV_UPN \
136136
--password $AAD_DEV_PW \
137-
--query objectId -o tsv)
137+
--query id -o tsv)
138138
```
139139

140140
2. Add the user to the *appdev* group created in the previous section using the [`az ad group member add`][az-ad-group-member-add] command.
@@ -163,7 +163,7 @@ AKSSRE_ID=$(az ad user create \
163163
--display-name "AKS SRE" \
164164
--user-principal-name $AAD_SRE_UPN \
165165
--password $AAD_SRE_PW \
166-
--query objectId -o tsv)
166+
--query id -o tsv)
167167
168168
# Add the user to the opssre Azure AD group
169169
az ad group member add --group opssre --member-id $AKSSRE_ID

articles/aks/azure-csi-files-storage-provision.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ A persistent volume claim (PVC) uses the storage class object to dynamically pro
150150

151151
```output
152152
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
153-
my-azurefile Bound pvc-8436e62e-a0d9-11e5-8521-5a8664dc0477 10Gi RWX my-azurefile 5m
153+
my-azurefile Bound pvc-8436e62e-a0d9-11e5-8521-5a8664dc0477 100Gi RWX my-azurefile 5m
154154
```
155155

156156
### Use the persistent volume

articles/aks/planned-maintenance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ author: nickomang
1414

1515
Your AKS cluster has regular maintenance performed on it automatically. There are two types of regular maintenance - AKS initiated and those that you initiate. Planned Maintenance feature allows you to run both types of maintenance in a cadence of your choice thereby minimizing any workload impact.
1616

17-
AKS intiated maintenance refers to the AKS releases. These releases are weekly rounds of fixes and feature and component updates that affect your clusters. The type of maintenance that you initiate regularly are [cluster auto-upgrades][aks-upgrade] and [Node OS automatic security updates][node-image-auto-upgrade].
17+
AKS initiated maintenance refers to the AKS releases. These releases are weekly rounds of fixes and feature and component updates that affect your clusters. The type of maintenance that you initiate regularly are [cluster auto-upgrades][aks-upgrade] and [Node OS automatic security updates][node-image-auto-upgrade].
1818

1919
There are currently three available configuration types: `default`, `aksManagedAutoUpgradeSchedule`, `aksManagedNodeOSUpgradeSchedule`:
2020

articles/azure-functions/durable/durable-functions-orchestrations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ public static async Task<object> RunOrchestrator(
431431

432432
[FunctionName("CourseRecommendations")]
433433
public static async Task<object> Mapper(
434-
[ActivityTrigger] (string Major, int UniversityYear) inputs, FunctionContext executionContext)
434+
[ActivityTrigger] (string Major, int UniversityYear) studentInfo, FunctionContext executionContext)
435435
{
436436
// retrieve and return course recommendations by major and university year
437437
return new

articles/azure-functions/functions-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ To use an identity-based connection for `AzureWebJobsStorage`, configure the fol
316316

317317
[Common properties for identity-based connections](#common-properties-for-identity-based-connections) may also be set as well.
318318

319-
If you're configuring `AzureWebJobsStorage` using a storage account that uses the default DNS suffix and service name for global Azure, following the `https://<accountName>.blob/queue/file/table.core.windows.net` format, you can instead set `AzureWebJobsStorage__accountName` to the name of your storage account. The endpoints for each storage service are inferred for this account. This doesn't work when the storage account is in a sovereign cloud or has a custom DNS.
319+
If you're configuring `AzureWebJobsStorage` using a storage account that uses the default DNS suffix and service name for global Azure, following the `https://<accountName>.[blob|queue|file|table].core.windows.net` format, you can instead set `AzureWebJobsStorage__accountName` to the name of your storage account. The endpoints for each storage service are inferred for this account. This doesn't work when the storage account is in a sovereign cloud or has a custom DNS.
320320

321321
| Setting | Description | Example value |
322322
|-----------------------------------------------------|--------------------------------------------|------------------------------------------------|

articles/container-registry/container-registry-troubleshoot-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Related links:
6565

6666
* [Configure rules to access an Azure container registry behind a firewall](container-registry-firewall-access-rules.md)
6767
* [HTTP/HTTPS proxy configuration](https://docs.docker.com/config/daemon/systemd/#httphttps-proxy)
68-
* [Geo-replicationin Azure Container Registry](container-registry-geo-replication.md)
68+
* [Geo-replication in Azure Container Registry](container-registry-geo-replication.md)
6969
* [Monitor Azure Container Registry](monitor-service.md)
7070

7171
### Configure public access to registry

articles/cosmos-db/nosql/quickstart-dotnet.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -310,15 +310,15 @@ The code to access database resources is in the `GenerateQueryDataAsync` method
310310
311311
Use the <xref:Microsoft.Azure.Cosmos.CosmosClient.GetDatabase%2A> method to return a reference to the specified database.
312312
313-
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Pages/Index.razor" id="get_database":::
313+
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Services/CosmosDbService.cs" id="get_database":::
314314
315315
### Get a container
316316
317317
The code to access container resources is also in the `GenerateQueryDataAsync` method.
318318
319319
The <xref:Microsoft.Azure.Cosmos.Database.GetContainer%2A> returns a reference to the specified container.
320320
321-
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Pages/Index.razor" id="get_container":::
321+
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Services/CosmosDbService.cs" id="get_container":::
322322
323323
### Create an item
324324
@@ -328,24 +328,24 @@ The easiest way to create a new item in a container is to first build a C# class
328328
329329
In the `GenerateQueryDataAsync` method, create an item in the container by calling <xref:Microsoft.Azure.Cosmos.Container.UpsertItemAsync%2A>.
330330
331-
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Pages/Index.razor" id="create_item":::
331+
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Services/CosmosDbService.cs" id="create_item":::
332332
333333
### Read an item
334334
335335
In Azure Cosmos DB, you can perform a point read operation by using both the unique identifier (`id`) and partition key fields. In the SDK, call <xref:Microsoft.Azure.Cosmos.Container.ReadItemAsync%2A> passing in both values to return a deserialized instance of your C# type.
336336
Still in the `GenerateQueryDataAsync` method, use `ReadItemAsync<Product>` to serialize the item using the `Product` type.
337337
338-
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Pages/Index.razor" id="read_item":::
338+
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Services/CosmosDbService.cs" id="read_item":::
339339
340340
### Query items
341341
342342
After you insert an item, you can run a query to get all items that match a specific filter. This example runs the SQL query: `SELECT * FROM products p WHERE p.category = "gear-surf-surfboards"`. This example uses the QueryDefinition type and a parameterized query expression for the partition key filter. Once the query is defined, call <xref:Microsoft.Azure.Cosmos.Container.GetItemQueryIterator%2A> to get a result iterator that manages the pages of results. In the example, the query logic is also in the `GenerateQueryDataAsync` method.
343343
344-
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Pages/Index.razor" id="query_items":::
344+
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Services/CosmosDbService.cs" id="query_items":::
345345
346346
Then, use a combination of `while` and `foreach` loops to retrieve pages of results and then iterate over the individual items.
347347
348-
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Pages/Index.razor" id="parse_results":::
348+
:::code language="csharp" source="~/cosmos-db-nosql-dotnet-quickstart/src/web/Services/CosmosDbService.cs" id="parse_results":::
349349
350350
## Clean up resources
351351

articles/dms/pre-reqs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Azure Database Migration Service prerequisites that are common across all suppor
8787
> Set-AzRoleDefinition -Role $aRole
8888
> }
8989
>
90-
> function Update-DmsConributorRole() {
90+
> function Update-DmsContributorRole() {
9191
> $aRole = Get-AzRoleDefinition "Azure Database Migration Contributor"
9292
> $aRole.Actions = $writerActions
9393
> $aRole.NotActions = @()
@@ -98,7 +98,7 @@ Azure Database Migration Service prerequisites that are common across all suppor
9898
> New-DmsReaderRole
9999
> New-DmsContributorRole
100100
> Update-DmsReaderRole
101-
> Update-DmsConributorRole
101+
> Update-DmsContributorRole
102102
> ```
103103
104104
## Prerequisites for migrating SQL Server to Azure SQL Database

articles/site-recovery/vmware-azure-tutorial-prepare-on-premises.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Create the account as follows:
5050
**Task** | **Role/Permissions** | **Details**
5151
--- | --- | ---
5252
**VM discovery** | At least a read-only user<br/><br/> Data Center object –> Propagate to Child Object, role=Read-only | User assigned at datacenter level, and has access to all the objects in the datacenter.<br/><br/> To restrict access, assign the **No access** role with the **Propagate to child** object, to the child objects (vSphere hosts, datastores, VMs and networks).
53-
**Full replication, failover, failback** | Create a role (Azure_Site_Recovery) with the required permissions, and then assign the role to a VMware user or group<br/><br/> Data Center object –> Propagate to Child Object, role=Azure_Site_Recovery<br/><br/> Datastore -> Allocate space, browse datastore, low-level file operations, remove file, update virtual machine files<br/><br/> Network -> Network assign<br/><br/> Resource -> Assign VM to resource pool, migrate powered off VM, migrate powered on VM<br/><br/> Tasks -> Create task, update task<br/><br/> Virtual machine -> Configuration<br/><br/> Virtual machine -> Interact -> answer question, device connection, configure CD media, configure floppy media, power off, power on, VMware tools install<br/><br/> Virtual machine -> Inventory -> Create, register, unregister<br/><br/> Virtual machine -> Provisioning -> Allow virtual machine download, allow virtual machine files upload<br/><br/> Virtual machine -> Snapshots -> Remove snapshots | User assigned at datacenter level, and has access to all the objects in the datacenter.<br/><br/> To restrict access, assign the **No access** role with the **Propagate to child** object, to the child objects (vSphere hosts, datastores, VMs and networks).
53+
**Full replication, failover, failback** | Create a role (Azure_Site_Recovery) with the required permissions, and then assign the role to a VMware user or group<br/><br/> Data Center object –> Propagate to Child Object, role=Azure_Site_Recovery<br/><br/> Datastore -> Allocate space, browse datastore, low-level file operations, remove file, update virtual machine files<br/><br/> Network -> Network assign<br/><br/> Resource -> Assign VM to resource pool, migrate powered off VM, migrate powered on VM<br/><br/> Tasks -> Create task, update task<br/><br/> Virtual machine -> Configuration<br/><br/> Virtual machine -> Interact -> answer question, device connection, configure CD media, configure floppy media, power off, power on, VMware tools install<br/><br/> Virtual machine -> Inventory -> Create, register, unregister<br/><br/> Virtual machine -> Provisioning -> Allow virtual machine download, allow virtual machine files upload<br/><br/> Virtual machine -> Snapshots -> Remove snapshots, Create snapshots | User assigned at datacenter level, and has access to all the objects in the datacenter.<br/><br/> To restrict access, assign the **No access** role with the **Propagate to child** object, to the child objects (vSphere hosts, datastores, VMs and networks).
5454

5555
## Prepare an account for Mobility service installation
5656

0 commit comments

Comments
 (0)