Skip to content

Commit 9dec035

Browse files
authored
Merge pull request #91650 from MicrosoftDocs/master
10/14 AM Publish
2 parents 9858ab6 + 144b1f6 commit 9dec035

File tree

66 files changed

+660
-2777
lines changed

Some content is hidden

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

66 files changed

+660
-2777
lines changed

.openpublishing.redirection.json

Lines changed: 141 additions & 46 deletions
Large diffs are not rendered by default.

articles/active-directory/manage-apps/application-proxy-connector-installation-problem.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ When the installation of a connector fails, the root cause is usually one of the
3434

3535
3. **Authentication of the admin** – during installation, the user must provide admin credentials to complete the Connector installation.
3636

37+
> [!NOTE]
38+
> The Connector installation logs can be found in the %TEMP% folder and can help provide additional information on what is causing an installation failure.
39+
3740
## Verify connectivity to the Cloud Application Proxy service and Microsoft Login page
3841

3942
**Objective:** Verify that the connector machine can connect to the AAD Application Proxy registration endpoint as well as Microsoft login page.
4043

41-
1. Open a browser and go to the following web page: <https://aadap-portcheck.connectorporttest.msappproxy.net> , and verify that the connectivity to Central US and East US datacenters with ports 80 and 443 is working.
44+
1. On the connector server, run a port test by using [telnet](https://docs.microsoft.com/windows-server/administration/windows-commands/telnet) or other port testing tool to verify that ports 443 and 80 are open.
4245

43-
2. If any of those ports is not successful (doesn’t have a green checkmark), verify that the Firewall or backend proxy has \*.msappproxy.net with ports 80 and 443 defined correctly.
46+
2. If any of those ports is not successful, verify that the Firewall or backend proxy has access to the required domains and ports see, [Prepare your on-premises environment](application-proxy-add-on-premises-application.md#prepare-your-on-premises-environment).
4447

4548
3. Open a browser (separate tab) and go to the following web page: <https://login.microsoftonline.com>, make sure that you can login to that page.
4649

@@ -49,7 +52,7 @@ When the installation of a connector fails, the root cause is usually one of the
4952
**Objective:** Verify that the connector machine, backend proxy and firewall can support the certificate created by the connector for future trust.
5053

5154
>[!NOTE]
52-
>The connector tries to create a SHA512 cert that is supported by TLS1.2. If the machine or the backend firewall and proxy does not support TLS1.2, the installation fail.
55+
>The connector tries to create a SHA512 cert that is supported by TLS1.2. If the machine or the backend firewall and proxy does not support TLS1.2, the installation fails.
5356
>
5457
>
5558

articles/active-directory/manage-apps/application-proxy-debug-connectors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This flowchart walks you through the steps for debugging some of the more common
3838
| | Action | Description |
3939
|---------|---------|---------|
4040
|1 | Find the connector group assigned to the app | You probably have a connector installed on multiple servers, in which case the connectors should be [assigned to connector groups](application-proxy-connector-groups.md#assign-applications-to-your-connector-groups). To learn more about connector groups, see [Publish applications on separate networks and locations using connector groups](application-proxy-connector-groups.md). |
41-
|2 | Install the connector and assign a group | If you don't have a connector installed, see [Install and register a connector](application-proxy-add-on-premises-application.md#install-and-register-a-connector).<br></br>If the connector isn't assigned to a group, see [Assign the connector to a group](application-proxy-connector-groups.md#create-connector-groups).<br></br>If the application isn't assigned to a connector group, see [Assign the application to a connector group](application-proxy-connector-groups.md#assign-applications-to-your-connector-groups).|
41+
|2 | Install the connector and assign a group | If you don't have a connector installed, see [Install and register a connector](application-proxy-add-on-premises-application.md#install-and-register-a-connector).<br></br> If you are having issues installing the connector, see [Problem installing the Connector](application-proxy-connector-installation-problem.md).<br></br> If the connector isn't assigned to a group, see [Assign the connector to a group](application-proxy-connector-groups.md#create-connector-groups).<br></br>If the application isn't assigned to a connector group, see [Assign the application to a connector group](application-proxy-connector-groups.md#assign-applications-to-your-connector-groups).|
4242
|3 | Run a port test on the connector server | On the connector server, run a port test by using [telnet](https://docs.microsoft.com/windows-server/administration/windows-commands/telnet) or other port testing tool to check if ports 443 and 80 are open.|
4343
|4 | Configure the domains and ports | [Make sure that your domains and ports are configured correctly](application-proxy-add-on-premises-application.md#prepare-your-on-premises-environment) For the connector to work properly, there are certain ports that must be open and URLs that your server must be able to access. |
4444
|5 | Check if a back-end proxy is in use | Check to see if the connectors are using back-end proxy servers or bypassing them. For details, see [Troubleshoot connector proxy problems and service connectivity issues](application-proxy-configure-connectors-with-proxy-servers.md#troubleshoot-connector-proxy-problems-and-service-connectivity-issues). |

articles/app-service/webjobs-create.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
title: Run Background tasks with WebJobs - Azure App Service
2+
title: Run background tasks with WebJobs - Azure App Service
33
description: Learn how to use WebJobs to run background tasks in Azure App Service web apps, API apps, or mobile apps.
44
author: ggailey777
5-
manager: wgallace
5+
manager: gwallace
66
s.assetid: af01771e-54eb-4aea-af5f-f883ff39572b
77
ms.service: app-service
88
ms.topic: conceptual
@@ -14,7 +14,7 @@ ms.custom: seodec18
1414

1515
---
1616

17-
# Run Background tasks with WebJobs in Azure App Service
17+
# Run background tasks with WebJobs in Azure App Service
1818

1919
This article shows how to deploy WebJobs by using the [Azure portal](https://portal.azure.com) to upload an executable or script. For information about how to develop and deploy WebJobs by using Visual Studio, see [Deploy WebJobs using Visual Studio](webjobs-dotnet-deploy-vs.md).
2020

articles/azure-databricks/quickstart-create-databricks-workspace-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ In this section, you create an Azure Databricks workspace using the Azure portal
5050
|**Location** | Select **West US 2**. For other available regions, see [Azure services available by region](https://azure.microsoft.com/regions/services/). |
5151
|**Pricing Tier** | Choose between **Standard**, **Premium**, or **Trial**. For more information on these tiers, see [Databricks pricing page](https://azure.microsoft.com/pricing/details/databricks/). |
5252

53-
Select **Pin to dashboard** and then click **Create**.
53+
Click **Create**.
5454

5555
4. The workspace creation takes a few minutes. During workspace creation, you can view the deployment status in **Notifications**.
5656

@@ -74,7 +74,7 @@ In this section, you create an Azure Databricks workspace using the Azure portal
7474
Accept all other default values other than the following:
7575

7676
* Enter a name for the cluster.
77-
* For this article, create a cluster with **5.2** runtime.
77+
* For this article, create a cluster with **5.3** runtime.
7878
* Make sure you select the **Terminate after \_\_ minutes of inactivity** checkbox. Provide a duration (in minutes) to terminate the cluster, if the cluster is not being used.
7979

8080
Select **Create cluster**. Once the cluster is running, you can attach notebooks to the cluster and run Spark jobs.

articles/azure-functions/durable/durable-functions-entities.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,68 @@ For example, we can modify the counter entity example above so it sends a "miles
203203
break;
204204
```
205205

206+
The following snippet demonstrates how to incorporate the injected service into your entity class.
207+
208+
```csharp
209+
public class HttpEntity
210+
{
211+
private readonly HttpClient client;
212+
213+
public HttpEntity(IHttpClientFactory factory)
214+
{
215+
this.client = factory.CreateClient();
216+
}
217+
218+
public async Task<int> GetAsync(string url)
219+
{
220+
using (var response = await this.client.GetAsync(url))
221+
{
222+
return (int)response.StatusCode;
223+
}
224+
}
225+
226+
// The function entry point must be declared static
227+
[FunctionName(nameof(HttpEntity))]
228+
public static Task Run([EntityTrigger] IDurableEntityContext ctx)
229+
=> ctx.DispatchAsync<HttpEntity>();
230+
}
231+
```
232+
233+
> [!NOTE]
234+
> Unlike when using constructor injection in regular .NET Azure Functions, the functions entry point method for class-based entities *must* be declared `static`. Declaring a non-static function entry point may cause conflicts between the normal Azure Functions object initializer and the Durable Entities object initializer.
235+
236+
### Bindings in entity classes (.NET)
237+
238+
Unlike regular functions, entity class methods do not have direct access to input and output bindings. Instead, binding data must be captured in the entry-point function declaration and then passed to the `DispatchAsync<T>` method. Any objects passed to `DispatchAsync<T>` will be automatically passed into the entity class constructor as an argument.
239+
240+
The following example shows how a `CloudBlobContainer` reference from the [blob input binding](../functions-bindings-storage-blob.md#input) can be made available to a class-based entity.
241+
242+
```csharp
243+
public class BlobBackedEntity
244+
{
245+
private readonly CloudBlobContainer container;
246+
247+
public BlobBackedEntity(CloudBlobContainer container)
248+
{
249+
this.container = container;
250+
}
251+
252+
// ... entity methods can use this.container in their implementations ...
253+
254+
[FunctionName(nameof(BlobBackedEntity))]
255+
public static Task Run(
256+
[EntityTrigger] IDurableEntityContext context,
257+
[Blob("my-container", FileAccess.Read)] CloudBlobContainer container)
258+
{
259+
// passing the binding object as a parameter makes it available to the
260+
// entity class constructor
261+
return context.DispatchAsync<BlobBackedEntity>(container);
262+
}
263+
}
264+
```
265+
266+
For more information on bindings in Azure Functions, see the [Azure Functions Triggers and Bindings](../functions-triggers-bindings.md) documentation.
267+
206268
## Entity coordination
207269

208270
There may be times when you need to coordinate operations across multiple entities. For example, in a banking application, you may have entities representing individual bank accounts. When transferring funds from one account to another, you must ensure that the _source_ account has sufficient funds, and that updates to both the _source_ and _destination_ accounts are done in a transactionally consistent way.

articles/azure-monitor/app/data-model.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: application-insights
99
ms.workload: TBD
1010
ms.tgt_pltfrm: ibiza
1111
ms.topic: conceptual
12-
ms.date: 04/25/2017
12+
ms.date: 10/14/2019
1313
ms.reviewer: sergkanz
1414
ms.author: mbullwin
1515
---
@@ -43,7 +43,7 @@ Application Insights telemetry model defines a way to [correlate](../../azure-mo
4343

4444
Application Insights data model is a simple and basic yet powerful way to model your application telemetry. We strive to keep the model simple and slim to support essential scenarios and allow to extend the schema for advanced use.
4545

46-
To report data model or schema problems and suggestions use GitHub [ApplicationInsights-Home](https://github.com/Microsoft/ApplicationInsights-Home/labels/schema) repository.
46+
To report data model or schema problems and suggestions use GitHub [ApplicationInsights-Home](https://github.com/Microsoft/ApplicationInsights-Home/issues) repository.
4747

4848
## Next steps
4949

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ There are a number of common scenarios in which you might need to restore VMs.
148148
**Scenario** | **Guidance**
149149
--- | ---
150150
**Restore VMs using Hybrid Use Benefit** | If a Windows VM uses [Hybrid Use Benefit (HUB) licensing](../virtual-machines/windows/hybrid-use-benefit-licensing.md), restore the disks, and create a new VM using the provided template (with **License Type** set to **Windows_Server**), or PowerShell. This setting can also be applied after creating the VM.
151-
**Restore VMs during an Azure datacenter disaster** | If the vault uses GRS and the primary datacenter for the VM goes down, Azure Backup supports restoring backed-up VMs to the paired datacenter. You select a storage account in the paired datacenter, and restore as normal. Azure Backup uses the compute service in the paired location to create the restored VM. [Learn more](../resiliency/resiliency-technical-guidance-recovery-loss-azure-region.md) about datacenter resiliency.
151+
**Restore VMs during an Azure datacenter disaster** | If the vault uses GRS and the primary datacenter for the VM goes down, Azure Backup supports restoring backed-up VMs to the paired datacenter. You select a storage account in the paired datacenter, and restore as normal. Azure Backup uses the compute service in the paired region to create the restored VM. [Learn more](../resiliency/resiliency-technical-guidance-recovery-loss-azure-region.md) about datacenter resiliency.
152152
**Restore single domain controller VM in single domain** | Restore the VM like any other VM. Note that:<br/><br/> From an Active Directory perspective, the Azure VM is like any other VM.<br/><br/> Directory Services Restore Mode (DSRM) is also available, so all Active Directory recovery scenarios are viable. [Learn more](https://docs.microsoft.com/windows-server/identity/ad-ds/get-started/virtual-dc/virtualized-domain-controllers-hyper-v) about backup and restore considerations for virtualized domain controllers.
153153
**Restore multiple domain controller VMs in single domain** | If other domain controllers in the same domain can be reached over the network, the domain controller can be restored like any VM. If it's the last remaining domain controller in the domain, or a recovery in an isolated network is performed, use a [forest recovery](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/ad-forest-recovery-single-domain-in-multidomain-recovery).
154154
**Restore multiple domains in one forest** | We recommend a [forest recovery](https://docs.microsoft.com/windows-server/identity/ad-ds/manage/ad-forest-recovery-single-domain-in-multidomain-recovery).

0 commit comments

Comments
 (0)