Skip to content

Commit a8848a1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into networksecurityhubpage
2 parents f655b8c + 0c80761 commit a8848a1

File tree

18 files changed

+617
-208
lines changed

18 files changed

+617
-208
lines changed

articles/azure-functions/functions-deployment-technologies.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Deployment technologies in Azure Functions
33
description: Learn the different ways you can deploy code to Azure Functions.
44
ms.custom: vs-azure, vscode-azure-extension-update-not-needed, build-2023
55
ms.topic: conceptual
6-
ms.date: 05/18/2022
6+
ms.date: 06/22/2023
77
---
88

99
# Deployment technologies in Azure Functions
@@ -44,10 +44,11 @@ Each plan has different behaviors. Not all deployment technologies are available
4444
| Local Git<sup>1</sup> |||| |||
4545
| Cloud sync<sup>1</sup> |||| |||
4646
| FTP<sup>1</sup> |||| |||
47-
| Portal editing |||| |✔<sup>2</sup>|✔<sup>2</sup>|
47+
| In-portal editing<sup>2</sup> |||||✔<sup>3</sup>|✔<sup>3</sup>|
4848

49-
<sup>1</sup> Deployment technology that requires [manual trigger syncing](#trigger-syncing).
50-
<sup>2</sup> Portal editing is enabled only for HTTP and Timer triggers for Functions on Linux using Premium and Dedicated plans.
49+
<sup>1</sup> Deployment technology that requires [manual trigger syncing](#trigger-syncing).
50+
<sup>2</sup> In-portal editing is disabled when code is deployed to your function app from outside the portal. For more information, including language support details for in-portal editing, see [Language support details](supported-languages.md#language-support-details).
51+
<sup>3</sup> In-portal editing is enabled only for HTTP and Timer triggered functions running on Linux in Premium and Dedicated plans.
5152

5253
## Key concepts
5354

@@ -202,30 +203,31 @@ You can use FTP to directly transfer files to Azure Functions.
202203

203204
In the portal-based editor, you can directly edit the files that are in your function app (essentially deploying every time you save your changes).
204205

205-
>__How to use it:__ To be able to edit your functions in the Azure portal, you must have [created your functions in the portal](./functions-get-started.md). To preserve a single source of truth, using any other deployment method makes your function read-only and prevents continued portal editing. To return to a state in which you can edit your files in the Azure portal, you can manually turn the edit mode back to `Read/Write` and remove any deployment-related application settings (like [`WEBSITE_RUN_FROM_PACKAGE`](functions-app-settings.md#website_run_from_package).
206+
>__How to use it:__ To be able to edit your functions in the [Azure portal](https://portal.azure.com), you must have [created your functions in the portal](./functions-get-started.md). To preserve a single source of truth, using any other deployment method makes your function read-only and prevents continued portal editing. To return to a state in which you can edit your files in the Azure portal, you can manually turn the edit mode back to `Read/Write` and remove any deployment-related application settings (like [`WEBSITE_RUN_FROM_PACKAGE`](functions-app-settings.md#website_run_from_package).
206207
207-
>__When to use it:__ The portal is a good way to get started with Azure Functions. For more intense development work, we recommend that you use one of the following client tools:
208+
>__When to use it:__ The portal is a good way to get started with Azure Functions. For more advanced development work, we recommend that you use one of the following client tools:
208209
>
209210
>+ [Visual Studio Code](./create-first-function-vs-code-csharp.md)
210211
>+ [Azure Functions Core Tools (command line)](functions-run-local.md)
211212
>+ [Visual Studio](functions-create-your-first-function-visual-studio.md)
212213
213214
>__Where app content is stored:__ App content is stored on the file system, which may be backed by Azure Files from the storage account specified when the function app was created.
214215
215-
The following table shows the operating systems and languages that support portal editing:
216+
The following table shows the operating systems and languages that support in-portal editing:
216217

217218
| Language | Windows Consumption | Windows Premium | Windows Dedicated | Linux Consumption | Linux Premium | Linux Dedicated |
218219
|-|:-----------------: |:----------------:|:-----------------:|:-----------------:|:-------------:|:---------------:|
219220
| C# | | | | | |
220221
| C# Script |||| |✔<sup>\*</sup> |✔<sup>\*</sup>|
221222
| F# | | | | | | |
222223
| Java | | | | | | |
223-
| JavaScript (Node.js) |||| |✔<sup>\*</sup>|✔<sup>\*</sup>|
224-
| Python | | | | | | |
224+
| JavaScript (Node.js) |||| |✔<sup>1</sup>|✔<sup>1</sup>|
225+
| Python<sup>2</sup> | | | ||✔<sup>1</sup> |✔<sup>1</sup> |
225226
| PowerShell |||| | | |
226227
| TypeScript (Node.js) | | | | | | |
227228

228-
<sup>*</sup> Portal editing is enabled only for HTTP and Timer triggers for Functions on Linux using Premium and Dedicated plans.
229+
<sup>1</sup> In-portal editing is enabled only for HTTP and Timer triggers for Functions on Linux using Premium and Dedicated plans.
230+
<sup>2</sup> In-portal editing is only supported for the [v1 Python programming model](functions-reference-python.md?pivots=python-mode-configuration).
229231

230232
## Deployment behaviors
231233

articles/azure-monitor/app/usage-overview.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Usage analysis with Application Insights | Azure Monitor
33
description: Understand your users and what they do with your app.
44
ms.topic: conceptual
5-
ms.date: 02/14/2023
5+
ms.date: 06/23/2023
66
ms.reviewer: mmcc
77
---
88

@@ -40,8 +40,8 @@ The **Users** and **Sessions** reports filter your data by pages or custom event
4040

4141
Insights on the right point out interesting patterns in the set of data.
4242

43-
* The **Users** report counts the numbers of unique users that access your pages within your chosen time periods. For web apps, users are counted by using cookies. If someone accesses your site with different browsers or client machines, or clears their cookies, they'll be counted more than once.
44-
* The **Sessions** report counts the number of user sessions that access your site. A session is a period of activity by a user. It's terminated by a period of inactivity of more than half an hour.
43+
* The **Users** report counts the numbers of unique users that access your pages within your chosen time periods. For web apps, users are counted by using cookies. If someone accesses your site with different browsers or client machines, or clears their cookies, they're counted more than once.
44+
* The **Sessions** report tabulates the number of user sessions that access your site. A session represents a period of activity initiated by a user and concludes with a period of inactivity exceeding half an hour.
4545

4646
For more information about the Users, Sessions, and Events tools, see [Users, sessions, and events analysis in Application Insights](usage-segmentation.md).
4747

@@ -61,9 +61,9 @@ For more information about the Retention workbook, see [User retention analysis
6161

6262
## Custom business events
6363

64-
To get a clear understanding of what users do with your app, it's useful to insert lines of code to log custom events. These events can track anything from detailed user actions, such as selecting specific buttons, to more significant business events, such as making a purchase or winning a game.
64+
To understand user interactions in your app, insert code lines to log custom events. These events track various user actions, like button selections, or important business events, such as purchases or game victories.
6565

66-
You can also use the [Click Analytics Auto-collection plug-in](javascript-feature-extensions.md) to collect custom events.
66+
You can also use the [Click Analytics Autocollection plug-in](javascript-feature-extensions.md) to collect custom events.
6767

6868
In some cases, page views can represent useful events, but it isn't true in general. A user can open a product page without buying the product.
6969

@@ -96,7 +96,7 @@ In the Users, Sessions, and Events tools, you can slice and dice custom events b
9696

9797
:::image type="content" source="./media/usage-overview/events.png" alt-text="Screenshot that shows the Events tab filtered by AnalyticsItemsOperation and split by AppID." lightbox="./media/usage-overview/events.png":::
9898

99-
Whenever you’re in any usage experience, click the **Open the last run query** icon to take you back to the underlying query.
99+
Whenever you’re in any usage experience, select the **Open the last run query** icon to take you back to the underlying query.
100100

101101
:::image type="content" source="./media/usage-overview/open-last-run-query-icon.png" alt-text="Screenshot of the Application Insights Session pane in the Azure portal. The Open the last run query icon is highlighted." lightbox="./media/usage-overview/open-last-run-query-icon.png":::
102102

@@ -125,9 +125,9 @@ When you design each feature of your app, consider how you're going to measure i
125125

126126
## A | B testing
127127

128-
If you don't know which variant of a feature will be more successful, release both and make each variant accessible to different users. Measure the success of each variant, and then move to a unified version.
128+
If you're unsure which feature variant is more successful, release both and let different users access each variant. Measure the success of each variant, and then transition to a unified version.
129129

130-
For this technique, you attach distinct property values to all the telemetry that's sent by each version of your app. You can do that step by defining properties in the active TelemetryContext. These default properties are added to every telemetry message that the application sends. That means the properties are added to your custom messages and the standard telemetry.
130+
In this technique, you attach unique property values to all the telemetry sent by each version of your app. You can do it by defining properties in the active TelemetryContext. These default properties get included in every telemetry message sent by the application. It includes both custom messages and standard telemetry.
131131

132132
In the Application Insights portal, filter and split your data on the property values so that you can compare the different versions.
133133

articles/azure-monitor/app/usage-retention.md

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Analyze web app user retention with Application Insights
33
description: This article shows you how to determine how many users return to your app.
44
ms.topic: conceptual
5-
ms.date: 07/30/2021
5+
ms.date: 06/23/2023
66
ms.reviewer: mmcc
77
---
88

@@ -36,23 +36,11 @@ Workbook capabilities:
3636

3737
## Use business events to track retention
3838

39-
To get the most useful retention analysis, measure events that represent significant business activities.
39+
You should measure events that represent significant business activities to get the most useful retention analysis.
4040

41-
For example, many users might open a page in your app without playing the game that it displays. Tracking only the page views would provide an inaccurate estimate of how many people returned to play the game after enjoying it previously. To get a clear picture of returning players, your app should send a custom event when a user actually plays.
41+
For more information and example code, see [Custom business events](usage-overview.md#custom-business-events).
4242

43-
It's good practice to code custom events that represent key business actions. Then you can use these events for your retention analysis. To capture the game outcome, you need to write a line of code to send a custom event to Application Insights. If you write it in the webpage code or in Node.JS, it looks like this example:
44-
45-
```JavaScript
46-
appinsights.trackEvent("won game");
47-
```
48-
49-
Or in ASP.NET server code:
50-
51-
```csharp
52-
telemetry.TrackEvent("won game");
53-
```
54-
55-
Learn more about [writing custom events](./api-custom-events-metrics.md#trackevent).
43+
To learn more, see [writing custom events](./api-custom-events-metrics.md#trackevent).
5644

5745
## Next steps
5846

articles/bastion/bastion-connect-vm-scale-set.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to connect to an Azure virtual machine scale set using Az
44
author: cherylmc
55
ms.service: bastion
66
ms.topic: how-to
7-
ms.date: 05/24/2022
7+
ms.date: 06/23/2023
88
ms.author: cherylmc
99

1010
---
@@ -35,10 +35,8 @@ This section shows you the basic steps to connect to your virtual machine scale
3535

3636
1. On the **Bastion** page, fill in the required settings. The settings you can select depend on the virtual machine to which you're connecting, and the [Bastion SKU](configuration-settings.md#skus) tier that you're using. The Standard SKU gives you more connection options than the Basic SKU. For more information about settings, see [Bastion configuration settings](configuration-settings.md).
3737

38-
:::image type="content" source="./media/bastion-connect-vm-scale-set/connection-settings.png" alt-text="Screenshot shows connection settings options with Open in new browser tab selected." lightbox="./media/bastion-connect-vm-scale-set/connection-settings.png":::
39-
4038
1. After filling in the values on the Bastion page, select **Connect** to connect to the instance.
4139

4240
## Next steps
4341

44-
Read the [Bastion FAQ](bastion-faq.md).
42+
Read the [Bastion FAQ](bastion-faq.md).

articles/bastion/connect-ip-address.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to connect to your virtual machines using a specified pri
55
author: cherylmc
66
ms.service: bastion
77
ms.topic: how-to
8-
ms.date: 04/26/2022
8+
ms.date: 06/26/2023
99
ms.author: cherylmc
1010

1111
---

articles/bastion/vnet-peering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how VNet peering and Azure Bastion can be used together to co
44
author: cherylmc
55
ms.service: bastion
66
ms.topic: conceptual
7-
ms.date: 12/06/2021
7+
ms.date: 06/23/2023
88
ms.author: cherylmc
99

1010
---

0 commit comments

Comments
 (0)