Skip to content

Commit 1681787

Browse files
author
dksimpson
committed
Merge branch 'release-functions-ux-update' of https://github.com/MicrosoftDocs/azure-docs-pr into release-functions-ux-update-dks-14
2 parents 9a9b443 + b388c62 commit 1681787

File tree

8 files changed

+42
-26
lines changed

8 files changed

+42
-26
lines changed

articles/azure-functions/functions-add-output-binding-storage-queue-vs-code.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Before you start this article, you must meet the following requirements:
2929

3030
* Complete the steps in [part 1 of the Visual Studio Code quickstart](functions-create-first-function-vs-code.md).
3131

32-
This article assumes that you are already signed in to your Azure subscription from Visual Studio Code. You can sign in by running `Azure: Sign In` from the command palette.
32+
This article assumes that you're already signed in to your Azure subscription from Visual Studio Code. You can sign in by running `Azure: Sign In` from the command palette.
3333

3434
## Download the function app settings
3535

@@ -46,13 +46,13 @@ In the [previous quickstart article](functions-create-first-function-vs-code.md)
4646

4747
## Register binding extensions
4848

49-
Because you are using a Queue storage output binding, you must have the Storage bindings extension installed before you run the project.
49+
Because you're using a Queue storage output binding, you must have the Storage bindings extension installed before you run the project.
5050

5151
::: zone pivot="programming-language-javascript,programming-language-typescript,programming-language-python,programming-language-powershell,programming-language-java"
5252

5353
Your project has been configured to use [extension bundles](functions-bindings-register.md#extension-bundles), which automatically installs a predefined set of extension packages.
5454

55-
Extension bundles is enabled in the host.json file at the root of the project, which looks like the following:
55+
Extension bundles usage is enabled in the host.json file at the root of the project, which appears as follows:
5656

5757
:::code language="json" source="~/functions-quickstart-java/functions-add-output-binding-storage-queue/host.json":::
5858

@@ -184,7 +184,7 @@ Now, it's time to republish the updated function app to Azure.
184184

185185
1. In Visual Studio Code, press F1 to open the command palette. In the command palette, search for and select `Azure Functions: Deploy to function app...`.
186186

187-
1. Choose the function app that you created in the first article. Because you are redeploying your project to the same app, select **Deploy** to dismiss the warning about overwriting files.
187+
1. Choose the function app that you created in the first article. Because you're redeploying your project to the same app, select **Deploy** to dismiss the warning about overwriting files.
188188

189189
1. After deployment completes, you can again use cURL or a browser to test the redeployed function. As before, append the query string `&name=<yourname>` to the URL, as in the following example:
190190

@@ -196,7 +196,7 @@ Now, it's time to republish the updated function app to Azure.
196196

197197
## Clean up resources
198198

199-
*Resources* in Azure refers to function apps, functions, storage accounts, and so forth. They are grouped into *resource groups*, and you can delete everything in a group by deleting the group.
199+
In Azure, *resources* refer to function apps, functions, storage accounts, and so forth. They're grouped into *resource groups*, and you can delete everything in a group by deleting the group.
200200
201201
You created resources to complete these quickstarts. You may be billed for these resources, depending on your [account status](https://azure.microsoft.com/account/) and [service pricing](https://azure.microsoft.com/pricing/). If you don't need the resources anymore, here's how to delete them:
202202

articles/azure-functions/functions-how-to-github-actions.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Use GitHub Actions to make code updates in Azure Functions
33
description: Learn how to use GitHub Actions to define a workflow to build and deploy Azure Functions projects in GitHub.
44
author: craigshoemaker
55
ms.topic: conceptual
6-
ms.date: 09/16/2019
6+
ms.date: 04/16/2020
77
ms.author: cshoe
88
---
99

@@ -34,29 +34,31 @@ You can create a [service principal](../active-directory/develop/app-objects-and
3434
az ad sp create-for-rbac --name "myApp" --role contributor --scopes /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RESOURCE_GROUP>/providers/Microsoft.Web/sites/<APP_NAME> --sdk-auth
3535
```
3636

37-
In this example, replace the placeholders in the resource with your subscription ID, resource group, and function app name. The output is the role assignment credentials that provides access to your function app. Copy this JSON object, which you can use to authenticate from GitHub.
37+
In this example, replace the placeholders in the resource with your subscription ID, resource group, and function app name. The output is the role assignment credentials that provide access to your function app. Copy this JSON object, which you can use to authenticate from GitHub.
3838

3939
> [!IMPORTANT]
4040
> It is always a good practice to grant minimum access. This is why the scope in the previous example is limited to the specific function app and not the entire resource group.
4141
4242
## Download the publishing profile
4343

44-
You can download the publishing profile of your function app, by going to the **Overview** page of your app and clicking **Get publish profile**.
44+
To download the publishing profile of your function app:
4545

46-
![Download publish profile](media/functions-how-to-github-actions/get-publish-profile.png)
46+
1. Select the function app's **Overview** page, and then select **Get publish profile**.
4747

48-
Copy the content of the file.
48+
:::image type="content" source="media/functions-how-to-github-actions/get-publish-profile.png" alt-text="Download publish profile":::
49+
50+
1. Save and copy the contents of the publish settings file.
4951

5052
## Configure the GitHub secret
5153

5254
1. In [GitHub](https://github.com), browse to your repository, select **Settings** > **Secrets** > **Add a new secret**.
5355

54-
![Add Secret](media/functions-how-to-github-actions/add-secret.png)
56+
:::image type="content" source="media/functions-how-to-github-actions/add-secret.png" alt-text="Add Secret":::
5557

5658
1. Add a new secret.
5759

58-
* If you're using the service principal that you created by using the Azure CLI, use `AZURE_CREDENTIALS` for the **Name**. Then paste the copied JSON object output for **Value**, and select **Add secret**.
59-
* If you're using a publishing profile, use `SCM_CREDENTIALS` for the **Name**. Then use the publishing profile's file content for **Value**, and select **Add secret**.
60+
* If you're using the service principal that you created by using the Azure CLI, use `AZURE_CREDENTIALS` for the **Name**. Then, paste the copied JSON object output for **Value**, and select **Add secret**.
61+
* If you're using a publishing profile, use `SCM_CREDENTIALS` for the **Name**. Then, use the publishing profile's file content for **Value**, and select **Add secret**.
6062

6163
GitHub can now authenticate to your function app in Azure.
6264

@@ -212,7 +214,7 @@ The following example uses version 1 of the `functions-action`:
212214

213215
## Next steps
214216

215-
To view a complete workflow .yaml, see one of the files in the [Azure GitHub Actions workflow samples repo](https://aka.ms/functions-actions-samples) that have `functionapp` in the name. You can use these samples a starting point for your workflow.
217+
To view a complete workflow .yaml file, see one of the files in the [Azure GitHub Actions workflow samples repo](https://aka.ms/functions-actions-samples) that have `functionapp` in the name. You can use these samples a starting point for your workflow.
216218

217219
> [!div class="nextstepaction"]
218220
> [Learn more about GitHub Actions](https://help.github.com/en/articles/about-github-actions)

articles/azure-functions/functions-monitor-log-analytics.md

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Monitoring Azure Functions with Azure Monitor Logs
33
description: Learn how to use Azure Monitor Logs with Azure Functions to monitor function executions.
44
author: craigshoemaker
55
ms.topic: conceptual
6-
ms.date: 10/09/2019
6+
ms.date: 04/15/2020
77
ms.author: cshoe
88
# Customer intent: As a developer, I want to monitor my functions so I can know if they're running correctly.
99
---
@@ -21,17 +21,23 @@ Azure Monitor uses a version of the [Kusto query language](/azure/kusto/query/)
2121
2222
## Setting up
2323

24-
From the **Monitoring** section, select **Diagnostic settings** and then click **Add diagnostic setting**.
24+
1. From the **Monitoring** section of your function app in the [Azure portal](https://portal.azure.com), select **Diagnostic settings**, and then select **Add diagnostic setting**.
2525

26-
![Add a diagnostic setting](media/functions-monitor-log-analytics/diagnostic-settings-add.png)
26+
:::image type="content" source="media/functions-monitor-log-analytics/diagnostic-settings-add.png" alt-text="Select diagnostic settings":::
2727

28-
In the **Diagnostics settings** page, choose **Send to Log Analytics**, and then select your Log Analytics workspace. Under **log** choose **FunctionAppLogs**, this table contains the desired logs.
28+
1. In the **Diagnostics settings** page, under **Category details** and **log**, choose **FunctionAppLogs**.
2929

30-
![Add a diagnostic setting](media/functions-monitor-log-analytics/choose-table.png)
30+
The **FunctionAppLogs** table contains the desired logs.
31+
32+
1. Under **Destination details**, choose **Send to Log Analytics**.and then select your **Log Analytics workspace**.
33+
34+
1. Enter a **Diagnostic settings name**, and then select **Save**.
35+
36+
:::image type="content" source="media/functions-monitor-log-analytics/choose-table.png" alt-text="Add a diagnostic setting":::
3137

3238
## User-generated logs
3339

34-
To generate custom logs, you can use the specific logging statement depending on your language, here are sample code snippets:
40+
To generate custom logs, use the logging statement specific to your language. Here are sample code snippets:
3541

3642

3743
# [C#](#tab/csharp)
@@ -68,11 +74,19 @@ logging.info('My app logs here.')
6874

6975
## Querying the logs
7076

71-
To query the generated logs, go to the Log Analytics workspace that you configured to send the function logs to and click **Logs**.
77+
To query the generated logs:
78+
79+
1. From your function app, select **Diagnostic settings**.
80+
81+
1. From the **Diagnostic settings** list, select the Log Analytics workspace that you configured to send the function logs to.
82+
83+
1. From the **Log Analytics workspace** page, select **Logs**.
84+
85+
Azure Functions writes all logs to the **FunctionAppLogs** table under **LogManagement**.
7286

73-
![Query window in LA workspace](media/functions-monitor-log-analytics/querying.png)
87+
:::image type="content" source="media/functions-monitor-log-analytics/querying.png" alt-text="Query window in Log Analytics workspace":::
7488

75-
Azure Functions writes all logs to **FunctionAppLogs** table, here are some sample queries.
89+
Here are some sample queries:
7690

7791
### All logs
7892

@@ -83,7 +97,7 @@ FunctionAppLogs
8397
8498
```
8599

86-
### A specific function logs
100+
### Specific function logs
87101

88102
```
89103
@@ -104,6 +118,6 @@ FunctionAppLogs
104118

105119
## Next steps
106120

107-
- Review the [Azure Functions overview](functions-overview.md)
108-
- Learn more about [Azure Monitor Logs](../azure-monitor/platform/data-platform-logs.md)
121+
- Review the [Azure Functions overview](functions-overview.md).
122+
- Learn more about [Azure Monitor Logs](../azure-monitor/platform/data-platform-logs.md).
109123
- Learn more about the [query language](../azure-monitor/log-query/get-started-queries.md).
-20.3 KB
Loading
-4.32 KB
Loading
-38.8 KB
Loading
-16 KB
Loading
14.7 KB
Loading

0 commit comments

Comments
 (0)