Skip to content

Commit 25e0cee

Browse files
authored
Merge branch 'main' into tutorial-site-to-site-portal
2 parents 607f423 + 2362557 commit 25e0cee

File tree

113 files changed

+1254
-384
lines changed

Some content is hidden

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

113 files changed

+1254
-384
lines changed

articles/azure-monitor/agents/data-collection-iis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Collect IIS logs with Azure Monitor Agent
33
description: Configure collection of Internet Information Services (IIS) logs on virtual machines with Azure Monitor Agent.
44
ms.topic: how-to
5-
ms.date: 07/19/2022
5+
ms.date: 01/19/2024
66
author: guywi-ms
77
ms.author: guywild
88
ms.reviewer: jeffwo

articles/azure-monitor/app/asp-net-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Monitor ASP.NET Core web applications for availability, performance
44
ms.topic: conceptual
55
ms.devlang: csharp
66
ms.custom: devx-track-csharp
7-
ms.date: 11/15/2023
7+
ms.date: 01/31/2024
88
ms.reviewer: mmcc
99
---
1010
# Application Insights for ASP.NET Core applications

articles/azure-monitor/app/asp-net.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure monitoring for ASP.NET with Azure Application Insights | Microsoft Docs
33
description: Configure performance, availability, and user behavior analytics tools for your ASP.NET website hosted on-premises or in Azure.
44
ms.topic: conceptual
5-
ms.date: 11/15/2023
5+
ms.date: 01/31/2024
66
ms.devlang: csharp
77
ms.custom: contperf-fy21q1
88
---

articles/azure-monitor/app/get-metric.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Get-Metric in Azure Monitor Application Insights
33
description: Learn how to effectively use the GetMetric() call to capture locally pre-aggregated metrics for .NET and .NET Core applications with Azure Monitor Application Insights.
44
ms.service: azure-monitor
55
ms.topic: conceptual
6-
ms.date: 04/05/2023
6+
ms.date: 01/31/2024
77
ms.devlang: csharp
88
ms.custom: devx-track-dotnet
99
ms.reviewer: mmcc

articles/azure-monitor/app/ilogger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Application Insights logging with .NET
33
description: Learn how to use Application Insights with the ILogger interface in .NET.
44
ms.topic: conceptual
5-
ms.date: 08/11/2023
5+
ms.date: 01/31/2024
66
ms.devlang: csharp
77
ms.custom: devx-track-dotnet
88
ms.reviewer: mmcc

articles/azure-monitor/app/worker-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Monitoring .NET Core/.NET Framework non-HTTP apps with Azure Monito
44
ms.topic: conceptual
55
ms.devlang: csharp
66
ms.custom: devx-track-csharp, devx-track-dotnet
7-
ms.date: 09/12/2023
7+
ms.date: 01/31/2024
88
ms.reviewer: cithomas
99
---
1010

articles/azure-netapp-files/faq-security.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ NFSv3 protocol doesn't provide support for encryption, so this data-in-flight ca
2323

2424
All Azure NetApp Files volumes are encrypted using the FIPS 140-2 standard. Learn [how encryption keys managed](#how-are-encryption-keys-managed).
2525

26-
## Is Azure NetApp Files cross-region replication traffic encrypted?
26+
## Is Azure NetApp Files cross-region and cross-zone replication traffic encrypted?
2727

28-
Azure NetApp Files cross-region replication uses TLS 1.2 AES-256 GCM encryption to encrypt all data transferred between the source volume and destination volume. This encryption is in addition to the [Azure MACSec encryption](../security/fundamentals/encryption-overview.md) that is on by default for all Azure traffic, including Azure NetApp Files cross-region replication.
28+
Azure NetApp Files cross-region and cross-zone replication uses TLS 1.2 AES-256 GCM encryption to encrypt all data transferred between the source volume and destination volume. This encryption is in addition to the [Azure MACSec encryption](../security/fundamentals/encryption-overview.md) that is on by default for all Azure traffic, including Azure NetApp Files cross-region and cross-zone replication.
2929

3030
## How are encryption keys managed?
3131

3232
By default key management for Azure NetApp Files is handled by the service, using [platform-managed keys](../security/fundamentals/key-management.md). A unique XTS-AES-256 data encryption key is generated for each volume. An encryption key hierarchy is used to encrypt and protect all volume keys. These encryption keys are never displayed or reported in an unencrypted format. When you delete a volume, Azure NetApp Files immediately deletes the volume's encryption keys.
3333

34-
Alternatively, [customer-managed keys for Azure NetApp Files volume encryption](configure-customer-managed-keys.md) can be used where keys are stored in [Azure Key Vault](../key-vault/general/basic-concepts.md). With customer-managed keys, you can fully manage the relationship between a key's life cycle, key usage permissions, and auditing operations on keys.
34+
Alternatively, [customer-managed keys for Azure NetApp Files volume encryption](configure-customer-managed-keys.md) can be used where keys are stored in [Azure Key Vault](../key-vault/general/basic-concepts.md). With customer-managed keys, you can fully manage the relationship between a key's life cycle, key usage permissions, and auditing operations on keys. The feature is generally available (GA) in [supported regions](configure-customer-managed-keys.md#supported-regions).
3535

36-
Lastly, customer-managed keys using Azure Dedicated HSM is supported on a controlled basis. Support is currently available in the East US, South Central US, West US 2, and US Gov Virginia regions. You can request access at [[email protected]](mailto:[email protected]). As capacity becomes available, requests will be approved.
36+
Also, customer-managed keys using Azure Dedicated HSM is supported on a controlled basis. Support is currently available in the East US, South Central US, West US 2, and US Gov Virginia regions. You can request access at [[email protected]](mailto:[email protected]). As capacity becomes available, requests will be approved.
3737

3838
## Can I configure the NFS export policy rules to control access to the Azure NetApp Files service mount target?
3939

articles/event-grid/event-schema-service-bus.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ This article provides the properties and schema for Service Bus events. For an
2020
| [Tutorial: Azure Service Bus to Azure Event Grid integration examples](../service-bus-messaging/service-bus-to-event-grid-integration-example.md?toc=%2fazure%2fevent-grid%2ftoc.json) | Event Grid sends messages from Service Bus topic to function app and logic app. |
2121
| [Azure Service Bus to Event Grid integration](../service-bus-messaging/service-bus-to-event-grid-integration-concept.md) | Overview of integrating Service Bus with Event Grid. |
2222

23+
> [!NOTE]
24+
> When a failover occurs for a Service Bus namespace that's Geo-DR enabled, the secondary namespace doesn't emit events to Event Grid. You need to manually add the Event Grid subscription for the secondary namespace.
25+
2326
## Next steps
2427

2528
* For an introduction to Azure Event Grid, see [What is Event Grid?](overview.md)

articles/event-grid/handler-service-bus.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ For more information, see [Custom delivery properties](delivery-properties.md).
204204
}
205205
```
206206

207+
> [!NOTE]
208+
> When a failover occurs for a Service Bus namespace that's Geo-DR enabled, the secondary namespace doesn't emit events to Event Grid. You need to manually add the Event Grid subscription for the secondary namespace.
207209
208210
## Next steps
209211
See the [Event handlers](event-handlers.md) article for a list of supported event handlers.

articles/healthcare-apis/dicom/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ items:
8484
- name: DICOM service open-source projects
8585
href: references-for-dicom-service.md
8686
- name: FAQ
87-
href: dicom-services-faqs.yml
87+
href: dicom-services-faqs.yml

0 commit comments

Comments
 (0)