Skip to content

Commit f744409

Browse files
authored
Merge pull request #278684 from MicrosoftDocs/main
6/19/2024 AM Publish
2 parents fa93e8e + de6cdcd commit f744409

File tree

68 files changed

+528
-392
lines changed

Some content is hidden

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

68 files changed

+528
-392
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,11 @@
11351135
"redirect_url": "/azure/container-instances/container-instances-multi-container-group",
11361136
"redirect_document_id": false
11371137
},
1138+
{
1139+
"source_path_from_root": "/articles/container-instances/container-instances-monitor.md",
1140+
"redirect_url": "/azure/container-instances/monitor-azure-container-instances",
1141+
"redirect_document_id": false
1142+
},
11381143
{
11391144
"source_path_from_root": "/articles/cassandra-managed-instance/compare-cosmosdb-managed-instance.md",
11401145
"redirect_url": "/azure/managed-instance-apache-cassandra/compare-cosmosdb-managed-instance",

articles/ai-services/openai/concepts/model-retirements.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about the model deprecations and retirements in Azure OpenAI.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 06/04/2024
7+
ms.date: 06/19/2024
88
ms.custom:
99
manager: nitinme
1010
author: mrbullwinkle
@@ -60,11 +60,11 @@ These models are currently available for use in Azure OpenAI Service.
6060

6161
| Model | Version | Retirement date |
6262
| ---- | ---- | ---- |
63-
| `gpt-35-turbo` | 0301 | No earlier than August 1, 2024 |
64-
| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | No earlier than August 1, 2024 |
63+
| `gpt-35-turbo` | 0301 | No earlier than October 1, 2024 |
64+
| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | October 1, 2024 |
6565
| `gpt-35-turbo` | 1106 | No earlier than Nov 17, 2024 |
6666
| `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 |
67-
| `gpt-4`<br>`gpt-4-32k` | 0314 | No earlier than July 13, 2024 |
67+
| `gpt-4`<br>`gpt-4-32k` | 0314 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 |
6868
| `gpt-4`<br>`gpt-4-32k` | 0613 | No earlier than Sep 30, 2024 |
6969
| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later **<sup>1</sup>** |
7070
| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on July 15, 2024, or later **<sup>1</sup>** |
@@ -116,6 +116,12 @@ If you're an existing customer looking for information about these models, see [
116116

117117
## Retirement and deprecation history
118118

119+
## June 19, 2024
120+
121+
* Updated `gpt-35-turbo` 0301 retirement date to no earlier than October 1, 2024.
122+
* Updated `gpt-35-turbo` & `gpt-35-turbo-16k`0613 retirement date to October 1, 2024.
123+
* Updated `gpt-4` & `gpt-4-32k` 0314 deprecation date to October 1, 2024, and retirement date to June 6, 2025.
124+
119125
### June 4, 2024
120126

121127
Retirement date for legacy models updated by one month.

articles/ai-services/openai/concepts/models.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about the different model capabilities that are available with Azure OpenAI.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 05/13/2024
7+
ms.date: 06/19/2024
88
ms.custom: references_regions, build-2023, build-2023-dataai, refefences_regions
99
manager: nitinme
1010
author: mrbullwinkle #ChrisHMSFT
@@ -14,7 +14,7 @@ recommendations: false
1414

1515
# Azure OpenAI Service models
1616

17-
Azure OpenAI Service is powered by a diverse set of models with different capabilities and price points. Model availability varies by region. For GPT-3 and other models retiring in July 2024, see [Azure OpenAI Service legacy models](./legacy-models.md).
17+
Azure OpenAI Service is powered by a diverse set of models with different capabilities and price points. Model availability varies by region.
1818

1919
| Models | Description |
2020
|--|--|
@@ -75,9 +75,6 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
7575
> [!CAUTION]
7676
> We don't recommend using preview models in production. We will upgrade all deployments of preview models to either future preview versions or to the latest stable/GA version. Models designated preview do not follow the standard Azure OpenAI model lifecycle.
7777
78-
> [!NOTE]
79-
> Version `0314` of `gpt-4` and `gpt-4-32k` will be retired no earlier than July 5, 2024. Version `0613` of `gpt-4` and `gpt-4-32k` will be retired no earlier than September 30, 2024. See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
80-
8178
- GPT-4 version 0125-preview is an updated version of the GPT-4 Turbo preview previously released as version 1106-preview.
8279
- GPT-4 version 0125-preview completes tasks such as code generation more completely compared to gpt-4-1106-preview. Because of this, depending on the task, customers may find that GPT-4-0125-preview generates more output compared to the gpt-4-1106-preview. We recommend customers compare the outputs of the new model. GPT-4-0125-preview also addresses bugs in gpt-4-1106-preview with UTF-8 handling for non-English languages.
8380
- GPT-4 version `turbo-2024-04-09` is the latest GA release and replaces `0125-Preview`, `1106-preview`, and `vision-preview`.
@@ -216,9 +213,6 @@ GPT-3.5 Turbo version 0301 is the first version of the model released. Version
216213

217214
See [model versions](../concepts/model-versions.md) to learn about how Azure OpenAI Service handles model version upgrades, and [working with models](../how-to/working-with-models.md) to learn how to view and configure the model version settings of your GPT-3.5 Turbo deployments.
218215

219-
> [!NOTE]
220-
> Version `0613` of `gpt-35-turbo` and `gpt-35-turbo-16k` will be retired no earlier than August 1, 2024. Version `0301` of `gpt-35-turbo` will be retired no earlier than August 1, 2024. See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
221-
222216
### GPT-3.5-Turbo model availability
223217

224218
#### Public cloud regions
@@ -316,9 +310,13 @@ For Assistants you need a combination of a supported model, and a supported regi
316310
| West US | || | || |
317311
| West US 3 | | | | || |
318312

313+
## Model retirement
314+
315+
For the latest information on model retirements, refer to the [model retirement guide](./model-retirements.md).
319316

320317
## Next steps
321318

319+
- [Model retirement and deprecation](./model-retirements.md)
322320
- [Learn more about working with Azure OpenAI models](../how-to/working-with-models.md)
323321
- [Learn more about Azure OpenAI](../overview.md)
324322
- [Learn more about fine-tuning Azure OpenAI models](../how-to/fine-tuning.md)

articles/ai-services/openai/whats-new.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- ignite-2023
1111
- references_regions
1212
ms.topic: whats-new
13-
ms.date: 06/18/2024
13+
ms.date: 06/19/2024
1414
recommendations: false
1515
---
1616

@@ -20,6 +20,14 @@ This article provides a summary of the latest releases and major documentation u
2020

2121
## June 2024
2222

23+
### Retirement date updates
24+
25+
* Updated `gpt-35-turbo` 0301 retirement date to no earlier than October 1, 2024.
26+
* Updated `gpt-35-turbo` & `gpt-35-turbo-16k`0613 retirement date to October 1, 2024.
27+
* Updated `gpt-4` & `gpt-4-32k` 0314 deprecation date to October 1, 2024, and retirement date to June 6, 2025.
28+
29+
Refer to our [model retirement guide](./concepts/model-retirements.md) for the latest information on model deprecation and retirement.
30+
2331
### Token based billing for fine-tuning
2432

2533
* Azure OpenAI fine-tuning billing is now based on the number of tokens in your training file – instead of the total elapsed training time. This can result in a significant cost reduction for some training runs, and makes estimating fine-tuning costs much easier. To learn more, you can consult the [official announcement](https://techcommunity.microsoft.com/t5/ai-azure-ai-services-blog/pricing-update-token-based-billing-for-fine-tuning-training/ba-p/4164465).

articles/aks/azure-cni-powered-by-cilium.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ Azure CNI powered by Cilium currently has the following limitations:
5757

5858
* Network policies may be enforced on reply packets when a pod connects to itself via service cluster IP ([Cilium issue #19406](https://github.com/cilium/cilium/issues/19406)).
5959

60+
* Network policies are not applied to pods using host networking (`spec.hostNetwork: true`) because these pods use the host identity instead of having individual identities.
61+
6062
## Prerequisites
6163

6264
* Azure CLI version 2.48.1 or later. Run `az --version` to see the currently installed version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).

articles/api-management/how-to-configure-local-metrics-logs.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@ Here's a sample configuration of local logging:
230230
telemetry.logs.local.localsyslog.facility: "7"
231231
```
232232

233+
### Using local JSON endpoint
234+
235+
#### Known limitations
236+
237+
- We only support up to 3072 bytes of request/response payload for local diagnostics. Anything above, may break JSON format due to chunking.
238+
233239
### Using local syslog logs
234240

235241
#### Configuring gateway to stream logs

articles/app-service/environment/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: App Service Environment overview
33
description: This article discusses the Azure App Service Environment feature of Azure App Service.
44
author: madsd
55
ms.topic: overview
6-
ms.date: 05/27/2024
6+
ms.date: 06/18/2024
77
ms.author: madsd
88
ms.custom: "UpdateFrequency3, references_regions"
99
---
@@ -12,7 +12,7 @@ ms.custom: "UpdateFrequency3, references_regions"
1212

1313
[!INCLUDE [regionalization-note](../includes/regionalization-note.md)]
1414

15-
An App Service Environment is an Azure App Service feature that provides a fully isolated and dedicated environment for running App Service apps securely at high scale.
15+
An App Service Environment is an Azure App Service feature that provides a fully isolated and dedicated environment for running App Service apps securely at high scale. Unlike the App Service public multitenant offering where supporting ingfrastructure is shared, with App Service Environment, compute is dedicated to a single customer. For more information on the differences between App Service Environment and App Service public multitenant, see the [comparison of the offerings](ase-multi-tenant-comparison.md).
1616

1717
> [!NOTE]
1818
> This article covers the features, benefits, and use cases of App Service Environment v3, which is used with App Service Isolated v2 plans.

articles/azure-arc/choose-service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Choosing the right Azure Arc service for machines
33
description: Learn about the different services offered by Azure Arc and how to choose the right one for your machines.
4-
ms.date: 05/07/2024
4+
ms.date: 06/19/2024
55
ms.topic: conceptual
66
---
77

@@ -147,7 +147,7 @@ The following table provides a quick way to see the major capabilities of the th
147147

148148
If you currently use Azure Arc-enabled servers, you can get the additional capabilities that come with Arc-enabled VMware vSphere or Arc-enabled SCVMM:
149149

150-
- [Enable virtual hardware and VM CRUD capabilities in a machine with Azure Arc agent installed](/azure/azure-arc/vmware-vsphere/enable-virtual-hardware)
150+
- [Enable virtual hardware and VM CRUD capabilities in a VMware machine with Azure Arc agent installed](/azure/azure-arc/vmware-vsphere/enable-virtual-hardware)
151151

152152
- [Enable virtual hardware and VM CRUD capabilities in an SCVMM machine with Azure Arc agent installed](/azure/azure-arc/system-center-virtual-machine-manager/enable-virtual-hardware-scvmm)
153153

articles/azure-cache-for-redis/cache-how-to-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This table contains the information for which Redis version are available in eac
3636
| Tier | Available Redis version |
3737
|:---------------------------- |:------------------------------------:|
3838
| Basic, Standard, Premium | 6.0 (GA) |
39-
| Enterprise, Enterprise Flash | Redis 6.2 (GA), Redis 7.2 (preview) |
39+
| Enterprise, Enterprise Flash | Redis 6.0 (GA), Redis 7.2 (preview) |
4040

4141
## How to upgrade - Basic, Standard, and Premium tiers
4242

articles/azure-monitor/agents/azure-monitor-agent-mma-removal-tool.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ ms.custom:
1212

1313
# MMA Discovery and Removal Utility
1414

15+
> [!NOTE]
16+
> We have received many reports from customers that this tool is failing to remove MMA agents. At this time, we recommend that this tool not be used.
17+
1518
After you migrate your machines to the Azure Monitor Agent (AMA), remove the Log Analytics or Microsoft Management Agent (MMA) to avoid duplication of logs. The Azure Tenant Security Solution (AzTS) MMA Discovery and Removal Utility can remove the MMA extension from Azure Virtual Machines (VMs), Azure Virtual Machine Scale Sets (VMSSs), and Azure Arc servers from a tenant.
1619

1720
> [!NOTE]
@@ -457,4 +460,4 @@ The script contains these parameters:
457460
|`DeleteResourceGroup`| Boolean flag to delete an entire resource group.| Yes|
458461
|`KeepInventoryAndProcessLogs`| Boolean flag to exclude the Log Analytics workspace and Application Insights. You can't use it with `DeleteResourceGroup`.| No|
459462

460-
---
463+
---

0 commit comments

Comments
 (0)