Skip to content

Commit 65bed05

Browse files
authored
Merge pull request #109522 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 3bd5e93 + 74e9a54 commit 65bed05

File tree

8 files changed

+38
-26
lines changed

8 files changed

+38
-26
lines changed

articles/active-directory/manage-apps/application-proxy-faq.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ No, this scenario isn't supported because Application Proxy will terminate TLS t
109109

110110
Refer to [Publish Remote Desktop with Azure AD Application Proxy](application-proxy-integrate-with-remote-desktop-services.md).
111111

112-
### Can I use Kerberos Constrained Delegation in the Remote Desktop Gateway publishing scenario?
112+
### Can I use Kerberos Constrained Delegation (Single Sign-On - Windows Integrated Authentication) in the Remote Desktop Gateway publishing scenario?
113113

114114
No, this scenario isn't supported.
115115

116116
### My users don't use Internet Explorer 11 and the pre-authentication scenario doesn’t work for them. Is this expected?
117117

118118
Yes, it’s expected. The pre-authentication scenario requires an ActiveX control, which isn't supported in third-party browsers.
119119

120-
### Is the Remote Desktop Web Client supported?
120+
### Is the Remote Desktop Web Client (HTML5) supported?
121121

122122
No, this scenario isn't currently supported. Follow our [UserVoice](https://aka.ms/aadapuservoice) feedback forum for updates on this feature.
123123

@@ -131,6 +131,10 @@ Yes, it's expected. If the user’s computer is Azure AD joined, the user signs
131131

132132
Refer to [Enable remote access to SharePoint with Azure AD Application Proxy](application-proxy-integrate-with-sharepoint-server.md).
133133

134+
### Can I use the SharePoint mobile app (iOS/ Android) to access a published SharePoint server?
135+
136+
The [SharePoint mobile app](https://docs.microsoft.com/sharepoint/administration/supporting-the-sharepoint-mobile-apps-online-and-on-premises) does not support Azure Active Directory pre-authentication currently.
137+
134138
## Active Directory Federation Services (AD FS) publishing
135139

136140
### Can I use Azure AD Application Proxy as AD FS proxy (like Web Application Proxy)?
@@ -143,7 +147,7 @@ No. Azure AD Application Proxy is designed to work with Azure AD and doesn’t f
143147

144148
Currently, WebSocket protocol support is still in public preview and it may not work for other applications. Some customers have had mixed success using WebSocket protocol with other applications. If you test such scenarios, we would love to hear your results. Please send us your feedback at [email protected].
145149

146-
Features (Eventlogs, PowerShell and Remote Desktop Services) in Windows Admin Center (WAC) or Remote Desktop Web Client do not work through Azure AD Application Proxy presently.
150+
Features (Eventlogs, PowerShell and Remote Desktop Services) in Windows Admin Center (WAC) or Remote Desktop Web Client (HTML5) do not work through Azure AD Application Proxy presently.
147151

148152
## Link translation
149153

articles/automation/automation-dsc-onboarding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ You can onboard Linux servers running on-premises or in other cloud environments
104104

105105
`/opt/microsoft/dsc/Scripts/Register.py <Automation account registration key> <Automation account registration URL>`
106106

107-
- To find the registration key and registration URL for your Automation account, see the [Onboarding securely using registration](#onboarding-securely-using-registration) section if this article.
107+
- To find the registration key and registration URL for your Automation account, see the [Onboarding securely using registration](#onboarding-securely-using-registration) section of this article.
108108

109109
3. If the PowerShell DSC Local Configuration Manager (LCM) defaults don't match your use case, or you want to onboard machines that only report to Azure Automation State Configuration, follow steps 4-7. Otherwise, proceed directly to step 7.
110110

articles/azure-arc/servers/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ The Azure Connected Machine agent for Windows and Linux can be upgraded to the l
142142

143143
### Agent status
144144

145-
The Connected Machine agent sends a regular heartbeat message to the service every 5 minutes. If one is not received for 15 minutes, the machine is considered offline and the status will automatically be changed to **Disconnected** in the portal. Upon receiving a subsequent heartbeat message from the Connected Machine agent, its status will automatically be changed to **Connected**.
145+
The Connected Machine agent sends a regular heartbeat message to the service every 5 minutes. If the service stops receiving these heartbeat messages from a machine, that machine is considered offline and the status will automatically be changed to **Disconnected** in the portal within 15 to 30 minutes. Upon receiving a subsequent heartbeat message from the Connected Machine agent, its status will automatically be changed to **Connected**.
146146

147147
## Install and configure agent
148148

@@ -156,4 +156,4 @@ Connecting machines in your hybrid environment directly with Azure can be accomp
156156

157157
## Next steps
158158

159-
- To begin evaluating Azure Arc for servers (preview), follow the article [Connect hybrid machines to Azure from the Azure portal](onboard-portal.md).
159+
- To begin evaluating Azure Arc for servers (preview), follow the article [Connect hybrid machines to Azure from the Azure portal](onboard-portal.md).
Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Use DISA CAP to connect to Azure Government
2+
title: ASE deployment with DISA CAP
33
description: This document provides a comparison of features and guidance on developing applications for Azure Government
44
services: azure-government
55
cloud: gov
@@ -18,53 +18,61 @@ ms.author: joscot
1818

1919
---
2020

21-
# App Service Environment reference for DoD customers using a DISA CAP connection
21+
# App Service Environment reference for DoD customers connected to the DISA CAP
2222

2323
This article explains the baseline configuration of an App Service Environment (ASE) with an internal load balancer (ILB) for customers who use the DISA CAP to connect to Azure Government.
2424

2525
## Environment configuration
2626

2727
### Assumptions
2828

29-
The customer has deployed an ASE with an ILB and has implemented an ExpressRoute connection via the DISA Cloud Access Point (CAP) process.
29+
The customer has deployed an ASE with an ILB and has implemented an ExpressRoute connection to the DISA Cloud Access Point (CAP).
3030

3131
### Route table
3232

33-
When creating the ASE via the portal, a route table with a default route of 0.0.0.0/0 and next hop “Internet” is created. However, the DISA BGP routes will advertise for 0.0.0.0/0 and this route table should be removed from the ASE subnet.
33+
When creating the ASE via the portal, a route table with a default route of 0.0.0.0/0 and next hop “Internet” is created.
34+
However, since DISA advertises a default route out the ExpressRoute circuit, the User Defined Route (UDR) should either be deleted, or remove the default route to internet.
3435

35-
### Network security group (NSG)
36-
37-
The ASE will be created with inbound and outbound security rules as shown below. The inbound security rules MUST allow ports 454-455 with an ephemeral source port range (*). Source IPs must include the following Azure Government ranges see [App Service Environment management addresses](https://docs.microsoft.com/azure/app-service/environment/management-addresses
36+
You will need to create new routes in the UDR for the management addresses in order to keep the ASE healthy. For Azure Government ranges see [App Service Environment management addresses](https://docs.microsoft.com/azure/app-service/environment/management-addresses
3837
)
3938

40-
* 23.97.29.209
41-
* 23.97.0.17
42-
* 23.97.16.184
43-
* 13.72.180.105
44-
* 13.72.53.37
39+
Rule 1: 23.97.29.209 --> Internet
40+
Rule 2: 23.97.0.17 --> Internet
41+
Rule 3: 23.97.16.184 --> Internet
42+
Rule 4: 13.72.180.105 --> Internet
43+
Rule 5: 13.72.53.37 --> Internet
44+
45+
Make sure the UDR is applied to the subnet your ASE is deployed to.
46+
47+
### Network security group (NSG)
4548

46-
#### Default NSG security rules
49+
The ASE will be created with inbound and outbound security rules as shown below. The inbound security rules MUST allow ports 454-455 with an ephemeral source port range (*).
4750

4851
The images below describe the default NSG rules created during the ASE creation. For more information, see [Networking considerations for an App Service Environment](https://docs.microsoft.com/azure/app-service/environment/network-info#network-security-groups)
4952

5053
![Default inbound NSG security rules for an ILB ASE](media/documentation-government-ase-disacap-inbound-route-table.png)
5154

5255
![Default outbound NSG security rules for an ILB ASE](media/documentation-government-ase-disacap-outbound-route-table.png)
5356

57+
### Service Endpoints
58+
59+
Depending what storage you are using you will be required to enable Service Endpoints for SQL and Azure Storage to access them without going back down to the DISA BCAP. You also need to enable EventHub Service Endpoint for ASE logs.
60+
5461
## FAQs
5562

56-
* Some configuration changes may take some time to take effect. Allow for several hours for changes to routing, NSGs, ASE Health, etc. to propagate and take effect.
63+
* Some configuration changes may take some time to take effect. Allow for several hours for changes to routing, NSGs, ASE Health, etc. to propagate and take effect, or optionally you can reboot the ASE.
5764

5865
## Resource manager template sample
5966

6067
> [!NOTE]
61-
> The Azure Portal will not allow the ASE to be configured with non-RFC 1918 IP addresses. If your solution requires non-RFC 1918 IP addresses, you must use a Resource Manager Template to deploy the ASE.
68+
>In order to deploy non-RFC 1918 IP addresses in the portal you must pre-stage the VNet and Subnet for the ASE. You can use a Resource Manager Template to deploy the ASE with non-RFC1918 IPs as well.
6269
6370
<a href="https://portal.azure.us/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2FApp-Service-Environment-AzFirewall%2Fazuredeploy.json" target="_blank">
71+
6472
<img src="https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazuregov.png"/>
6573
</a>
6674

67-
This template deploys an **ILB ASE** into the Azure Government DoD regions.
75+
This template deploys an **ILB ASE** into the Azure Government or Azure DoD regions.
6876

6977
## Next steps
7078
[Azure Government overview](documentation-government-welcome.md)

articles/azure-monitor/app/nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 03/14/2019
1212

1313
To receive, store, and explore your monitoring data, include the SDK in your code, and then set up a corresponding Application Insights resource in Azure. The SDK sends data to that resource for further analysis and exploration.
1414

15-
The Node.js SDK can automatically monitor incoming and outgoing HTTP requests, exceptions, and some system metrics. Beginning in version 0.20, the SDK also can monitor some common third-party packages, like MongoDB, MySQL, and Redis. All events related to an incoming HTTP request are correlated for faster troubleshooting.
15+
The Node.js SDK can automatically monitor incoming and outgoing HTTP requests, exceptions, and some system metrics. Beginning in version 0.20, the SDK also can monitor some common [third-party packages](https://github.com/microsoft/node-diagnostic-channel/tree/master/src/diagnostic-channel-publishers#currently-supported-modules), like MongoDB, MySQL, and Redis. All events related to an incoming HTTP request are correlated for faster troubleshooting.
1616

1717
You can use the TelemetryClient API to manually instrument and monitor additional aspects of your app and system. We describe the TelemetryClient API in more detail later in this article.
1818

articles/cognitive-services/Speech-Service/rest-text-to-speech.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Content-Length: 225
207207
Authorization: Bearer [Base64 access_token]
208208
209209
<speak version='1.0' xml:lang='en-US'><voice xml:lang='en-US' xml:gender='Female'
210-
name='en-US-JessaRUS'>
210+
name='en-US-AriaRUS'>
211211
Microsoft Speech Service Text-to-Speech API
212212
</voice></speak>
213213
```

articles/data-explorer/ingest-data-event-hub.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Now you create a table in Azure Data Explorer, to which Event Hubs will send dat
8989
1. Copy the following command into the window and select **Run** to map the incoming JSON data to the column names and data types of the table (TestTable).
9090
9191
```Kusto
92-
.create table TestTable ingestion json mapping 'TestMapping' '[{"column":"TimeStamp","path":"$.timeStamp","datatype":"datetime"},{"column":"Name","path":"$.name","datatype":"string"},{"column":"Metric","path":"$.metric","datatype":"int"},{"column":"Source","path":"$.source","datatype":"string"}]'
92+
.create table TestTable ingestion json mapping 'TestMapping' '[{"column":"TimeStamp", "Properties": {"Path": "$.timeStamp"}},{"column":"Name", "Properties": {"Path":"$.name"}} ,{"column":"Metric", "Properties": {"Path":"$.metric"}}, {"column":"Source", "Properties": {"Path":"$.source"}}]'
9393
```
9494
9595
## Connect to the event hub

includes/virtual-machines-image-builder-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ AIB will support Azure Marketplace base OS images:
4747
- CentOS 7.6, 7.7
4848
- SLES 12 SP4
4949
- SLES 15, SLES 15 SP1
50-
- Windows 10 RS5 Enterprise/Professional/Enterprise for Virtual Desktop (EVD)
50+
- Windows 10 RS5 Enterprise/Enterprise multi-session/Professional
5151
- Windows 2016
5252
- Windows 2019
5353

0 commit comments

Comments
 (0)