Skip to content

Commit 05643a7

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into afdfreshness
2 parents 05ac625 + 525074b commit 05643a7

File tree

17 files changed

+91
-33
lines changed

17 files changed

+91
-33
lines changed

articles/azure-functions/functions-reference-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ To view the library for your Python version, go to:
14821482

14831483
### Azure Functions Python worker dependencies
14841484

1485-
The Azure Functions Python worker requires a specific set of libraries. You can also use these libraries in your functions, but they aren't a part of the Python standard. If your functions rely on any of these libraries, they might be unavailable to your code when it's running outside of Azure Functions. You'll find a detailed list of dependencies in the "install\_requires" section of the [*setup.py*](https://github.com/Azure/azure-functions-python-worker/blob/dev/setup.py#L282) file.
1485+
The Azure Functions Python worker requires a specific set of libraries. You can also use these libraries in your functions, but they aren't a part of the Python standard. If your functions rely on any of these libraries, they might be unavailable to your code when it's running outside of Azure Functions.
14861486

14871487
> [!NOTE]
14881488
> If your function app's *requirements.txt* file contains an `azure-functions-worker` entry, remove it. The functions worker is automatically managed by the Azure Functions platform, and we regularly update it with new features and bug fixes. Manually installing an old version of worker in the *requirements.txt* file might cause unexpected issues.

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@ title: Autoinstrumentation for Azure Monitor Application Insights
33
description: Overview of autoinstrumentation for Azure Monitor Application Insights codeless application performance management.
44
ms.topic: conceptual
55
ms.custom: devx-track-js
6-
ms.date: 12/15/2023
6+
ms.date: 08/12/2024
77
ms.reviewer: abinetabate
88
---
99

1010
# What is autoinstrumentation for Azure Monitor Application Insights?
1111

1212
Autoinstrumentation enables [Application Insights](app-insights-overview.md) to make [telemetry](data-model-complete.md) like metrics, requests, and dependencies available in your [Application Insights resource](create-workspace-resource.md). It provides easy access to experiences such as the [application dashboard](overview-dashboard.md) and [application map](app-map.md).
1313

14-
If your language and platform are supported, select the corresponding link in the [Supported environments, languages, and resource providers table](#supported-environments-languages-and-resource-providers) for more detailed information. In many cases, autoinstrumentation is enabled by default.
14+
The term "autoinstrumentation" is a portmanteau, a linguistic blend where parts of multiple words combine into a new word. "Autoinstrumentation" combines "auto" and "instrumentation." It sees widespread use in software observability and describes the process of adding instrumentation code to applications without manual coding by developers.
15+
16+
The autoinstrumentation process varies by language and platform, but often involves a toggle button in the Azure portal. The following example shows a toggle button for [Azure App Service](../../app-service/getting-started.md#getting-started-with-azure-app-service) autoinstrumentation.
17+
18+
:::image type="content"source="./media/azure-web-apps/enable.png" alt-text=" Screenshot that shows the Application Insights tab with Enable selected." lightbox="./media/azure-web-apps/enable.png":::
19+
20+
> [!TIP]
21+
> *We do not provide autoinstrumentation specifics for all languages and platforms in this article.* For detailed information, select the corresponding link in the [Supported environments, languages, and resource providers table](#supported-environments-languages-and-resource-providers). In many cases, autoinstrumentation is enabled by default.
1522
1623
## What are the autoinstrumentation advantages?
1724

@@ -28,7 +35,7 @@ The following table shows the current state of autoinstrumentation availability.
2835
Links are provided to more information for each supported scenario.
2936

3037
> [!NOTE]
31-
> If your hosting environment or resource provider is not listed in the following table, autoinstrumentation is not supported. You can manually instrument your code using Application Insights SDKs or Azure Monitor OpenTelemetry Distros. For more information, see [Data Collection Basics of Azure Monitor Application Insights](opentelemetry-overview.md).
38+
> If your hosting environment or resource provider is not listed in the following table, then autoinstrumentation is not supported. In this case, we recoomend manually instrumenting using the [Azure Monitor OpenTelemetry Distro](opentelemetry-enable.md). For more information, see [Data Collection Basics of Azure Monitor Application Insights](opentelemetry-overview.md).
3239
3340
|Environment/Resource provider | .NET Framework | .NET Core / .NET | Java | Node.js | Python |
3441
|-------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|
@@ -52,18 +59,13 @@ Links are provided to more information for each supported scenario.
5259
> [!NOTE]
5360
> Autoinstrumentation was known as "codeless attach" before October 2021.
5461
55-
## JavaScript (Web) SDK Loader Script injection by configuration
56-
57-
When using supported Software Development Kits (SDKs), you can enable SDK injection in configuration to automatically inject JavaScript (Web) SDK Loader Script onto each page.
62+
## Frequently asked questions
5863

64+
#### Should the term "autoinstrumentation" be hyphenated?
5965

60-
| Language
61-
| :--- |
62-
| [ASP.NET Core](./asp-net-core.md?tabs=netcorenew%2Cnetcore6#enable-client-side-telemetry-for-web-applications) |
63-
| [Node.js](./nodejs.md#browser-sdk-loader) |
64-
| [Java](./java-standalone-config.md#browser-sdk-loader-preview) |
66+
We follow the [Microsoft Style Guide](/style-guide/punctuation/dashes-hyphens/hyphens#prefixes) for product documentation published to the [Microsoft Learn](/) platform.
6567

66-
For other methods to instrument your application with the Application Insights JavaScript SDK, see [Get started with the JavaScript SDK](./javascript-sdk.md).
68+
In general, we don’t include a hyphen after the "auto" prefix.
6769

6870
## Next steps
6971

articles/azure-monitor/app/javascript-sdk.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ We provide the [Debug plugin](https://github.com/microsoft/ApplicationInsights-J
3434
Follow the steps in this section to instrument your application with the Application Insights JavaScript SDK.
3535

3636
> [!TIP]
37-
> Good news! We're making it even easier to enable JavaScript. Check out where [JavaScript (Web) SDK Loader Script injection by configuration is available](./codeless-overview.md#javascript-web-sdk-loader-script-injection-by-configuration)!
37+
> Good news! We're making it even easier to enable JavaScript with JavaScript (Web) SDK Loader Script injection by configuration.
38+
>
39+
> - [ASP.NET Core](./asp-net-core.md?tabs=netcorenew%2Cnetcore6#enable-client-side-telemetry-for-web-applications)
40+
> - [Node.js](./nodejs.md#browser-sdk-loader)
41+
> - [Java](./java-standalone-config.md#browser-sdk-loader-preview)
3842
3943
### Add the JavaScript code
4044

articles/azure-monitor/includes/azure-monitor-app-insights-opentelemetry-faqs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ The following chart breaks out OpenTelemetry feature support for each language.
101101
| Filter requests, dependencies, logs, and exceptions by anonymous user ID and synthetic source | :x: | :x: | :x: | :white_check_mark: |
102102
| Filter dependencies, logs, and exceptions by operation name | :x: | :x: | :x: | :white_check_mark: |
103103
| [Adaptive sampling](../app/sampling.md#adaptive-sampling) | :x: | :x: | :x: | :white_check_mark: |
104-
| [Profiler](../profiler/profiler-overview.md) | :white_check_mark: | :x: | :x: | :warning: |
105-
| [Snapshot Debugger](../snapshot-debugger/snapshot-debugger.md) | :white_check_mark: | :x: | :x: | :x: |
104+
| [Profiler](../profiler/profiler-overview.md) | :x: | :x: | :x: | :warning: |
105+
| [Snapshot Debugger](../snapshot-debugger/snapshot-debugger.md) | :x: | :x: | :x: | :x: |
106106

107107
**Key**
108108
- :white_check_mark: This feature is available to all customers with formal support.

articles/azure-netapp-files/azure-netapp-files-resource-limits.md

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,38 @@ You can create an Azure support request to increase the adjustable limits from t
6363
>[!NOTE]
6464
> Depending on available resources in the region and the limit increase requested, Azure support may require additional information in order to determine the feasibility of the request.
6565
66-
1. Go to **New Support Request** under **Support + troubleshooting**.
66+
1. Navigate to **Help** then **Support + troubleshooting**.
67+
1. Under the **How can we help you** heading, enter "regional capacity quota" in the text field then select **Go**.
6768

68-
2. Under the **Problem description** tab, provide the required information:
69+
:::image type="content" source="./media/azure-netapp-files-resource-limits/support-how-can-we-help.png" alt-text="Screenshot that shows the How can we help heading." lightbox="./media/azure-netapp-files-resource-limits/support-how-can-we-help.png":::
70+
71+
1. Under the **Current selection** heading, search for "Azure NetApp Files" in the text field for **Which service are you having an issue with?**.
72+
1. Select **Azure NetApp Files** then **Next**.
73+
74+
:::image type="content" source="./media/azure-netapp-files-resource-limits/support-service.png" alt-text="Screenshot of choosing a service option." lightbox="./media/azure-netapp-files-resource-limits/support-service.png":::
75+
76+
1. Under **Which resource are you having an issue with?**, locate and select your subscription. Then locate and select your resource (the NetApp account).
77+
78+
:::image type="content" source="./media/azure-netapp-files-resource-limits/support-resource.png" alt-text="Screenshot with the option to select your subscription and resource." lightbox="./media/azure-netapp-files-resource-limits/support-resource.png":::
79+
80+
1. Under **Are you having one of the following issues?**, select **Storage: Azure NetApp Files limits** then **Next**.
81+
82+
:::image type="content" source="./media/azure-netapp-files-resource-limits/support-issue.png" alt-text="Screenshot showing the option to choose Azure NetApp Files limits as an issue." lightbox="./media/azure-netapp-files-resource-limits/support-issue.png":::
83+
84+
1. Select **Create a support request**.
85+
86+
1. Under the **Problem description** tab, provide the required information:
6987
1. For **Issue Type**, select **Service and Subscription Limits (Quotas)**.
7088
2. For **Subscription**, select your subscription.
7189
3. For **Quota Type**, select **Storage: Azure NetApp Files limits**.
7290

7391
![Screenshot that shows the Problem Description tab.](./media/shared/support-problem-descriptions.png)
74-
75-
3. Under the **Additional details** tab, select **Enter details** in the Request Details field.
92+
93+
1. Under the **Additional details** tab, select **Enter details** in the Request Details field.
7694

7795
![Screenshot that shows the Details tab and the Enter Details field.](./media/shared/quota-additional-details.png)
7896

79-
4. To request limit increase, provide the following information in the Quota Details window that appears:
97+
1. To request limit increase, provide the following information in the Quota Details window that appears:
8098
1. In **Quota Type**, select the type of resource you want to increase.
8199
For example:
82100
* *Regional Capacity Quota per Subscription (TiB)*
@@ -90,7 +108,7 @@ You can create an Azure support request to increase the adjustable limits from t
90108

91109
![Screenshot that shows how to display and request increase for regional quota.](./media/azure-netapp-files-resource-limits/quota-details-regional-request.png)
92110

93-
5. Select **Save and continue**. Select **Review + create** to create the request.
111+
1. Select **Save and continue**. Select **Review + create** to create the request.
94112

95113
## Next steps
96114

142 KB
Loading
222 KB
Loading
169 KB
Loading
136 KB
Loading

articles/cost-management-billing/costs/understand-cost-mgt-data.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Microsoft Cost Management
44
description: This article helps you better understand data included in Cost Management. It also explains how frequently data is processed, collected, shown, and closed.
55
author: bandersmsft
66
ms.author: banders
7-
ms.date: 06/04/2024
7+
ms.date: 08/12/2024
88
ms.topic: conceptual
99
ms.service: cost-management-billing
1010
ms.subservice: cost-management
@@ -13,7 +13,7 @@ ms.reviewer: micflan
1313

1414
# Understand Cost Management data
1515

16-
This article helps you better understand Azure cost and usage data included in Cost Management. It explains how frequently data is processed, collected, shown, and closed. You're billed for Azure usage monthly. Although billing cycles are monthly periods, cycle start and end dates vary by subscription type. How often Cost Management receives usage data varies based on different factors. Such factors include how long it takes to process the data and how frequently Azure services emit usage to the billing system.
16+
This article helps you better understand Azure cost and usage data included in Cost Management. It explains how frequently data is processed, collected, shown, and closed. You receive a bill for your Azure usage each month. Although billing cycles are monthly periods, cycle start and end dates vary by subscription type. How often Cost Management receives usage data varies based on different factors. Such factors include how long it takes to process the data and how frequently Azure services emit usage to the billing system.
1717

1818
Cost Management includes all usage and purchases, including commitment discounts (that is, reservations and savings plans) and third-party offerings, for Enterprise Agreement (EA) and Microsoft Customer Agreement (MCA) accounts. Microsoft Online Services Agreement (MOSA) accounts only include usage from Azure and Marketplace services with applicable commitment discounts applied but don't include Marketplace or commitment discounts purchases. Support and other costs aren't included. Costs are estimated until an invoice is generated and don't factor in credits. Cost Management also includes costs associated with New Commerce products like Microsoft 365 and Dynamics 365 that are invoiced along with Azure.
1919

@@ -161,7 +161,14 @@ Costs shown in Cost Management are rounded. Costs returned by the Query API aren
161161

162162
## Historical data might not match invoice
163163

164-
Historical data for credit-based and pay-in-advance offers might not match your invoice. Some Azure pay-as-you-go, MSDN, and Visual Studio offers can have Azure credits and advanced payments applied to the invoice. The historical data shown in Cost Management is based on your estimated consumption charges only. Cost Management historical data doesn't include payments and credits. Historical data shown for the following offers might not match exactly with your invoice.
164+
Historical data for credit-based and pay-in-advance offers might not match your invoice. Some Azure pay-as-you-go, MSDN, and Visual Studio offers can have Azure credits and advanced payments applied to the invoice. The historical data (closed month data) shown in Cost Management is based on your estimated consumption charges only. For the following listed offers, Cost Management historical data doesn't include payments and credits. Additionally, price changes might affect it. *The price shown on your invoice might differ from the price used for cost estimation.*
165+
166+
For example, you get invoiced on January 5 for a service consumed in the month of December. It has a price of $86 per unit. On January 1, the unit price changed to $100. When you view your estimated charges in Cost Management, you see that your cost is the result of your consumed quantity * $100 (not $86, as shown in your invoice).
167+
168+
>[!NOTE]
169+
>The price change might result in a a price decrease, not only an increase, as explained in this example.
170+
171+
Historical data shown for the following offers might not match exactly with your invoice.
165172

166173
- Azure for Students (MS-AZR-0170P)
167174
- Azure in Open (MS-AZR-0111P)

0 commit comments

Comments
 (0)