Skip to content

Commit 82537cc

Browse files
normestanormesta
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into normesta-reg-updates-5
2 parents 3ee7bcb + c4371fa commit 82537cc

File tree

65 files changed

+1586
-1498
lines changed

Some content is hidden

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

65 files changed

+1586
-1498
lines changed

‎.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,11 @@
855855
"redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
856856
"redirect_document_id": false
857857
},
858+
{
859+
"source_path": "articles/cognitive-services/LUIS/luis-resources-faq.md",
860+
"redirect_url": "/azure/cognitive-services/LUIS/troubleshooting",
861+
"redirect_document_id": false
862+
},
858863
{
859864
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-bot-csharp-appinsights.md",
860865
"redirect_url": "/azure/cognitive-services/LUIS/luis-csharp-tutorial-bf-v4",

‎articles/active-directory/manage-apps/howto-saml-token-encryption.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: conceptual
16-
ms.date: 02/06/2019
16+
ms.date: 03/13/2020
1717
ms.author: mimart
1818
ms.reviewer: paulgarn
1919
ms.collection: M365-identity-device-management
2020
---
21-
# How to: Configure Azure AD SAML token encryption (Preview)
21+
# How to: Configure Azure AD SAML token encryption
2222

2323
> [!NOTE]
2424
> Token encryption is an Azure Active Directory (Azure AD) premium feature. To learn more about Azure AD editions, features, and pricing, see [Azure AD pricing](https://azure.microsoft.com/pricing/details/active-directory/).
@@ -118,9 +118,6 @@ When you configure a keyCredential using Graph, PowerShell, or in the applicatio
118118
119119
### To configure token encryption using PowerShell
120120
121-
This functionality is coming soon.
122-
123-
<!--
124121
1. Use the latest Azure AD PowerShell module to connect to your tenant.
125122
126123
1. Set the token encryption settings using the **[Set-AzureApplication](https://docs.microsoft.com/powershell/module/azuread/set-azureadapplication?view=azureadps-2.0-preview)** command.
@@ -137,8 +134,6 @@ This functionality is coming soon.
137134
$app.TokenEncryptionKeyId
138135
```
139136
140-
-->
141-
142137
### To configure token encryption using the application manifest
143138
144139
1. From the Azure portal, go to **Azure Active Directory > App registrations**.

‎articles/active-directory/manage-apps/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
href: manage-certificates-for-federated-single-sign-on.md
6969
- name: Tenant restrictions
7070
href: tenant-restrictions.md
71-
- name: Configure SAML token encryption (Preview)
71+
- name: Configure SAML token encryption
7272
href: howto-saml-token-encryption.md
7373
- name: End-user portals
7474
href: end-user-experiences.md

‎articles/active-directory/managed-identities-azure-resources/media/services-support-managed-identities/check.png

412 Bytes
Loading

‎articles/active-directory/managed-identities-azure-resources/services-support-managed-identities.md

Lines changed: 66 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: List of services that support managed identities for Azure resource
44
services: active-directory
55
author: MarkusVi
66
ms.author: markvi
7-
ms.date: 02/13/2020
7+
ms.date: 03/13/2020
88
ms.topic: conceptual
99
ms.service: active-directory
1010
ms.subservice: msi
@@ -26,9 +26,9 @@ The following Azure services support managed identities for Azure resources:
2626
### Azure Virtual Machines
2727

2828
| Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
29-
| --- | --- | --- | --- | --- |
30-
| System assigned | Available | Preview | Preview | Preview |
31-
| User assigned | Available | Preview | Preview | Preview |
29+
| --- | :-: | :-: | :-: | :-: |
30+
| System assigned | ![Available][check] | Preview | Preview | Preview |
31+
| User assigned | ![Available][check] | Preview | Preview | Preview |
3232

3333
Refer to the following list to configure managed identity for Azure Virtual Machines (in regions where available):
3434

@@ -41,9 +41,9 @@ Refer to the following list to configure managed identity for Azure Virtual Mach
4141
### Azure Virtual Machine Scale Sets
4242

4343
|Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
44-
| --- | --- | --- | --- | --- |
45-
| System assigned | Available | Preview | Preview | Preview |
46-
| User assigned | Available | Preview | Preview | Preview |
44+
| --- | :-: | :-: | :-: | :-: |
45+
| System assigned | ![Available][check] | Preview | Preview | Preview |
46+
| User assigned | ![Available][check] | Preview | Preview | Preview |
4747

4848
Refer to the following list to configure managed identity for Azure Virtual Machine Scale Sets (in regions where available):
4949

@@ -56,9 +56,9 @@ Refer to the following list to configure managed identity for Azure Virtual Mach
5656
### Azure App Service
5757

5858
| Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
59-
| --- | --- | --- | --- | --- |
60-
| System assigned | Available | Available | Available | Available |
61-
| User assigned | Available | Not available | Not available | Not available |
59+
| --- | :-: | :-: | :-: | :-: |
60+
| System assigned | ![Available][check] | ![Available][check] | ![Available][check] | ![Available][check] |
61+
| User assigned | ![Available][check] | Not available | Not available | Not available |
6262

6363
Refer to the following list to configure managed identity for Azure App Service (in regions where available):
6464

@@ -70,9 +70,9 @@ Refer to the following list to configure managed identity for Azure App Service
7070
### Azure Blueprints
7171

7272
|Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
73-
| --- | --- | --- | --- | --- |
74-
| System assigned | Available | Available | Not available | Not available |
75-
| User assigned | Available | Available | Not available | Not available |
73+
| --- | :-: | :-: | :-: | :-: |
74+
| System assigned | ![Available][check] | ![Available][check] | Not available | Not available |
75+
| User assigned | ![Available][check] | ![Available][check] | Not available | Not available |
7676

7777
Refer to the following list to use a managed identity with [Azure Blueprints](../../governance/blueprints/overview.md):
7878

@@ -82,9 +82,9 @@ Refer to the following list to use a managed identity with [Azure Blueprints](..
8282
### Azure Functions
8383

8484
Managed identity type |All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
85-
| --- | --- | --- | --- | --- |
86-
| System assigned | Available | Available | Available | Available |
87-
| User assigned | Available | Not available | Not available | Not available |
85+
| --- | :-: | :-: | :-: | :-: |
86+
| System assigned | ![Available][check] | ![Available][check] | ![Available][check] | ![Available][check] |
87+
| User assigned | ![Available][check] | Not available | Not available | Not available |
8888

8989
Refer to the following list to configure managed identity for Azure Functions (in regions where available):
9090

@@ -96,9 +96,10 @@ Refer to the following list to configure managed identity for Azure Functions (i
9696
### Azure Logic Apps
9797

9898
Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
99-
| --- | --- | --- | --- | --- |
100-
| System assigned | Preview | Preview | Not available | Preview |
101-
| User assigned | Not available | Not available | Not available | Not available |
99+
| --- | :-: | :-: | :-: | :-: |
100+
| System assigned | ![Available][check] | ![Available][check] | Not available | ![Available][check] |
101+
| User assigned | ![Available][check] | ![Available][check] | Not available | ![Available][check] |
102+
102103

103104
Refer to the following list to configure managed identity for Azure Logic Apps (in regions where available):
104105

@@ -108,8 +109,8 @@ Refer to the following list to configure managed identity for Azure Logic Apps (
108109
### Azure Data Factory V2
109110

110111
Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
111-
| --- | --- | --- | --- | --- |
112-
| System assigned | Available | Available | Not available | Available |
112+
| --- | :-: | :-: | :-: | :-: |
113+
| System assigned | ![Available][check] | ![Available][check] | Not available | ![Available][check] |
113114
| User assigned | Not available | Not available | Not available | Not available |
114115

115116
Refer to the following list to configure managed identity for Azure Data Factory V2 (in regions where available):
@@ -122,8 +123,8 @@ Refer to the following list to configure managed identity for Azure Data Factory
122123
### Azure API Management
123124

124125
Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
125-
| --- | --- | --- | --- | --- |
126-
| System assigned | Available | Available | Not available | Not available |
126+
| --- | :-: | :-: | :-: | :-: |
127+
| System assigned | ![Available][check] | ![Available][check] | Not available | Not available |
127128
| User assigned | Not available | Not available | Not available | Not available |
128129

129130
Refer to the following list to configure managed identity for Azure API Management (in regions where available):
@@ -133,7 +134,7 @@ Refer to the following list to configure managed identity for Azure API Manageme
133134
### Azure Container Instances
134135

135136
Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
136-
| --- | --- | --- | --- | --- |
137+
| --- | :-: | :-: | :-: | :-: |
137138
| System assigned | Linux: Preview<br>Windows: Not available | Not available | Not available | Not available |
138139
| User assigned | Linux: Preview<br>Windows: Not available | Not available | Not available | Not available |
139140

@@ -146,8 +147,8 @@ Refer to the following list to configure managed identity for Azure Container In
146147
### Azure Container Registry Tasks
147148

148149
Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
149-
| --- | --- | --- | --- | --- |
150-
| System assigned | Available | Not available | Not available | Not available |
150+
| --- | :-: | :-: | :-: | :-: |
151+
| System assigned | ![Available][check] | Not available | Not available | Not available |
151152
| User assigned | Preview | Not available | Not available | Not available |
152153

153154
Refer to the following list to configure managed identity for Azure Container Registry Tasks (in regions where available):
@@ -158,9 +159,9 @@ Refer to the following list to configure managed identity for Azure Container Re
158159
[Managed Identity for Service Fabric Applications](https://docs.microsoft.com/azure/service-fabric/concepts-managed-identity) is in Preview and available in all regions.
159160

160161
Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
161-
| --- | --- | --- | --- | --- |
162-
| System assigned | Available | Not Available | Not Available | not Available |
163-
| User assigned | Available | Not Available | Not Available |Not Available |
162+
| --- | :-: | :-: | :-: | :-: |
163+
| System assigned | ![Available][check] | Not Available | Not Available | not Available |
164+
| User assigned | ![Available][check] | Not Available | Not Available |Not Available |
164165

165166
Refer to the following list to configure managed identity for Azure Service Fabric applications in all regions:
166167
- [Azure Resource Manager template](https://github.com/Azure-Samples/service-fabric-managed-identity/tree/anmenard-docs)
@@ -174,59 +175,59 @@ The following services support Azure AD authentication, and have been tested wit
174175
Refer to the following list to configure access to Azure Resource Manager:
175176

176177
- [Assign access via Azure portal](howto-assign-access-portal.md)
177-
- [Assign access via Powershell](howto-assign-access-powershell.md)
178+
- [Assign access via PowerShell](howto-assign-access-powershell.md)
178179
- [Assign access via Azure CLI](howto-assign-access-CLI.md)
179180
- [Assign access via Azure Resource Manager template](../../role-based-access-control/role-assignments-template.md)
180181

181182
| Cloud | Resource ID | Status |
182-
|--------|------------|--------|
183-
| Azure Global | `https://management.azure.com/`| Available |
184-
| Azure Government | `https://management.usgovcloudapi.net/` | Available |
185-
| Azure Germany | `https://management.microsoftazure.de/` | Available |
186-
| Azure China 21Vianet | `https://management.chinacloudapi.cn` | Available |
183+
|--------|------------|:-:|
184+
| Azure Global | `https://management.azure.com/`| ![Available][check] |
185+
| Azure Government | `https://management.usgovcloudapi.net/` | ![Available][check] |
186+
| Azure Germany | `https://management.microsoftazure.de/` | ![Available][check] |
187+
| Azure China 21Vianet | `https://management.chinacloudapi.cn` | ![Available][check] |
187188

188189
### Azure Key Vault
189190

190191
| Cloud | Resource ID | Status |
191-
|--------|------------|--------|
192-
| Azure Global | `https://vault.azure.net`| Available |
193-
| Azure Government | `https://vault.usgovcloudapi.net` | Available |
194-
| Azure Germany | `https://vault.microsoftazure.de` | Available |
195-
| Azure China 21Vianet | `https://vault.azure.cn` | Available |
192+
|--------|------------|:-:|
193+
| Azure Global | `https://vault.azure.net`| ![Available][check] |
194+
| Azure Government | `https://vault.usgovcloudapi.net` | ![Available][check] |
195+
| Azure Germany | `https://vault.microsoftazure.de` | ![Available][check] |
196+
| Azure China 21Vianet | `https://vault.azure.cn` | ![Available][check] |
196197

197198
### Azure Data Lake
198199

199200
| Cloud | Resource ID | Status |
200-
|--------|------------|--------|
201-
| Azure Global | `https://datalake.azure.net/` | Available |
201+
|--------|------------|:-:|
202+
| Azure Global | `https://datalake.azure.net/` | ![Available][check] |
202203
| Azure Government | | Not Available |
203204
| Azure Germany | | Not Available |
204205
| Azure China 21Vianet | | Not Available |
205206

206207
### Azure SQL
207208

208209
| Cloud | Resource ID | Status |
209-
|--------|------------|--------|
210-
| Azure Global | `https://database.windows.net/` | Available |
211-
| Azure Government | `https://database.usgovcloudapi.net/` | Available |
212-
| Azure Germany | `https://database.cloudapi.de/` | Available |
213-
| Azure China 21Vianet | `https://database.chinacloudapi.cn/` | Available |
210+
|--------|------------|:-:|
211+
| Azure Global | `https://database.windows.net/` | ![Available][check] |
212+
| Azure Government | `https://database.usgovcloudapi.net/` | ![Available][check] |
213+
| Azure Germany | `https://database.cloudapi.de/` | ![Available][check] |
214+
| Azure China 21Vianet | `https://database.chinacloudapi.cn/` | ![Available][check] |
214215

215216
### Azure Event Hubs
216217

217218
| Cloud | Resource ID | Status |
218-
|--------|------------|--------|
219-
| Azure Global | `https://eventhubs.azure.net` | Available |
219+
|--------|------------|:-:|
220+
| Azure Global | `https://eventhubs.azure.net` | ![Available][check] |
220221
| Azure Government | | Not Available |
221222
| Azure Germany | | Not Available |
222223
| Azure China 21Vianet | | Not Available |
223224

224225
### Azure Service Bus
225226

226227
| Cloud | Resource ID | Status |
227-
|--------|------------|--------|
228-
| Azure Global | `https://servicebus.azure.net` | Available |
229-
| Azure Government | | Available |
228+
|--------|------------|:-:|
229+
| Azure Global | `https://servicebus.azure.net` | ![Available][check] |
230+
| Azure Government | | ![Available][check] |
230231
| Azure Germany | | Not Available |
231232
| Azure China 21Vianet | | Not Available |
232233

@@ -241,11 +242,11 @@ Refer to the following list to configure access to Azure Resource Manager:
241242
### Azure Storage blobs and queues
242243

243244
| Cloud | Resource ID | Status |
244-
|--------|------------|--------|
245-
| Azure Global | `https://storage.azure.com/` <br /><br />`https://<account>.blob.core.windows.net` <br /><br />`https://<account>.queue.core.windows.net` | Available |
246-
| Azure Government | `https://storage.azure.com/`<br /><br />`https://<account>.blob.core.usgovcloudapi.net` <br /><br />`https://<account>.queue.core.usgovcloudapi.net` | Available |
247-
| Azure Germany | `https://storage.azure.com/`<br /><br />`https://<account>.blob.core.cloudapi.de` <br /><br />`https://<account>.queue.core.cloudapi.de` | Available |
248-
| Azure China 21Vianet | `https://storage.azure.com/`<br /><br />`https://<account>.blob.core.chinacloudapi.cn` <br /><br />`https://<account>.queue.core.chinacloudapi.cn` | Available |
245+
|--------|------------|:-:|
246+
| Azure Global | `https://storage.azure.com/` <br /><br />`https://<account>.blob.core.windows.net` <br /><br />`https://<account>.queue.core.windows.net` | ![Available][check] |
247+
| Azure Government | `https://storage.azure.com/`<br /><br />`https://<account>.blob.core.usgovcloudapi.net` <br /><br />`https://<account>.queue.core.usgovcloudapi.net` | ![Available][check] |
248+
| Azure Germany | `https://storage.azure.com/`<br /><br />`https://<account>.blob.core.cloudapi.de` <br /><br />`https://<account>.queue.core.cloudapi.de` | ![Available][check] |
249+
| Azure China 21Vianet | `https://storage.azure.com/`<br /><br />`https://<account>.blob.core.chinacloudapi.cn` <br /><br />`https://<account>.queue.core.chinacloudapi.cn` | ![Available][check] |
249250

250251

251252

@@ -259,8 +260,11 @@ Refer to the following list to configure access to Azure Resource Manager:
259260
### Azure Analysis Services
260261

261262
| Cloud | Resource ID | Status |
262-
|--------|------------|--------|
263-
| Azure Global | `https://*.asazure.windows.net` | Available |
264-
| Azure Government | `https://*.asazure.usgovcloudapi.net` | Available |
265-
| Azure Germany | `https://*.asazure.cloudapi.de` | Available |
266-
| Azure China 21Vianet | `https://*.asazure.chinacloudapi.cn` | Available |
263+
|--------|------------|:-:|
264+
| Azure Global | `https://*.asazure.windows.net` | ![Available][check] |
265+
| Azure Government | `https://*.asazure.usgovcloudapi.net` | ![Available][check] |
266+
| Azure Germany | `https://*.asazure.cloudapi.de` | ![Available][check] |
267+
| Azure China 21Vianet | `https://*.asazure.chinacloudapi.cn` | ![Available][check] |
268+
269+
270+
[check]: media/services-support-managed-identities/check.png "Available"

‎articles/active-directory/user-help/media/user-help-auth-app-faq/katy-signin.png

-61.5 KB
Loading

‎articles/active-directory/user-help/media/user-help-auth-app-faq/verification-code.png

-52.3 KB
Loading

‎articles/automation/TOC.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,11 @@
305305
- name: Manage Shared Resources
306306
items:
307307
- name: Certificates
308-
href: automation-certificates.md
308+
href: shared-resources/certificates.md
309309
- name: Connections
310310
href: automation-connections.md
311311
- name: Credentials
312-
href: automation-credentials.md
312+
href: shared-resources/credentials.md
313313
- name: PowerShell modules
314314
items:
315315
- name: Modules
@@ -319,9 +319,9 @@
319319
- name: Update Azure PowerShell modules
320320
href: automation-update-azure-modules.md
321321
- name: Schedules
322-
href: automation-schedules.md
322+
href: shared-resources/schedules.md
323323
- name: Variables
324-
href: automation-variables.md
324+
href: shared-resources/variables.md
325325
- name: Manage Python 2 packages
326326
href: python-packages.md
327327
- name: Troubleshoot Shared Resources

0 commit comments

Comments
 (0)