Skip to content

Commit 2c0858c

Browse files
authored
Merge pull request #276952 from MicrosoftDocs/main
Test main to live build
2 parents 71c51d3 + 6dddd3b commit 2c0858c

File tree

7 files changed

+18
-8
lines changed

7 files changed

+18
-8
lines changed

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ Each user message can translate to multiple search queries, all of which get sen
581581

582582
## Regional availability and model support
583583

584-
| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4 (0613)` | `gpt-4o` | `gpt-turbo (409)` |
584+
| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4 (0613)` | `gpt-4o` | `gpt-turbo (0409)` |
585585
|------|---|---|---|---|---|----|----|----|
586586
| Australia East ||||| || | |
587587
| Canada East ||||| || | |

articles/azure-app-configuration/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,5 +360,7 @@
360360
href: /Shows/Azure-Friday/How-Azure-App-Configuration-helps-developers-roll-out-new-features?ocid=AID747781&wt.mc_id=azfr-c9-scottha&wt.mc_id=CFID0553
361361
- name: Three reasons to use configuration snapshots
362362
href: https://aka.ms/appconfig/snapshotVideo
363+
- name: Five things you might not know about Azure App Configuration
364+
href: https://aka.ms/appconfig/fiveThingsVideo
363365
- name: Provide product feedback
364366
href: https://github.com/Azure/AppConfiguration/issues

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
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.
4-
ms.topic: Conceptual
4+
ms.topic: concept-article
55
ms.date: 01/23/2024
66
author: guywi-ms
77
ms.author: guywild

articles/azure-monitor/alerts/alerts-common-schema.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ For sample alerts that use the common schema, see [Sample alert payloads](alerts
109109
| resolvedDateTime | The date and time when the monitor condition for the alert instance is set to **Resolved** in UTC. Currently only applicable for metric alerts.|
110110
| description | The description, as defined in the alert rule. |
111111
|essentialsVersion| The version number for the essentials section.|
112-
|alertContextVersion | The version number for the `alertContext` section. |
112+
|alertContextVersion | The version number for the `alertContext` section.|
113+
|investigationLink | Link to investigate the alert in Azure Monitor. Currently requires limited preview registration.|
113114

114115

115116
## Alert context fields for metric alerts

articles/azure-monitor/alerts/alerts-create-log-alert-rule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Limitations for log search alert rule queries:
201201
|Field |Description |
202202
|---------|---------|
203203
|Enable upon creation| Select for the alert rule to start running as soon as you're done creating it.|
204-
|Automatically resolve alerts (preview) |Select to make the alert stateful. When an alert is stateful, the alert is resolved when the condition is no longer met for a specific time range. The time range differs based on the frequency of the alert:<br>**1 minute**: The alert condition isn't met for 10 minutes.<br>**5-15 minutes**: The alert condition isn't met for three frequency periods.<br>**15 minutes - 11 hours**: The alert condition isn't met for two frequency periods.<br>**11 to 12 hours**: The alert condition isn't met for one frequency period. <br><br>Note that stateful log search alerts have these limitations:<br> - they can trigger up to 300 alerts per evaluation.<br> - you can have a maximum of 5000 alerts with the `fired` alert condition.|
204+
|Automatically resolve alerts (preview) |Select to make the alert stateful. When an alert is stateful, the alert is resolved when the condition is no longer met for a specific time range. The time range differs based on the frequency of the alert:<br>**1 minute**: The alert condition isn't met for 10 minutes.<br>**5-15 minutes**: The alert condition isn't met for three frequency periods.<br>**15 minutes - 11 hours**: The alert condition isn't met for two frequency periods.<br>**11 to 12 hours**: The alert condition isn't met for one frequency period. <br><br>Note that stateful log search alerts have these [limitations](https://learn.microsoft.com/azure/azure-monitor/service-limits#alerts).|
205205
|Mute actions |Select to set a period of time to wait before alert actions are triggered again. If you select this checkbox, the **Mute actions for** field appears to select the amount of time to wait after an alert is fired before triggering actions again.|
206206
|Check workspace linked storage|Select if logs workspace linked storage for alerts is configured. If no linked storage is configured, the rule isn't created.|
207207

articles/azure-monitor/vm/vminsights-enable-policy.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,18 @@ ms.date: 07/09/2023
1515

1616
This article explains how to enable VM insights for Azure virtual machines, virtual machine scale sets, and hybrid virtual machines connected with Azure Arc by using predefined VM insights policy initiates.
1717

18-
> [!NOTE]
19-
> For information about how to use Azure Policy with Azure virtual machine scale sets and how to work with Azure Policy directly to enable Azure virtual machines, see [Deploy Azure Monitor at scale using Azure Policy](../best-practices.md).
2018

2119
## VM insights initiatives
2220
VM insights policy initiatives install Azure Monitor Agent and the Dependency agent on new virtual machines in your Azure environment. Assign these initiatives to a management group, subscription, or resource group to install the agents on Windows or Linux Azure virtual machines in the defined scope automatically.
2321

22+
> [!NOTE]
23+
> The VM Insights initiatives listed below don't update a Dependency Agent extension that already exists on your VM with Azure Monitoring Agent settings. Make sure to uninstall the Dependency Agent extension from your VM before deploying these initiatives.
24+
25+
Enable Azure Monitor for VMs with Azure Monitoring Agent
26+
Enable Azure Monitor for virtual machine scale sets with Azure Monitoring Agent
27+
Enable Azure Monitor for Hybrid VMs with Azure Monitoring Agent
28+
29+
2430
The initiatives apply to new machines you create and machines you modify, but not to existing VMs.
2531

2632
|Name |Description |

articles/communication-services/concepts/email/email-optout-management.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ ms.service: azure-communication-services
1515

1616
[!INCLUDE [Public Preview Notice](../../includes/public-preview-include-document.md)]
1717

18+
> [!IMPORTANT]
19+
> The functionality described in this article is only available in the latest Azure.ResourceManager.Communication SDK [beta versions](https://www.nuget.org/packages/Azure.ResourceManager.Communication/#versions-body-tab).
20+
1821
This article provides best practices for email delivery and describes how to use the Azure Communication Services email suppression list. This feature enables customers to manage opt-out capabilities for email communications.
1922

2023
This article also provides information about the features that are important for email opt-out management. Use these features to improve email compliance management, promote better email practices, increase your email delivery success, and boost the likelihood of reaching recipient inboxes.
@@ -59,8 +62,6 @@ These benefits contribute to a more efficient, compliant, and user-friendly emai
5962

6063
## Next steps
6164

62-
* [Create and manage a domain-level suppression list in Azure Communication Services](../../quickstarts/email/manage-suppression-list-management-sdks.md)
63-
6465
The following topics might be interesting to you:
6566

6667
* Familiarize yourself with the [email client library](../email/sdk-features.md).

0 commit comments

Comments
 (0)