Skip to content

Commit 4b26a18

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-troubleshoot-owner-remove
2 parents 61742b1 + e7116c9 commit 4b26a18

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

articles/app-service/overview-managed-identity.md

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -472,29 +472,34 @@ To learn more about configuring AzureServiceTokenProvider and the operations it
472472

473473
For Java applications and functions, the simplest way to work with a managed identity is through the [Azure SDK for Java](https://github.com/Azure/azure-sdk-for-java). This section shows you how to get started with the library in your code.
474474

475-
1. Add a reference to the [Azure SDK library](https://mvnrepository.com/artifact/com.microsoft.azure/azure). For Maven projects, you might add this snippet to the `dependencies` section of the project's POM file:
475+
1. Add a reference to the [Azure SDK library](https://mvnrepository.com/artifact/com.azure.resourcemanager/azure-resourcemanager). For Maven projects, you might add this snippet to the `dependencies` section of the project's POM file:
476476

477477
```xml
478478
<dependency>
479-
<groupId>com.microsoft.azure</groupId>
480-
<artifactId>azure</artifactId>
481-
<version>1.23.0</version>
479+
<groupId>com.azure.resourcemanager</groupId>
480+
<artifactId>azure-resourcemanager</artifactId>
481+
<version>2.10.0</version>
482482
</dependency>
483483
```
484484

485-
2. Use the `AppServiceMSICredentials` object for authentication. This example shows how this mechanism may be used for working with Azure Key Vault:
485+
2. Use the `ManagedIdentityCredential` object for authentication. This example shows how this mechanism may be used for working with Azure Key Vault:
486486

487487
```java
488-
import com.microsoft.azure.AzureEnvironment;
489-
import com.microsoft.azure.management.Azure;
490-
import com.microsoft.azure.management.keyvault.Vault
488+
import com.azure.core.management.AzureEnvironment;
489+
import com.azure.core.management.profile.AzureProfile;
490+
import com.azure.identity.ManagedIdentityCredential;
491+
import com.azure.identity.ManagedIdentityCredentialBuilder;
492+
import com.azure.resourcemanager.AzureResourceManager;
493+
import com.azure.resourcemanager.keyvault.models.Vault;
491494
//...
492-
Azure azure = Azure.authenticate(new AppServiceMSICredentials(AzureEnvironment.AZURE))
493-
.withSubscription(subscriptionId);
494-
Vault myKeyVault = azure.vaults().getByResourceGroup(resourceGroup, keyvaultName);
495+
AzureProfile azureProfile = new AzureProfile(AzureEnvironment.AZURE);
496+
ManagedIdentityCredential managedIdentityCredential = new ManagedIdentityCredentialBuilder().build();
497+
AzureResourceManager azure = AzureResourceManager.authenticate(managedIdentityCredential, azureProfile).withSubscription("subscription");
495498

496-
```
499+
Vault vault = azure.vaults().getByResourceGroup("resourceGroup", "keyVaultName");
497500

501+
```
502+
For more information on how to use the Azure SDK for Java, please refer to this [quickstart guide](https://aka.ms/azsdk/java/mgmt). To learn more about Azure Identiy and authentication and Managed Identity in general, please visit [this guide](https://github.com/Azure/azure-sdk-for-java/wiki/Azure-Identity-Examples#authenticating-a-user-assigned-managed-identity-with-defaultazurecredential)
498503

499504
## <a name="remove"></a>Remove an identity
500505

@@ -527,4 +532,4 @@ Update-AzFunctionApp -Name $functionAppName -ResourceGroupName $resourceGroupNam
527532
- [Call Microsoft Graph securely using a managed identity](scenario-secure-app-access-microsoft-graph-as-app.md)
528533
- [Connect securely to services with Key Vault secrets](tutorial-connect-msi-key-vault.md)
529534

530-
[Microsoft.Azure.Services.AppAuthentication reference]: /dotnet/api/overview/azure/service-to-service-authentication
535+
[Microsoft.Azure.Services.AppAuthentication reference]: /dotnet/api/overview/azure/service-to-service-authentication

articles/azure-cache-for-redis/cache-how-to-scale.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ No, your cache name and keys are unchanged during a scaling operation.
152152
- When you scale a **Standard** cache to a different size or to a **Premium** cache, one of the replicas is shut down and reprovisioned to the new size and the data transferred over, and then the other replica does a failover before it's reprovisioned, similar to the process that occurs during a failure of one of the cache nodes.
153153
- When you scale out a clustered cache, new shards are provisioned and added to the Redis server cluster. Data is then resharded across all shards.
154154
- When you scale in a clustered cache, data is first resharded and then cluster size is reduced to required shards.
155+
- In some cases, such as scaling or migrating your cache to a different cluster, the underlying IP address of the cache can change. The DNS records for the cache changes and is transparent to most applications. However, if you use an IP address to configure the connection to your cache, or to configure NSGs, or firewalls allowing traffic to the cache, your application might have trouble connecting sometime after that the DNS record updates.
155156

156157
### Will I lose data from my cache during scaling?
157158

articles/azure-cache-for-redis/quickstart-create-redis-enterprise.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ The Azure Cache for Redis Enterprise tiers provide fully integrated and managed
1616
* Enterprise, which uses volatile memory (DRAM) on a virtual machine to store data
1717
* Enterprise Flash, which uses both volatile and non-volatile memory (NVMe or SSD) to store data.
1818

19+
Both Enterprise and Enterprise Flash support open-source Redis 6 and some new features that aren't yet available in the Basic, Standard, or Premium tiers. The supported features include some Redis modules that enable additional features like search, bloom filters, and time series.
20+
1921
## Prerequisites
2022

2123
You'll need an Azure subscription before you begin. If you don't have one, create an [account](https://azure.microsoft.com/). For more information, see [special considerations for Enterprise tiers](cache-overview.md#special-considerations-for-enterprise-tiers).

articles/virtual-desktop/autoscale-scaling-plan.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ To create and assign the custom role to your subscription with the Azure portal:
111111
"Microsoft.DesktopVirtualization/hostpools/sessionhosts/usersessions/delete"
112112
"Microsoft.DesktopVirtualization/hostpools/sessionhosts/usersessions/read"
113113
"Microsoft.DesktopVirtualization/hostpools/sessionhosts/usersessions/sendMessage/action"
114-
"Microsoft.DesktopVirtualization/hostpools/sessionhosts/usersessions/read"
115114
```
116115
117116
5. When you're finished, select **Ok**.

includes/disk-storage-zrs-limitations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ ZRS for managed disks have the following restrictions:
1414

1515
- Only supported with premium solid-state drives (SSD) and standard SSDs.
1616
- Currently available only in the West US 2, West Europe, North Europe, and France Central regions.
17-
- Can't currently be used with Azure Backup or Azure Site Recovery.
17+
- Can't currently be used with Azure Site Recovery.

0 commit comments

Comments
 (0)