Skip to content

Commit 29075dc

Browse files
authored
Merge pull request #192741 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 39f0811 + 2bb07b1 commit 29075dc

File tree

1,061 files changed

+5072
-4654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,061 files changed

+5072
-4654
lines changed

.openpublishing.redirection.json

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6323,29 +6323,54 @@
63236323
"redirect_url": "/azure/azure-cache-for-redis/policy-reference",
63246324
"redirect_document_id": false
63256325
},
6326+
{
6327+
"source_path_from_root": "/articles/azure-cache-for-redis/scripts/cache-keys-ports.md",
6328+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
6329+
"redirect_document_id": false
6330+
},
63266331
{
63276332
"source_path_from_root": "/articles/redis-cache/scripts/cache-keys-ports.md",
6328-
"redirect_url": "/azure/azure-cache-for-redis/scripts/cache-keys-ports",
6333+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
6334+
"redirect_document_id": false
6335+
},
6336+
{
6337+
"source_path_from_root": "/articles/azure-cache-for-redis/scripts/create-cache.md",
6338+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
63296339
"redirect_document_id": false
63306340
},
63316341
{
63326342
"source_path_from_root": "/articles/redis-cache/scripts/create-cache.md",
6333-
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-cache",
6343+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
6344+
"redirect_document_id": false
6345+
},
6346+
{
6347+
"source_path_from_root": "/articles/azure-cache-for-redis/scripts/create-premium-cache-cluster.md",
6348+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-premium-cache-cluster",
63346349
"redirect_document_id": false
63356350
},
63366351
{
63376352
"source_path_from_root": "/articles/redis-cache/scripts/create-premium-cache-cluster.md",
6338-
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-premium-cache-cluster",
6353+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-premium-cache-cluster",
63396354
"redirect_document_id": false
63406355
},
63416356
{
63426357
"source_path_from_root": "/articles/redis-cache/scripts/delete-cache.md",
6343-
"redirect_url": "/azure/azure-cache-for-redis/scripts/delete-cache",
6358+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
6359+
"redirect_document_id": false
6360+
},
6361+
{
6362+
"source_path_from_root": "/articles/azure-cache-for-redis/scripts/delete-cache.md",
6363+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
63446364
"redirect_document_id": false
63456365
},
63466366
{
63476367
"source_path_from_root": "/articles/redis-cache/scripts/show-cache.md",
6348-
"redirect_url": "/azure/azure-cache-for-redis/scripts/show-cache",
6368+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
6369+
"redirect_document_id": false
6370+
},
6371+
{
6372+
"source_path_from_root": "/articles/azure-cache-for-redis/scripts/show-cache.md",
6373+
"redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
63496374
"redirect_document_id": false
63506375
},
63516376
{
@@ -15003,11 +15028,6 @@
1500315028
"redirect_url": "/azure/defender-for-iot/organizations/tutorial-qradar",
1500415029
"redirect_document_id": false
1500515030
},
15006-
{
15007-
"source_path_from_root": "/articles/iot-edge/how-to-devops-starter.md",
15008-
"redirect_url": "/azure/iot-edge/how-to-continuous-integration-continuous-deployment-classic/",
15009-
"redirect_document_id": false
15010-
},
1501115031
{
1501215032
"source_path_from_root": "/articles/ansible/index.yml",
1501315033
"redirect_url": "/azure/developer/ansible/",

appgw-waf-metrics-1-expanded.png

-108 KB
Binary file not shown.

appgw-waf-metrics-2-expanded.png

-93.5 KB
Binary file not shown.

appgw-waf-metrics-2.png

-55.6 KB
Binary file not shown.

articles/active-directory/devices/howto-vm-sign-in-azure-ad-linux.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ Azure Cloud Shell is a free, interactive shell that you can use to run the steps
134134

135135
If you choose to install and use the CLI locally, this article requires that you’re running the Azure CLI version 2.22.1 or later. Run `az --version` to find the version. If you need to install or upgrade, see the article Install Azure CLI.
136136

137-
1. Create a resource group with [az group create](/cli/azure/group#az_group_create).
138-
1. Create a VM with [az vm create](/cli/azure/vm#az_vm_create&preserve-view=true) using a supported distribution in a supported region.
139-
1. Install the Azure AD login VM extension with [az vm extension set](/cli/azure/vm/extension#az_vm_extension_set).
137+
1. Create a resource group with [az group create](/cli/azure/group#az-group-create).
138+
1. Create a VM with [az vm create](/cli/azure/vm#az-vm-create&preserve-view=true) using a supported distribution in a supported region.
139+
1. Install the Azure AD login VM extension with [az vm extension set](/cli/azure/vm/extension#az-vm-extension-set).
140140

141141
The following example deploys a VM and then installs the extension to enable Azure AD login for Linux VM. VM extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines.
142142

@@ -204,7 +204,7 @@ After a few moments, the security principal is assigned the role at the selected
204204

205205
### Using the Azure Cloud Shell experience
206206

207-
The following example uses [az role assignment create](/cli/azure/role/assignment#az_role_assignment_create) to assign the Virtual Machine Administrator Login role to the VM for your current Azure user. The username of your current Azure account is obtained with [az account show](/cli/azure/account#az_account_show), and the scope is set to the VM created in a previous step with [az vm show](/cli/azure/vm#az_vm_show). The scope could also be assigned at a resource group or subscription level, normal Azure RBAC inheritance permissions apply.
207+
The following example uses [az role assignment create](/cli/azure/role/assignment#az-role-assignment-create) to assign the Virtual Machine Administrator Login role to the VM for your current Azure user. The username of your current Azure account is obtained with [az account show](/cli/azure/account#az-account-show), and the scope is set to the VM created in a previous step with [az vm show](/cli/azure/vm#az-vm-show). The scope could also be assigned at a resource group or subscription level, normal Azure RBAC inheritance permissions apply.
208208

209209
```azurecli-interactive
210210
username=$(az account show --query user.name --output tsv)
@@ -217,7 +217,7 @@ az role assignment create \
217217
```
218218

219219
> [!NOTE]
220-
> If your Azure AD domain and logon username domain do not match, you must specify the object ID of your user account with the `--assignee-object-id`, not just the username for `--assignee`. You can obtain the object ID for your user account with [az ad user list](/cli/azure/ad/user#az_ad_user_list).
220+
> If your Azure AD domain and logon username domain do not match, you must specify the object ID of your user account with the `--assignee-object-id`, not just the username for `--assignee`. You can obtain the object ID for your user account with [az ad user list](/cli/azure/ad/user#az-ad-user-list).
221221
222222
For more information on how to use Azure RBAC to manage access to your Azure subscription resources, see the article [Steps to assign an Azure role](../../role-based-access-control/role-assignments-steps.md).
223223

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ Azure Cloud Shell is a free, interactive shell that you can use to run the steps
109109

110110
If you choose to install and use the CLI locally, this article requires that you are running the Azure CLI version 2.0.31 or later. Run az --version to find the version. If you need to install or upgrade, see the article [Install Azure CLI](/cli/azure/install-azure-cli).
111111

112-
1. Create a resource group with [az group create](/cli/azure/group#az_group_create).
113-
1. Create a VM with [az vm create](/cli/azure/vm#az_vm_create) using a supported distribution in a supported region.
112+
1. Create a resource group with [az group create](/cli/azure/group#az-group-create).
113+
1. Create a VM with [az vm create](/cli/azure/vm#az-vm-create) using a supported distribution in a supported region.
114114
1. Install the Azure AD login VM extension.
115115

116116
The following example deploys a VM named myVM that uses Win2019Datacenter, into a resource group named myResourceGroup, in the southcentralus region. In the following examples, you can provide your own resource group and VM names as needed.
@@ -132,7 +132,7 @@ az vm create \
132132
133133
It takes a few minutes to create the VM and supporting resources.
134134

135-
Finally, install the Azure AD login VM extension to enable Azure AD login for Windows VM. VM extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. Use [az vm extension](/cli/azure/vm/extension#az_vm_extension_set) set to install the AADLoginForWindows extension on the VM named `myVM` in the `myResourceGroup` resource group:
135+
Finally, install the Azure AD login VM extension to enable Azure AD login for Windows VM. VM extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. Use [az vm extension](/cli/azure/vm/extension#az-vm-extension-set) set to install the AADLoginForWindows extension on the VM named `myVM` in the `myResourceGroup` resource group:
136136

137137
> [!NOTE]
138138
> You can install AADLoginForWindows extension on an existing Windows Server 2019 or Windows 10 1809 and later VM to enable it for Azure AD authentication. An example of AZ CLI is shown below.
@@ -184,7 +184,7 @@ To configure role assignments for your Azure AD enabled Windows Server 2019 Data
184184

185185
### Using the Azure Cloud Shell experience
186186

187-
The following example uses [az role assignment create](/cli/azure/role/assignment#az_role_assignment_create) to assign the Virtual Machine Administrator Login role to the VM for your current Azure user. The username of your active Azure account is obtained with [az account show](/cli/azure/account#az_account_show), and the scope is set to the VM created in a previous step with [az vm show](/cli/azure/vm#az_vm_show). The scope could also be assigned at a resource group or subscription level, and normal Azure RBAC inheritance permissions apply. For more information, see [Log in to a Linux virtual machine in Azure using Azure Active Directory authentication](../../virtual-machines/linux/login-using-aad.md).
187+
The following example uses [az role assignment create](/cli/azure/role/assignment#az-role-assignment-create) to assign the Virtual Machine Administrator Login role to the VM for your current Azure user. The username of your active Azure account is obtained with [az account show](/cli/azure/account#az-account-show), and the scope is set to the VM created in a previous step with [az vm show](/cli/azure/vm#az-vm-show). The scope could also be assigned at a resource group or subscription level, and normal Azure RBAC inheritance permissions apply. For more information, see [Log in to a Linux virtual machine in Azure using Azure Active Directory authentication](../../virtual-machines/linux/login-using-aad.md).
188188

189189
``` AzureCLI
190190
$username=$(az account show --query user.name --output tsv)
@@ -197,7 +197,7 @@ az role assignment create \
197197
```
198198

199199
> [!NOTE]
200-
> If your AAD domain and logon username domain do not match, you must specify the object ID of your user account with the `--assignee-object-id`, not just the username for `--assignee`. You can obtain the object ID for your user account with [az ad user list](/cli/azure/ad/user#az_ad_user_list).
200+
> If your AAD domain and logon username domain do not match, you must specify the object ID of your user account with the `--assignee-object-id`, not just the username for `--assignee`. You can obtain the object ID for your user account with [az ad user list](/cli/azure/ad/user#az-ad-user-list).
201201
202202
For more information on how to use Azure RBAC to manage access to your Azure subscription resources, see the following articles:
203203

articles/active-directory/fundamentals/active-directory-how-to-find-tenant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ az account list
5555
az account tenant list
5656
```
5757

58-
For more information, see [az login](/cli/azure/reference-index#az_login) command reference, [az account](/cli/azure/account) command reference, or [az account tenant](/cli/azure/account/tenant) command reference.
58+
For more information, see [az login](/cli/azure/reference-index#az-login) command reference, [az account](/cli/azure/account) command reference, or [az account tenant](/cli/azure/account/tenant) command reference.
5959

6060

6161
For Microsoft 365 CLI, use the cmdlet **tenant id** as shown in the following example:

articles/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ In this article, you learn how to create, list, delete, or assign a role to a us
113113

114114
To create a user-assigned managed identity, your account needs the [Managed Identity Contributor](../../role-based-access-control/built-in-roles.md#managed-identity-contributor) role assignment.
115115

116-
Use the [az identity create](/cli/azure/identity#az_identity_create) command to create a user-assigned managed identity. The `-g` parameter specifies the resource group where to create the user-assigned managed identity. The `-n` parameter specifies its name. Replace the `<RESOURCE GROUP>` and `<USER ASSIGNED IDENTITY NAME>` parameter values with your own values.
116+
Use the [az identity create](/cli/azure/identity#az-identity-create) command to create a user-assigned managed identity. The `-g` parameter specifies the resource group where to create the user-assigned managed identity. The `-n` parameter specifies its name. Replace the `<RESOURCE GROUP>` and `<USER ASSIGNED IDENTITY NAME>` parameter values with your own values.
117117

118118
[!INCLUDE [ua-character-limit](~/includes/managed-identity-ua-character-limits.md)]
119119

@@ -124,7 +124,7 @@ az identity create -g <RESOURCE GROUP> -n <USER ASSIGNED IDENTITY NAME>
124124

125125
To list or read a user-assigned managed identity, your account needs the [Managed Identity Operator](../../role-based-access-control/built-in-roles.md#managed-identity-operator) or [Managed Identity Contributor](../../role-based-access-control/built-in-roles.md#managed-identity-contributor) role assignment.
126126

127-
To list user-assigned managed identities, use the [az identity list](/cli/azure/identity#az_identity_list) command. Replace the `<RESOURCE GROUP>` value with your own value.
127+
To list user-assigned managed identities, use the [az identity list](/cli/azure/identity#az-identity-list) command. Replace the `<RESOURCE GROUP>` value with your own value.
128128

129129
```azurecli-interactive
130130
az identity list -g <RESOURCE GROUP>
@@ -138,7 +138,7 @@ In the JSON response, user-assigned managed identities have the `"Microsoft.Mana
138138

139139
To delete a user-assigned managed identity, your account needs the [Managed Identity Contributor](../../role-based-access-control/built-in-roles.md#managed-identity-contributor) role assignment.
140140

141-
To delete a user-assigned managed identity, use the [az identity delete](/cli/azure/identity#az_identity_delete) command. The -n parameter specifies its name. The -g parameter specifies the resource group where the user-assigned managed identity was created. Replace the `<USER ASSIGNED IDENTITY NAME>` and `<RESOURCE GROUP>` parameter values with your own values.
141+
To delete a user-assigned managed identity, use the [az identity delete](/cli/azure/identity#az-identity-delete) command. The -n parameter specifies its name. The -g parameter specifies the resource group where the user-assigned managed identity was created. Replace the `<USER ASSIGNED IDENTITY NAME>` and `<RESOURCE GROUP>` parameter values with your own values.
142142

143143
```azurecli-interactive
144144
az identity delete -n <USER ASSIGNED IDENTITY NAME> -g <RESOURCE GROUP>
@@ -333,7 +333,7 @@ In this article, you learn how to create, list, and delete a user-assigned manag
333333
az login
334334
```
335335
336-
1. Obtain an access token by using [az account get-access-token](/cli/azure/account#az_account_get_access_token).
336+
1. Obtain an access token by using [az account get-access-token](/cli/azure/account#az-account-get-access-token).
337337
338338
```azurecli-interactive
339339
az account get-access-token

articles/active-directory/managed-identities-azure-resources/howto-assign-access-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you don't already have an Azure account, [sign up for a free account](https:/
3636

3737
After you've enabled managed identity on an Azure resource, such as an [Azure virtual machine](qs-configure-cli-windows-vm.md) or [Azure virtual machine scale set](qs-configure-cli-windows-vmss.md):
3838

39-
1. In this example, we are giving an Azure virtual machine access to a storage account. First we use [az resource list](/cli/azure/resource/#az_resource_list) to get the service principal for the virtual machine named myVM:
39+
1. In this example, we are giving an Azure virtual machine access to a storage account. First we use [az resource list](/cli/azure/resource/#az-resource-list) to get the service principal for the virtual machine named myVM:
4040

4141
```azurecli-interactive
4242
spID=$(az resource list -n myVM --query [*].identity.principalId --out tsv)
@@ -47,7 +47,7 @@ After you've enabled managed identity on an Azure resource, such as an [Azure vi
4747
spID=$(az resource list -n DevTestVMSS --query [*].identity.principalId --out tsv)
4848
```
4949

50-
1. Once you have the service principal ID, use [az role assignment create](/cli/azure/role/assignment#az_role_assignment_create) to give the virtual machine or virtual machine scale set "Reader" access to a storage account called "myStorageAcct":
50+
1. Once you have the service principal ID, use [az role assignment create](/cli/azure/role/assignment#az-role-assignment-create) to give the virtual machine or virtual machine scale set "Reader" access to a storage account called "myStorageAcct":
5151

5252
```azurecli-interactive
5353
az role assignment create --assignee $spID --role 'Reader' --scope /subscriptions/<mySubscriptionID>/resourceGroups/<myResourceGroup>/providers/Microsoft.Storage/storageAccounts/myStorageAcct

articles/active-directory/managed-identities-azure-resources/msi-tutorial-linux-vm-access-arm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ In this tutorial, you learn how to:
3636
- You also need a Linux Virtual machine. If you need to create a virtual machine for this tutorial, you can follow the article titled [Create a Linux virtual machine with the Azure portal](../../virtual-machines/linux/quick-create-portal.md#create-virtual-machine)
3737
- To run the example scripts, you have two options:
3838
- Use the [Azure Cloud Shell](../../cloud-shell/overview.md), which you can open using the **Try It** button on the top-right corner of code blocks.
39-
- Run scripts locally by installing the latest version of the [Azure CLI](/cli/azure/install-azure-cli), then sign in to Azure using [az login](/cli/azure/reference-index#az_login).
39+
- Run scripts locally by installing the latest version of the [Azure CLI](/cli/azure/install-azure-cli), then sign in to Azure using [az login](/cli/azure/reference-index#az-login).
4040

4141
## Create a user-assigned managed identity
4242

43-
Create a user-assigned managed identity using [az identity create](/cli/azure/identity#az_identity_create). The `-g` parameter specifies the resource group where the user-assigned managed identity is created, and the `-n` parameter specifies its name. Be sure to replace the `<RESOURCE GROUP>` and `<UAMI NAME>` parameter values with your own values:
43+
Create a user-assigned managed identity using [az identity create](/cli/azure/identity#az-identity-create). The `-g` parameter specifies the resource group where the user-assigned managed identity is created, and the `-n` parameter specifies its name. Be sure to replace the `<RESOURCE GROUP>` and `<UAMI NAME>` parameter values with your own values:
4444

4545
[!INCLUDE [ua-character-limit](~/includes/managed-identity-ua-character-limits.md)]
4646

0 commit comments

Comments
 (0)