Skip to content

Commit 7695ab0

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into afdfreshness1
2 parents aeef866 + 9a099d5 commit 7695ab0

File tree

17 files changed

+313
-173
lines changed

17 files changed

+313
-173
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4805,6 +4805,11 @@
48054805
"redirect_url": "/azure/vpn-gateway/about-site-to-site-tunneling",
48064806
"redirect_document_id": false
48074807
},
4808+
{
4809+
"source_path_from_root": "/articles/vpn-gateway/openvpn-azure-ad-tenant-multi-app.md",
4810+
"redirect_url": "/azure/vpn-gateway/point-to-site-entra-users-access",
4811+
"redirect_document_id": false
4812+
},
48084813
{
48094814
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-multi-site-to-site-resource-manager-portal.md",
48104815
"redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",

articles/app-service/overview-tls.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,6 @@ To ensure backward compatibility for TLS 1.0 and TLS 1.1, App Service will conti
5555
5656
The minimum TLS cipher suite includes a fixed list of cipher suites with an optimal priority order that you cannot change. Reordering or reprioritizing the cipher suites is not recommended as it could expose your web apps to weaker encryption. You also cannot add new or different cipher suites to this list. When you select a minimum cipher suite, the system automatically disables all less secure cipher suites for your web app, without allowing you to selectively disable only some weaker cipher suites.
5757

58-
Follow these steps to change the Minimum TLS cipher suite:
59-
1. Browse to your app in the [Azure portal](https://portal.azure.com/)
60-
1. In the left menu, select **configuration** and then select the **General settings** tab.
61-
1. Under __Minimum Inbound TLS Cipher Suite__, select **change**, and then select the **Minimum TLS Cipher Suite**.
62-
1. Select **Ok**.
63-
1. Select **Save** to save the changes.
64-
6558
### What are cipher suites and how do they work on App Service?
6659

6760
A cipher suite is a set of instructions that contains algorithms and protocols to help secure network connections between clients and servers. By default, the front-end's OS would pick the most secure cipher suite that is supported by both App Service and the client. However, if the client only supports weak cipher suites, then the front-end's OS would end up picking a weak cipher suite that is supported by them both. If your organization has restrictions on what cipher suites should not be allowed, you may update your web app’s minimum TLS cipher suite property to ensure that the weak cipher suites would be disabled for your web app.
@@ -72,13 +65,7 @@ For App Service Environments with `FrontEndSSLCipherSuiteOrder` cluster setting,
7265

7366
## End-to-end TLS Encryption (preview)
7467

75-
End-to-end (E2E) TLS encryption is available in Standard App Service plans and higher. Front-end intra-cluster traffic between App Service front-ends and the workers running application workloads can now be encrypted. Below is a simple diagram to help you understand how it works.
76-
77-
Follow these steps to enable end-to-end TLS encryption:
78-
1. Browse to your app in the [Azure portal](https://portal.azure.com/)
79-
1. In the left menu, select **configuration** and then select the **General settings** tab.
80-
1. Under __End-to-end TLS encryption__, select **on**.
81-
1. Save the changes.
68+
End-to-end (E2E) TLS encryption is available in Standard App Service plans and higher. Front-end intra-cluster traffic between App Service front-ends and the workers running application workloads can now be encrypted.
8269

8370
## Next steps
8471
* [Secure a custom DNS name with a TLS/SSL binding](configure-ssl-bindings.md)

articles/azure-arc/servers/agent-release-notes.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: What's new with Azure Connected Machine agent
33
description: This article has release notes for Azure Connected Machine agent. For many of the summarized issues, there are links to more details.
44
ms.topic: overview
5-
ms.date: 07/16/2024
5+
ms.date: 08/12/2024
66
ms.custom: references_regions
77
---
88

@@ -20,12 +20,26 @@ This page is updated monthly, so revisit it regularly. If you're looking for ite
2020
> Only Connected Machine agent versions within the last 1 year are officially supported by the product group. Customers should update to an agent version within this window.
2121
>
2222
23-
## Version 1.44 - July 2024
23+
## Version 1.45 - August 2024
2424

2525
Download for [Windows](https://aka.ms/AzureConnectedMachineAgent) or [Linux](manage-agent.md#installing-a-specific-version-of-the-agent)
2626

2727
### Fixed
2828

29+
- Fixed an issue where EnableEnd telemetry would sometimes be sent too soon.
30+
- Added sending a failed timed-out EnableEnd telemetry log if extension takes longer than the allowed time to complete.
31+
32+
### New features
33+
34+
- Azure Arc proxy now supports HTTP traffic.
35+
- Mew proxy.bypass value 'AMA' added to support AMA VM extension proxy bypass.
36+
37+
## Version 1.44 - July 2024
38+
39+
Download for [Windows](https://download.microsoft.com/download/d/a/f/daf3cc3e-043a-430a-abae-97142323d4d7/AzureConnectedMachineAgent.msi) or [Linux](manage-agent.md#installing-a-specific-version-of-the-agent)
40+
41+
### Fixed
42+
2943
- Fixed a bug where the service would sometimes reject reports from an upgraded extension if the previous extension was in a failed state.
3044
- Setting OPENSSL_CNF environment at process level to override build openssl.cnf path on Windows.
3145
- Fixed access denied errors in writing configuration files.

articles/azure-functions/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@
600600
displayName: upgrade, migrate, language stack
601601
- name: Monitor
602602
items:
603-
- name: Monitoring options
603+
- name: Monitor Azure Functions
604604
href: monitor-functions.md
605605
displayName: monitor metrics
606606
- name: Monitor function executions

articles/azure-functions/functions-app-settings.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ The instrumentation key for Application Insights. Don't use both `APPINSIGHTS_IN
5656

5757
Don't use both `APPINSIGHTS_INSTRUMENTATIONKEY` and `APPLICATIONINSIGHTS_CONNECTION_STRING`. Use of `APPLICATIONINSIGHTS_CONNECTION_STRING` is recommended.
5858

59-
[!INCLUDE [azure-monitor-log-analytics-rebrand](~/reusable-content/ce-skilling/azure/includes/azure-monitor-instrumentation-key-deprecation.md)]
60-
6159
## APPLICATIONINSIGHTS_AUTHENTICATION_STRING
6260

6361
Enables access to Application Insights by using Microsoft Entra authentication. Use this setting when you must connect to your Application Insights workspace by using Microsoft Entra authentication. For more information, see [Microsoft Entra authentication for Application Insights](../azure-monitor/app/azure-ad-authentication.md).

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The following table lists the metrics available for the Microsoft.Web/sites reso
5353
>These metrics aren't available when your function app runs on Linux in a [Consumption plan](./consumption-plan.md).
5454
5555
[!INCLUDE [horz-monitor-ref-metrics-tableheader](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-tableheader.md)]
56-
[!INCLUDE [Microsoft.Web/sites](~/azure-reference-other-repo/azure-monitor-ref/supported-metrics/includes/microsoft-web-sites-metrics-include.md)]
56+
[!INCLUDE [Microsoft.Web/sites](~/reusable-content/ce-skilling/azure/includes/azure-monitor/reference/metrics/microsoft-web-sites-metrics-include.md)]
5757

5858
[!INCLUDE [horz-monitor-ref-metrics-dimensions-intro](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-dimensions-intro.md)]
5959

@@ -62,7 +62,7 @@ The following table lists the metrics available for the Microsoft.Web/sites reso
6262
[!INCLUDE [horz-monitor-ref-resource-logs](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-resource-logs.md)]
6363

6464
### Supported resource logs for Microsoft.Web/sites
65-
[!INCLUDE [Microsoft.Web/sites](~/azure-reference-other-repo/azure-monitor-ref/supported-logs/includes/microsoft-web-sites-logs-include.md)]
65+
[!INCLUDE [Microsoft.Web/sites](~/reusable-content/ce-skilling/azure/includes/azure-monitor/reference/logs/microsoft-web-sites-logs-include.md)]
6666

6767
The log specific to Azure Functions is **FunctionAppLogs**.
6868

articles/azure-functions/monitor-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.service: azure-functions
1919
Azure Functions offers built-in integration with Application Insights to monitor functions executions. For detailed information about how to integrate, configure, and use Application Insights to monitor Azure Functions, see the following articles:
2020

2121
- [Monitor executions in Azure Functions](functions-monitoring.md)
22-
- [How to configure monitoring for Azure Functions](configure-monitoring.md)
22+
- [Configure monitoring for Azure Functions](configure-monitoring.md)
2323
- [Analyze Azure Functions telemetry in Application Insights](analyze-telemetry-data.md).
2424
- [Monitor Azure Functions with Application Insights](/azure/azure-monitor/app/monitor-functions)
2525

articles/azure-monitor/essentials/metrics-custom-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ In general, there's no cost to ingest standard metrics (platform metrics) into a
3131
Custom metrics are retained for the [same amount of time as platform metrics](../essentials/data-platform-metrics.md#retention-of-metrics).
3232

3333
> [!NOTE]
34-
> Metrics sent to Azure Monitor via the Application Insights SDK are billed as ingested log data. They incur additional metrics charges only if the Application Insights feature [Enable alerting on custom metric dimensions](../app/pre-aggregated-metrics-log-metrics.md#custom-metrics-dimensions-and-preaggregation) has been selected. This checkbox sends data to the Azure Monitor metrics database by using the custom metrics API to allow the more complex alerting. Learn more about the [Application Insights pricing model](../cost-usage.md) and [prices in your region](https://azure.microsoft.com/pricing/details/monitor/).
34+
> Metrics sent to Azure Monitor via the Application Insights SDK are billed as ingested log data.
3535
3636
## Custom metric definitions
3737

Loading
-716 Bytes
Loading

0 commit comments

Comments
 (0)