Skip to content

Commit 6df42a1

Browse files
authored
Merge pull request #199727 from MicrosoftDocs/main
5/27 PM Publish
2 parents 179b956 + 2b30bb8 commit 6df42a1

File tree

236 files changed

+4601
-3483
lines changed

Some content is hidden

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

236 files changed

+4601
-3483
lines changed

articles/active-directory/develop/mobile-app-quickstart-portal-android.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ms.custom: aaddev, identityplatformtop40, "scenarios:getting-started", "language
2424
>
2525
> We apologize for the inconvenience and appreciate your patience while we work to get this resolved.
2626
27-
> [!div renderon="portal" class="sxs-lookup display-on-portal"]
27+
> [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
2828
> # Quickstart: Sign in users and call the Microsoft Graph API from an Android app
2929
>
3030
> In this quickstart, you download and run a code sample that demonstrates how an Android application can sign in users and get an access token to call the Microsoft Graph API.
@@ -42,15 +42,17 @@ ms.custom: aaddev, identityplatformtop40, "scenarios:getting-started", "language
4242
> ### Step 1: Configure your application in the Azure portal
4343
> For the code sample in this quickstart to work, add a **Redirect URI** compatible with the Auth broker.
4444
>
45-
> <button id="makechanges" class="nextstepaction" class="configure-app-button"> Make this change for me </button>
45+
> <button id="makechanges" class="nextstepaction configure-app-button"> Make these changes for me </button>
4646
>
4747
> > [!div id="appconfigured" class="alert alert-info"]
4848
> > ![Already configured](media/quickstart-v2-android/green-check.png) Your application is configured with these attributes
4949
>
5050
> ### Step 2: Download the project
5151
>
5252
> Run the project using Android Studio.
53-
> <a href='https://github.com/Azure-Samples/ms-identity-android-java/archive/master.zip'><button id="downloadsample" class="download-sample-button">Download the code sample</button></a>
53+
>
54+
> > [!div class="nextstepaction"]
55+
> > <button id="downloadsample" class="download-sample-button">Download the code sample</button>
5456
>
5557
>
5658
> ### Step 3: Your app is configured and ready to run
@@ -484,4 +486,4 @@ ms.custom: aaddev, identityplatformtop40, "scenarios:getting-started", "language
484486
> Move on to the Android tutorial in which you build an Android app that gets an access token from the Microsoft identity platform and uses it to call the Microsoft Graph API.
485487
>
486488
> > [!div class="nextstepaction"]
487-
> > [Tutorial: Sign in users and call the Microsoft Graph from an Android application](tutorial-v2-android.md)
489+
> > [Tutorial: Sign in users and call the Microsoft Graph from an Android application](tutorial-v2-android.md)

articles/active-directory/develop/mobile-app-quickstart-portal-ios.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ms.custom: aaddev, identityplatformtop40, "scenarios:getting-started", "language
2626
>
2727
> We apologize for the inconvenience and appreciate your patience while we work to get this resolved.
2828
29-
> [!div renderon="portal" class="sxs-lookup display-on-portal"]
29+
> [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
3030
> # Quickstart: Sign in users and call the Microsoft Graph API from an iOS or macOS app
3131
>
3232
> In this quickstart, you download and run a code sample that demonstrates how a native iOS or macOS application can sign in users and get an access token to call the Microsoft Graph API.
@@ -47,16 +47,18 @@ ms.custom: aaddev, identityplatformtop40, "scenarios:getting-started", "language
4747
> #### Step 1: Configure your application
4848
> For the code sample in this quickstart to work, add a **Redirect URI** compatible with the Auth broker.
4949
>
50-
> <button id="makechanges" class="nextstepaction" class="configure-app-button"> Make this change for me </button>
50+
> <button id="makechanges" class="nextstepaction configure-app-button"> Make these changes for me </button>
5151
>
5252
> > [!div id="appconfigured" class="alert alert-info"]
5353
> > ![Already configured](media/quickstart-v2-ios/green-check.png) Your application is configured with these attributes
5454
>
5555
> #### Step 2: Download the sample project
5656
>
57-
> <a href='https://github.com/Azure-Samples/active-directory-ios-swift-native-v2/archive/master.zip'><button id="downloadsample" class="downloadsample_ios">Download the code sample for iOS</button></a>
58-
>
59-
> <a href='https://github.com/Azure-Samples/active-directory-macOS-swift-native-v2/archive/master.zip'><button id="downloadsample" class="downloadsample_ios">Download the code sample for macOS</button></a>
57+
> > [!div class="nextstepaction"]
58+
> > <button id="downloadsample_ios" class="download-sample-button">Download the code sample for iOS</button>
59+
>
60+
> > [!div class="nextstepaction"]
61+
> > <button id="downloadsample_macos" class="download-sample-button">Download the code sample for macOS</button>
6062
>
6163
> #### Step 3: Install dependencies
6264
>
@@ -238,4 +240,4 @@ ms.custom: aaddev, identityplatformtop40, "scenarios:getting-started", "language
238240
> Move on to the step-by-step tutorial in which you build an iOS or macOS app that gets an access token from the Microsoft identity platform and uses it to call the Microsoft Graph API.
239241
>
240242
> > [!div class="nextstepaction"]
241-
> > [Tutorial: Sign in users and call Microsoft Graph from an iOS or macOS app](tutorial-v2-ios.md)
243+
> > [Tutorial: Sign in users and call Microsoft Graph from an iOS or macOS app](tutorial-v2-ios.md)

articles/active-directory/develop/refresh-tokens.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ Before reading through this article, it's recommended that you go through the fo
2929

3030
## Refresh token lifetime
3131

32-
Refresh tokens have a longer lifetime than access tokens. The default lifetime for the tokens is 90 days and they replace themselves with a fresh token upon every use. As such, whenever a refresh token is used to acquire a new access token, a new refresh token is also issued. The Microsoft identity platform doesn't revoke old refresh tokens when used to fetch new access tokens. Securely delete the old refresh token after acquiring a new one. Refresh tokens need to be stored safely like access tokens or application credentials.
32+
Refresh tokens have a longer lifetime than access tokens. The default lifetime for the refresh tokens is 24 hours for [single page apps](reference-third-party-cookies-spas.md) and 90 days for all other scenarios. Refresh tokens replace themselves with a fresh token upon every use. The Microsoft identity platform doesn't revoke old refresh tokens when used to fetch new access tokens. Securely delete the old refresh token after acquiring a new one. Refresh tokens need to be stored safely like access tokens or application credentials.
33+
34+
>[!IMPORTANT]
35+
> Refresh tokens sent to a redirect URI registered as `spa` expire after 24 hours. Additional refresh tokens acquired using the initial refresh token carry over that expiration time, so apps must be prepared to rerun the authorization code flow using an interactive authentication to get a new refresh token every 24 hours. Users do not have to enter their credentials and usually don't even see any related user experience, just a reload of your application. The browser must visit the log-in page in a top-level frame to show the login session. This is due to [privacy features in browsers that block third party cookies](reference-third-party-cookies-spas.md).
3336
3437
## Refresh token expiration
3538

articles/active-directory/privileged-identity-management/pim-resource-roles-configure-alerts.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.topic: how-to
1010
ms.tgt_pltfrm: na
1111
ms.workload: identity
1212
ms.subservice: pim
13-
ms.date: 05/24/2022
13+
ms.date: 10/07/2021
1414
ms.author: curtand
1515
ms.reviewer: shaunliu
1616
ms.custom: pim
@@ -31,15 +31,11 @@ Select an alert to see a report that lists the users or roles that triggered the
3131

3232
## Alerts
3333

34-
Alert | Severity | Trigger | Recommendation
35-
--- | --- | --- | ---
36-
**Too many owners assigned to a resource** |Medium |Too many users have the owner role. |Review the users in the list and reassign some to less privileged roles.
37-
**Too many permanent owners assigned to a resource** |Medium |Too many users are permanently assigned to a role. |Review the users in the list and re-assign some to require activation for role use.
38-
**Duplicate role created** |Medium |Multiple roles have the same criteria. |Use only one of these roles.
39-
**Roles are being assigned outside of Privileged Identity Management (Preview)** | High | A role is managed directly through the Azure IAM resource blade or the Azure Resource Manager API | Review the users in the list and remove them from privileged roles assigned outside of Privilege Identity Management.
40-
41-
> [!Note]
42-
> During the public preview of the **Roles are being assigned outside of Privileged Identity Management (Preview)** alert, Microsoft supports only permissions that are assigned at the subscription level.
34+
| Alert | Severity | Trigger | Recommendation |
35+
| --- | --- | --- | --- |
36+
| **Too many owners assigned to a resource** |Medium |Too many users have the owner role. |Review the users in the list and reassign some to less privileged roles. |
37+
| **Too many permanent owners assigned to a resource** |Medium |Too many users are permanently assigned to a role. |Review the users in the list and re-assign some to require activation for role use. |
38+
| **Duplicate role created** |Medium |Multiple roles have the same criteria. |Use only one of these roles. |
4339

4440
### Severity
4541

articles/aks/howto-deploy-java-liberty-app-with-postgresql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The steps in this section guide you through creating an Azure Database for Postg
8181
Use the [az postgres server create](/cli/azure/postgres/server#az-postgres-server-create) command to create the DB server. The following example creates a DB server named *youruniquedbname*. Make sure *youruniqueacrname* is unique within Azure.
8282

8383
> [!TIP]
84-
> To help ensure a globally unique name, prepend a disambiguation string such as your intitials and the MMDD of today's date.
84+
> To help ensure a globally unique name, prepend a disambiguation string such as your initials and the MMDD of today's date.
8585
8686

8787
```bash
@@ -153,7 +153,7 @@ In directory *liberty/config*, the *server.xml* is used to configure the DB conn
153153

154154
After the offer is successfully deployed, an AKS cluster will be generated automatically. The AKS cluster is configured to connect to the ACR. Before we get started with the application, we need to extract the namespace configured for the AKS.
155155

156-
1. Run following command to print the current deployment file, using the `appDeploymentTemplateYamlEncoded` you saved above. The output contains all the variables we need.
156+
1. Run the following command to print the current deployment file, using the `appDeploymentTemplateYamlEncoded` you saved above. The output contains all the variables we need.
157157

158158
```bash
159159
echo <appDeploymentTemplateYamlEncoded> | base64 -d

articles/aks/web-app-routing.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@ The Web Application Routing solution makes it easy to access applications that a
2323
The add-on deploys four components: an [nginx ingress controller][nginx], [Secrets Store CSI Driver][csi-driver], [Open Service Mesh (OSM)][osm], and [External-DNS][external-dns] controller.
2424

2525
- **Nginx ingress Controller**: The ingress controller exposed to the internet.
26-
- **External-dns**: Watches for Kubernetes Ingress resources and creates DNS A records in the cluster-specific DNS zone.
26+
- **External-DNS controller**: Watches for Kubernetes Ingress resources and creates DNS A records in the cluster-specific DNS zone.
2727
- **CSI driver**: Connector used to communicate with keyvault to retrieve SSL certificates for ingress controller.
2828
- **OSM**: A lightweight, extensible, cloud native service mesh that allows users to uniformly manage, secure, and get out-of-the-box observability features for highly dynamic microservice environments.
29-
- **External-DNS controller**: Watches for Kubernetes Ingress resources and creates DNS A records in the cluster-specific DNS zone.
3029

3130
## Prerequisites
3231

3332
- An Azure subscription. If you don't have an Azure subscription, you can create a [free account](https://azure.microsoft.com/free).
3433
- [Azure CLI installed](/cli/azure/install-azure-cli).
34+
- An Azure Key Vault containing any application certificates.
35+
- A DNS solution.
3536

3637
### Install the `aks-preview` Azure CLI extension
3738

@@ -66,8 +67,6 @@ You can also enable Web Application Routing on an existing AKS cluster using the
6667
az aks enable-addons --resource-group myResourceGroup --name myAKSCluster --addons web_application_routing
6768
```
6869

69-
After the cluster is deployed or updated, use the [az aks show][az-aks-show] command to retrieve the DNS zone name.
70-
7170
## Connect to your AKS cluster
7271

7372
To connect to the Kubernetes cluster from your local computer, you use [kubectl][kubectl], the Kubernetes command-line client.
@@ -78,10 +77,10 @@ If you use the Azure Cloud Shell, `kubectl` is already installed. You can also i
7877
az aks install-cli
7978
```
8079

81-
To configure `kubectl` to connect to your Kubernetes cluster, use the [az aks get-credentials][az-aks-get-credentials] command. The following example gets credentials for the AKS cluster named *MyAKSCluster* in the *MyResourceGroup*:
80+
To configure `kubectl` to connect to your Kubernetes cluster, use the [az aks get-credentials][az-aks-get-credentials] command. The following example gets credentials for the AKS cluster named *myAKSCluster* in *myResourceGroup*:
8281

8382
```azurecli
84-
az aks get-credentials --resource-group MyResourceGroup --name MyAKSCluster
83+
az aks get-credentials --resource-group myResourceGroup --name myAKSCluster
8584
```
8685

8786
## Create the application namespace
@@ -110,6 +109,12 @@ Copy the identity's object ID:
110109

111110
### Grant access to Azure Key Vault
112111

112+
Obtain the vault URI for your Azure Key Vault:
113+
114+
```azurecli
115+
az keyvault show --resource-group myResourceGroup --name myapp-contoso
116+
```
117+
113118
Grant `GET` permissions for Web Application Routing to retrieve certificates from Azure Key Vault:
114119

115120
```azurecli
@@ -128,7 +133,7 @@ annotations:
128133
129134
These annotations in the service manifest would direct Web Application Routing to create an ingress servicing `myapp.contoso.com` connected to the keyvault `myapp-contoso`.
130135

131-
Create a file named **samples-web-app-routing.yaml** and copy in the following YAML. On line 29-31, update `<MY_HOSTNAME>` and `<MY_KEYVAULT_URI>` with the DNS zone name collected in the previous step of this article.
136+
Create a file named **samples-web-app-routing.yaml** and copy in the following YAML. On line 29-31, update `<MY_HOSTNAME>` with your DNS host name and `<MY_KEYVAULT_URI>` with the vault URI collected in the previous step of this article.
132137

133138
```yaml
134139
apiVersion: apps/v1
@@ -175,19 +180,17 @@ Use the [kubectl apply][kubectl-apply] command to create the resources.
175180
kubectl apply -f samples-web-app-routing.yaml -n hello-web-app-routing
176181
```
177182

178-
The following example shows the created resources:
183+
The following example output shows the created resources:
179184

180185
```bash
181-
$ kubectl apply -f samples-web-app-routing.yaml -n hello-web-app-routing
182-
183186
deployment.apps/aks-helloworld created
184187
service/aks-helloworld created
185188
```
186189

187190
## Verify the managed ingress was created
188191

189192
```bash
190-
$ kubectl get ingress -n hello-web-app-routing -n hello-web-app-routing
193+
$ kubectl get ingress -n hello-web-app-routing
191194
```
192195

193196
Open a web browser to *<MY_HOSTNAME>*, for example *myapp.contoso.com* and verify you see the demo application. The application may take a few minutes to appear.
@@ -208,8 +211,6 @@ az aks disable-addons --addons web_application_routing --name myAKSCluster --re
208211

209212
When the Web Application Routing add-on is disabled, some Kubernetes resources may remain in the cluster. These resources include *configMaps* and *secrets*, and are created in the *app-routing-system* namespace. To maintain a clean cluster, you may want to remove these resources.
210213

211-
Look for *addon-web-application-routing* resources using the following [kubectl get][kubectl-get] commands:
212-
213214
## Clean up
214215

215216
Remove the associated Kubernetes objects created in this article using `kubectl delete`.
@@ -249,4 +250,4 @@ service "aks-helloworld" deleted
249250
[kubectl-delete]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#delete
250251
[kubectl-logs]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#logs
251252
[ingress]: https://kubernetes.io/docs/concepts/services-networking/ingress/
252-
[ingress-resource]: https://kubernetes.io/docs/concepts/services-networking/ingress/#the-ingress-resource
253+
[ingress-resource]: https://kubernetes.io/docs/concepts/services-networking/ingress/#the-ingress-resource

articles/availability-zones/az-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn about regions and availability zones and how they work to hel
44
author: awysza
55
ms.service: azure
66
ms.topic: conceptual
7-
ms.date: 03/30/2022
7+
ms.date: 05/30/2022
88
ms.author: rarco
99
ms.reviewer: cynthn
1010
ms.custom: references_regions

articles/availability-zones/az-region.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn what services are supported by availability zones and underst
44
author: awysza
55
ms.service: azure
66
ms.topic: conceptual
7-
ms.date: 03/25/2022
7+
ms.date: 05/30/2022
88
ms.author: rarco
99
ms.reviewer: cynthn
1010
ms.custom: references_regions

articles/availability-zones/includes/availability-zone-regions-include.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
author: awysza
55
ms.service: azure
66
ms.topic: include
7-
ms.date: 05/18/2022
7+
ms.date: 05/30/2022
88
ms.author: rarco
99
ms.custom: include file
1010
---
@@ -20,7 +20,5 @@ Azure provides the most extensive global footprint of any cloud provider and is
2020
| East US 2 | UK South | | Southeast Asia |
2121
| South Central US | West Europe | | East Asia |
2222
| US Gov Virginia | Sweden Central | | China North 3 |
23-
| West US 2 | Switzerland North* | | |
23+
| West US 2 | Switzerland North | | |
2424
| West US 3 | | | |
25-
26-
\* To learn more about Availability Zones and available services support in these regions, contact your Microsoft sales or customer representative. For the upcoming regions that will support Availability Zones, see [Azure geographies](https://azure.microsoft.com/global-infrastructure/geographies/).

articles/azure-arc/data/active-directory-introduction.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ ms.topic: how-to
1212
---
1313

1414
# Azure Arc-enabled SQL Managed Instance with Active Directory authentication
15+
1516
Azure Arc-enabled data services support Active Directory (AD) for Identity and Access Management (IAM). The Arc-enabled SQL Managed Instance uses an existing on-premises Active Directory (AD) domain for authentication.
1617

18+
[!INCLUDE [azure-arc-data-preview](../../../includes/azure-arc-data-preview.md)]
19+
1720
This article describes how to enable Azure Arc-enabled SQL Managed Instance with Active Directory (AD) Authentication. The article demonstrates two possible AD integration modes:
1821
- Customer-managed keytab (CMK)
1922
- System-managed keytab (SMK)

0 commit comments

Comments
 (0)