Skip to content

Commit 6d0cc04

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into asc-melvyn-daily
2 parents 89f910c + d559785 commit 6d0cc04

File tree

57 files changed

+461
-617
lines changed

Some content is hidden

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

57 files changed

+461
-617
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5705,6 +5705,11 @@
57055705
"redirect_url": "/azure/connectors/connectors-create-api-sharepoint",
57065706
"redirect_document_id": false
57075707
},
5708+
{
5709+
"source_path": "articles/connectors/connectors-native-query.md",
5710+
"redirect_url": "/azure/logic-apps/logic-apps-perform-data-operations#filter-array-action",
5711+
"redirect_document_id": false
5712+
},
57085713
{
57095714
"source_path": "articles/logic-apps/logic-apps-enterprise-integration-as2-encode.md",
57105715
"redirect_url": "/azure/logic-apps/logic-apps-enterprise-integration-as2",

articles/app-service/configure-authentication-provider-aad.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Follow these best practices when setting up your app and authentication:
2626

2727
## <a name="express"> </a>Configure with express settings
2828

29-
1. In the [Azure portal], go to your App Service app.
30-
1. Select **Settings** > **Authentication / Authorization** in the left pane, and make sure that **App Service Authentication** is **On**.
31-
1. Select **Azure Active Directory**, and then select **Express** under **Management Mode**.
29+
1. In the [Azure portal], search for and select **App Services**, and then select your app.
30+
1. In the left pane, under **Settings** select **Authentication / Authorization** and make sure that **App Service Authentication** is **On**.
31+
1. Select **Azure Active Directory**, and then under **Management Mode** select **Express**.
3232
1. Select **OK** to register the App Service app in Azure Active Directory. A new app registration is created.
3333

3434
If you want to choose an existing app registration instead:
@@ -62,7 +62,7 @@ You'll need the following information when you configure your App Service app:
6262

6363
Perform the following steps:
6464

65-
1. Sign in to the [Azure portal] and go to your App Service app. Note your app's **URL**. You'll use it to configure your Azure Active Directory app registration.
65+
1. Sign in to the [Azure portal], search for and select **App Services**, and then select your app. Note your app's **URL**. You'll use it to configure your Azure Active Directory app registration.
6666
1. Select **Azure Active Directory** > **App registrations** > **New registration**.
6767
1. In the **Register an application** page, enter a **Name** for your app registration.
6868
1. In **Redirect URI**, select **Web** and enter the URL of your App Service app and append the path `/.auth/login/aad/callback`. For example, `https://contoso.azurewebsites.net/.auth/login/aad/callback`.
@@ -83,8 +83,8 @@ Perform the following steps:
8383

8484
### <a name="secrets"> </a>Add Azure Active Directory information to your App Service app
8585

86-
1. In the [Azure portal], go to your App Service app.
87-
1. Select **Settings > Authentication / Authorization** in the left pane, and make sure that **App Service Authentication** is **On**.
86+
1. In the [Azure portal], search for and select **App Services**, and then select your app.
87+
1. In the left pane, under **Settings**, select **Authentication / Authorization** and make sure that **App Service Authentication** is **On**.
8888
1. (Optional) By default, App Service authentication allows unauthenticated access to your app. To enforce user authentication, set **Action to take when request is not authenticated** to **Log in with Azure Active Directory**.
8989
1. Under Authentication Providers, select **Azure Active Directory**.
9090
1. In **Management mode**, select **Advanced** and configure App Service authentication according to the following table:

articles/app-service/configure-common.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ This topic explains how to configure common settings for web apps, mobile back e
1616

1717
In App Service, app settings are variables passed as environment variables to the application code. For Linux apps and custom containers, App Service passes app settings to the container using the `--env` flag to set the environment variable in the container.
1818

19-
In the [Azure portal], navigate to your app's management page. In the app's left menu, click **Configuration** > **Application settings**.
19+
In the [Azure portal], search for and select **App Services**, and then select your app.
20+
21+
![Search for App Services](./media/configure-common/search-for-app-services.png)
22+
23+
In the app's left menu, select **Configuration** > **Application settings**.
2024

2125
![Application Settings](./media/configure-common/open-ui.png)
2226

@@ -77,7 +81,7 @@ App settings have the following JSON formatting:
7781

7882
## Configure connection strings
7983

80-
In the [Azure portal], navigate to the app's management page. In the app's left menu, click **Configuration** > **Application settings**.
84+
In the [Azure portal], search for and select **App Services**, and then select your app. In the app's left menu, select **Configuration** > **Application settings**.
8185

8286
![Application Settings](./media/configure-common/open-ui.png)
8387

@@ -148,7 +152,7 @@ Connection strings have the following JSON formatting:
148152

149153
## Configure general settings
150154

151-
In the [Azure portal], navigate to the app's management page. In the app's left menu, click **Configuration** > **Application settings**.
155+
In the [Azure portal], search for and select **App Services**, and then select your app. In the app's left menu, select **Configuration** > **General settings**.
152156

153157
![General settings](./media/configure-common/open-general.png)
154158

@@ -171,19 +175,19 @@ Here, you can configure some common settings for the app. Some settings require
171175

172176
This setting is only for Windows apps.
173177

174-
In the [Azure portal], navigate to the app's management page. In the app's left menu, click **Configuration** > **Default documents**.
178+
In the [Azure portal], search for and select **App Services**, and then select your app. In the app's left menu, select **Configuration** > **Default documents**.
175179

176-
![General settings](./media/configure-common/open-documents.png)
180+
![Default documents](./media/configure-common/open-documents.png)
177181

178182
The default document is the web page that's displayed at the root URL for a website. The first matching file in the list is used. To add a new default document, click **New document**. Don't forget to click **Save**.
179183

180184
If the app uses modules that route based on URL instead of serving static content, there is no need for default documents.
181185

182186
## Configure path mappings
183187

184-
In the [Azure portal], navigate to the app's management page. In the app's left menu, click **Configuration** > **Path mappings**.
188+
In the [Azure portal], search for and select **App Services**, and then select your app. In the app's left menu, select **Configuration** > **Path mappings**.
185189

186-
![General settings](./media/configure-common/open-path.png)
190+
![Path mappings](./media/configure-common/open-path.png)
187191

188192
The **Path mappings** page shows you different things based on the OS type.
189193

articles/app-service/deploy-staging-slots.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ To scale your app to a different tier, make sure that the target tier supports t
2828
## Add a slot
2929
The app must be running in the **Standard**, **Premium**, or **Isolated** tier in order for you to enable multiple deployment slots.
3030

31-
1. In the [Azure portal](https://portal.azure.com/), open your app's [resource page](../azure-resource-manager/management/manage-resources-portal.md#manage-resources).
31+
32+
1. in the [Azure portal](https://portal.azure.com/), search for and select **App Services** and select your app.
33+
34+
![Search for App Services](./media/web-sites-staged-publishing/search-for-app-services.png)
35+
3236

3337
2. In the left pane, select **Deployment slots** > **Add Slot**.
3438

@@ -237,7 +241,7 @@ After the setting is saved, the specified percentage of clients is randomly rout
237241
After a client is automatically routed to a specific slot, it's "pinned" to that slot for the life of that client session. On the client browser, you can see which slot your session is pinned to by looking at the `x-ms-routing-name` cookie in your HTTP headers. A request that's routed to the "staging" slot has the cookie `x-ms-routing-name=staging`. A request that's routed to the production slot has the cookie `x-ms-routing-name=self`.
238242

239243
> [!NOTE]
240-
> Next to the Azure Portal, you can also use the [`az webapp traffic-routing set`](/cli/azure/webapp/traffic-routing#az-webapp-traffic-routing-set) command in the Azure CLI to set the routing percentages from CI/CD tools like DevOps pipelines or other automation systems.
244+
> Next to the Azure portal, you can also use the [`az webapp traffic-routing set`](/cli/azure/webapp/traffic-routing#az-webapp-traffic-routing-set) command in the Azure CLI to set the routing percentages from CI/CD tools like DevOps pipelines or other automation systems.
241245
>
242246
243247
### Route production traffic manually
@@ -264,7 +268,7 @@ By default, new slots are given a routing rule of `0%`, shown in grey. When you
264268

265269
## Delete a slot
266270

267-
Go to your app's resource page. Select **Deployment slots** > *\<slot to delete>* > **Overview**. Select **Delete** on the command bar.
271+
Search for and select your app. Select **Deployment slots** > *\<slot to delete>* > **Overview**. Select **Delete** on the command bar.
268272

269273
![Delete a deployment slot](./media/web-sites-staged-publishing/DeleteStagingSiteButton.png)
270274

@@ -323,16 +327,16 @@ Get-AzLog -ResourceGroup [resource group name] -StartTime 2018-03-07 -Caller Slo
323327
Remove-AzResource -ResourceGroupName [resource group name] -ResourceType Microsoft.Web/sites/slots –Name [app name]/[slot name] -ApiVersion 2015-07-01
324328
```
325329

326-
## Automate with ARM templates
330+
## Automate with Resource Manager templates
327331

328-
[ARM Templates](https://docs.microsoft.com/azure/azure-resource-manager/template-deployment-overview) are declarative JSON files used to automate the deployment and configuration of Azure resources. To swap slots using ARM templates, you will set two properties on the *Microsoft.Web/sites/slots* and *Microsoft.Web/sites* resources:
332+
[Azure Resource Manager templates](https://docs.microsoft.com/azure/azure-resource-manager/template-deployment-overview) are declarative JSON files used to automate the deployment and configuration of Azure resources. To swap slots by using Resource Manager templates, you will set two properties on the *Microsoft.Web/sites/slots* and *Microsoft.Web/sites* resources:
329333

330334
- `buildVersion`: this is a string property which represents the current version of the app deployed in the slot. For example: "v1", "1.0.0.1", or "2019-09-20T11:53:25.2887393-07:00".
331335
- `targetBuildVersion`: this is a string property that specifies what `buildVersion` the slot should have. If the targetBuildVersion does not equal the current `buildVersion`, then this will trigger the swap operation by finding the slot which has the specified `buildVersion`.
332336

333-
### Example ARM Template
337+
### Example Resource Manager template
334338

335-
The following ARM template will update the `buildVersion` of the staging slot and set the `targetBuildVersion` on the production slot. This will swap the two slots. The template assumes you already have a webapp created with a slot named "staging".
339+
The following Resource Manager template will update the `buildVersion` of the staging slot and set the `targetBuildVersion` on the production slot. This will swap the two slots. The template assumes you already have a webapp created with a slot named "staging".
336340

337341
```json
338342
{
@@ -376,7 +380,7 @@ The following ARM template will update the `buildVersion` of the staging slot an
376380
}
377381
```
378382

379-
This ARM template is idempotent, meaning that it can be executed repeatedly and produce the same state of the slots. After the first execution, `targetBuildVersion` will match the current `buildVersion`, so a swap will not be triggered.
383+
This Resource Manager template is idempotent, meaning that it can be executed repeatedly and produce the same state of the slots. After the first execution, `targetBuildVersion` will match the current `buildVersion`, so a swap will not be triggered.
380384

381385
<!-- ======== Azure CLI =========== -->
382386

65 KB
Loading
65 KB
Loading

articles/connectors/connectors-create-api-bingsearch.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Connect to Bing Search
3-
description: Find news with Bing Search REST APIs and Azure Logic Apps
3+
description: Automate tasks and workflows that find results in Bing Search by using Azure Logic Apps
44
services: logic-apps
55
ms.suite: integration
66
ms.reviewer: klam, logicappspm
@@ -9,7 +9,7 @@ ms.date: 05/21/2018
99
tags: connectors
1010
---
1111

12-
# Find news with Bing Search and Azure Logic Apps
12+
# Find results in Bing Search by using Azure Logic Apps
1313

1414
This article shows how you can find news, videos, and other items through
1515
Bing Search from inside a logic app with the Bing Search connector.
@@ -201,7 +201,7 @@ provide these details:
201201
## Connector reference
202202

203203
For technical details, such as triggers, actions, and limits,
204-
as described by the connector's OpenAPI (formerly Swagger) file,
204+
as described by the connector's Swagger file,
205205
see the [connector's reference page](/connectors/bingsearch/).
206206

207207
## Next steps

articles/connectors/connectors-create-api-box.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Connect to Box
3-
description: Create and manage files with Box REST APIs and Azure Logic Apps
3+
description: Automate tasks and workflows that create and manage files in Box by using Azure Logic Apps
44
services: logic-apps
55
ms.suite: integration
66
ms.reviewer: klam, logicappspm
@@ -9,7 +9,7 @@ ms.date: 11/07/2016
99
tags: connectors
1010
---
1111

12-
# Create and manage files in Box with Azure Logic Apps
12+
# Create and manage files in Box by using Azure Logic Apps
1313

1414
This article shows how you can create and manage your files
1515
in Box from inside a logic app with the Box connector.

articles/connectors/connectors-create-api-dropbox.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Connect to Dropbox
3-
description: Upload and manage files with Dropbox REST APIs and Azure Logic Apps
3+
description: Automate tasks and workflows that upload and manage files in Dropbox by using Azure Logic Apps
44
services: logic-apps
55
ms.suite: integration
66
ms.reviewer: klam, logicappspm
@@ -85,7 +85,7 @@ create a new file in Dropbox.
8585
## Connector reference
8686

8787
For technical details, such as triggers, actions, and limits,
88-
as described by the connector's OpenAPI (formerly Swagger) file,
88+
as described by the connector's Swagger file,
8989
see the [connector's reference page](/connectors/dropbox/).
9090

9191
## Next steps

articles/connectors/connectors-create-api-facebook.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Connect to Facebook
3-
description: Manage your timeline and page with Facebook REST APIs and Azure Logic Apps
3+
description: Automate tasks and workflows that manage your Facebook timeline and page by using Azure Logic Apps
44
services: logic-apps
55
ms.suite: integration
66
ms.reviewer: klam, logicappspm

0 commit comments

Comments
 (0)