Skip to content

Commit 51a77fc

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into index-tags-go
2 parents b904a42 + f6192cc commit 51a77fc

File tree

11 files changed

+106
-30
lines changed

11 files changed

+106
-30
lines changed

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

Lines changed: 13 additions & 13 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: 06/19/2024
7+
ms.date: 06/25/2024
88
ms.custom: references_regions, build-2023, build-2023-dataai, refefences_regions
99
manager: nitinme
1010
author: mrbullwinkle #ChrisHMSFT
@@ -297,18 +297,18 @@ The following Embeddings models are available with [Azure Government](/azure/azu
297297

298298
For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md).
299299

300-
| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` |
301-
|-----|---|---|---|---|---|---|
302-
| Australia East ||| ||| |
303-
| East US || | | | ||
304-
| East US 2 || |||| |
305-
| France Central ||| ||| |
306-
| Japan East || | | | | |
307-
| Norway East | | | | || |
308-
| Sweden Central |||||| |
309-
| UK South ||| | |||
310-
| West US | || | || |
311-
| West US 3 | | | | || |
300+
| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | `gpt-4o (2024-05-13)` |
301+
|-----|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
302+
| Australia East ||| ||| | |
303+
| East US || | | | |||
304+
| East US 2 || |||| ||
305+
| France Central ||| ||| | |
306+
| Japan East || | | | | | |
307+
| Norway East | | | | || | |
308+
| Sweden Central |||||| ||
309+
| UK South ||| | ||| |
310+
| West US | || | || ||
311+
| West US 3 | | | | || ||
312312

313313
## Model retirement
314314

articles/azure-arc/servers/prepare-extended-security-updates.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ Other Azure services through Azure Arc-enabled servers are available as well, wi
3939

4040
* [Microsoft Defender for Cloud](../../defender-for-cloud/defender-for-cloud-introduction.md) - As part of the cloud security posture management (CSPM) pillar, it provides server protections through [Microsoft Defender for Servers](../../defender-for-cloud/plan-defender-for-servers.md) to help protect you from various cyber threats and vulnerabilities.
4141
* [Microsoft Sentinel](scenario-onboard-azure-sentinel.md) - Collect security-related events and correlate them with other data sources.
42-
43-
>[!NOTE]
44-
>Activation of ESU is planned for the third quarter of 2023. Using Azure services such as Azure Update Manager and Azure Policy to support managing ESU-eligible Windows Server 2012/2012 R2 machines are also planned for the third quarter.
45-
42+
4643
## Prepare delivery of ESUs
4744

4845
Plan and prepare to onboard your machines to Azure Arc-enabled servers through the installation of the [Azure Connected Machine agent](agent-overview.md) (version 1.34 or higher) to establish a connection to Azure. Windows Server 2012 Extended Security Updates supports Windows Server 2012 and R2 Standard and Datacenter editions. Windows Server 2012 Storage is not supported.

articles/azure-monitor/app/opentelemetry-enable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Point the Java virtual machine (JVM) to the jar file by adding `-javaagent:"path
218218
> If you develop a Spring Boot application, you can optionally replace the JVM argument by a programmatic configuration. For more information, see [Using Azure Monitor Application Insights with Spring Boot](./java-spring-boot.md).
219219
220220

221-
##### [Java-Native](#tab/java-native)
221+
##### [Java Native](#tab/java-native)
222222

223223
Several automatic instrumentations are enabled through configuration changes; no code changes are required
224224

articles/container-instances/container-instances-volume-azure-files.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ By default, Azure Container Instances are stateless. If the container is restart
1616

1717
## Limitations
1818

19+
* Azure Storage doesn't support SMB mounting of file share using managed identity
1920
* You can only mount Azure Files shares to Linux containers. Review more about the differences in feature support for Linux and Windows container groups in the [overview](container-instances-overview.md#linux-and-windows-containers).
2021
* Azure file share volume mount requires the Linux container run as *root* .
2122
* Azure File share volume mounts are limited to CIFS support.

articles/load-balancer/load-balancer-ipv6-for-linux.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@ author: mbender-ms
77
keywords: ipv6, azure load balancer, dual stack, public ip, native ipv6, mobile, iot
88
ms.service: load-balancer
99
ms.topic: how-to
10-
ms.date: 04/21/2023
10+
ms.date: 06/21/2024
1111
ms.author: mbender
1212
ms.custom: template-how-to, engagement-fy23, doc-a-thon, linux-related-content
1313
---
1414

1515
# Configure DHCPv6 for Linux VMs
1616

17-
> [!CAUTION]
18-
> This article references CentOS, a Linux distribution that is nearing End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](~/articles/virtual-machines/workloads/centos/centos-end-of-life.md).
19-
2017
Some of the Linux virtual-machine images in the Azure Marketplace don't have Dynamic Host Configuration Protocol version 6 (DHCPv6) configured by default. To support IPv6, DHCPv6 must be configured in the Linux OS distribution that you're using. The various Linux distributions configure DHCPv6 in various ways because they use different packages.
2118

2219
> [!NOTE]
@@ -27,9 +24,9 @@ This document describes how to enable DHCPv6 so that your Linux virtual machine
2724
> [!WARNING]
2825
> By improperly editing network configuration files, you can lose network access to your VM. We recommended that you test your configuration changes on non-production systems. The instructions in this article have been tested on the latest versions of the Linux images in the Azure Marketplace. For more detailed instructions, consult the documentation for your own version of Linux.
2926
30-
# [RHEL/CentOS/Oracle](#tab/redhat)
27+
# [RHEL/Oracle](#tab/redhat)
3128

32-
For RHEL, CentOS, and Oracle Linux versions 7.4 or higher, follow these steps:
29+
For RHEL and Oracle Linux versions 7.4 or higher, follow these steps:
3330

3431
1. Edit the */etc/sysconfig/network* file, and add the following parameter:
3532

articles/sentinel/microsoft-365-defender-sentinel-integration.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ Install the **Microsoft Defender XDR** solution for Microsoft Sentinel from the
5757

5858
To onboard Microsoft Sentinel to the unified security operations platform in the Defender portal, see [Connect Microsoft Sentinel to Microsoft Defender XDR](/defender-xdr/microsoft-sentinel-onboard).
5959

60-
After you configure the Defender XDR data connector, Defender XDR incidents appear in the Microsoft Sentinel incidents queue, with **Microsoft Defender XDR** (or one of the component services' names) in the **Alert product name** field, shortly after they're generated in Defender XDR.
61-
60+
After you enable alert and incident collection in the Defender XDR data connector, Defender XDR incidents appear in the Microsoft Sentinel incidents queue shortly after they're generated in Defender XDR. In these incidents, the **Alert product name** field contains **Microsoft Defender XDR** or one of the component Defender services' names.
6261
- It can take up to 10 minutes from the time an incident is generated in Defender XDR to the time it appears in Microsoft Sentinel.
6362

6463
- Alerts and incidents from Defender XDR (those items that populate the *SecurityAlert* and *SecurityIncident* tables) are ingested into and synchronized with Microsoft Sentinel at no charge. For all other data types from individual Defender components (such as the *Advanced hunting* tables *DeviceInfo*, *DeviceFileEvents*, *EmailEvents*, and so on), ingestion is charged.
@@ -67,7 +66,7 @@ After you configure the Defender XDR data connector, Defender XDR incidents appe
6766

6867
The exception to this process is Microsoft Defender for Cloud. Although its integration with Defender XDR means that you receive Defender for Cloud *incidents* through Defender XDR, you need to also have a Microsoft Defender for Cloud connector enabled in order to receive Defender for Cloud *alerts*. For the available options and more information, see the following articles:
6968
- [Microsoft Defender for Cloud in the Microsoft Defender portal](/microsoft-365/security/defender/microsoft-365-security-center-defender-cloud)
70-
- [Ingest Microsoft Defender for Cloud incidents with Microsoft Defender XDR integration](ingest-defender-for-cloud-incidents.md)
69+
- [Ingest Microsoft Defender for Cloud incidents with Microsoft Defender XDR integration](ingest-defender-for-cloud-incidents.md)
7170

7271
- Similarly, to avoid creating *duplicate incidents for the same alerts*, the **Microsoft incident creation rules** setting is turned off for Defender XDR-integrated products when connecting Defender XDR. This is because Defender XDR has its own incident creation rules. This change has the following potential impacts:
7372

@@ -90,7 +89,7 @@ In Defender XDR, all alerts from one incident can be transferred to another, res
9089
9190
## Advanced hunting event collection
9291

93-
The Defender XDR connector also lets you stream **advanced hunting** events - a type of raw event data - from Defender XDR and its component services into Microsoft Sentinel. Collect [advanced hunting](/microsoft-365/security/defender/advanced-hunting-overview) events from all Defender XDR components, and stream them straight into purpose-built tables in your Microsoft Sentinel workspace. These tables are built on the same schema that is used in the Defender portal. This gives you complete access to the full set of advanced hunting events, and allows you to do the following tasks:
92+
The Defender XDR connector also lets you stream **advanced hunting** events—a type of raw event data—from Defender XDR and its component services into Microsoft Sentinel. Collect [advanced hunting](/microsoft-365/security/defender/advanced-hunting-overview) events from all Defender XDR components, and stream them straight into purpose-built tables in your Microsoft Sentinel workspace. These tables are built on the same schema that is used in the Defender portal. This gives you complete access to the full set of advanced hunting events, and allows you to do the following tasks:
9493

9594
- Easily copy your existing Microsoft Defender for Endpoint/Office 365/Identity/Cloud Apps advanced hunting queries into Microsoft Sentinel.
9695

articles/service-fabric/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ We're excited to announce that the 10.0 release of the Service Fabric runtime ha
5757
|---|---|---|
5858
| September 09, 2023 | Azure Service Fabric 10.0 Release | [Release notes](https://github.com/microsoft/service-fabric/blob/master/release_notes/Service_Fabric_ReleaseNotes_10.md) |
5959
| November 1, 2023 | Azure Service Fabric 10.0 First Refresh Release | [Release notes](https://github.com/microsoft/service-fabric/blob/master/release_notes/Service_Fabric_ReleaseNotes_100CU1.md) |
60-
| April 1, 2024 | Azure Service Fabric 10.1 Third Refresh Release | [Release notes](https://github.com/microsoft/service-fabric/blob/master/release_notes/Service_Fabric_ReleaseNotes_100CU3.md) |
60+
| April 1, 2024 | Azure Service Fabric 10.0 Third Refresh Release | [Release notes](https://github.com/microsoft/service-fabric/blob/master/release_notes/Service_Fabric_ReleaseNotes_100CU3.md) |
6161
| June 15, 2024 | Azure Service Fabric 10.0 Fourth Refresh Release | [Release notes](https://github.com/microsoft/service-fabric/blob/master/release_notes/Service_Fabric_ReleaseNotes_100CU4.md) |
6262

6363
## Service Fabric 9.1

articles/storage/blobs/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -993,6 +993,10 @@ items:
993993
href: storage-blob-tags-go.md
994994
- name: Manage blob properties and metadata
995995
href: storage-blob-properties-metadata-go.md
996+
- name: Client library configuration options
997+
items:
998+
- name: Implement a retry policy
999+
href: storage-retry-policy-go.md
9961000
- name: Test with a storage emulator
9971001
items:
9981002
- name: Use the Azurite open-source emulator
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
---
2+
title: Implement a retry policy using the Azure Storage client module for Go
3+
titleSuffix: Azure Storage
4+
description: Learn about retry policies and how to implement them for Blob Storage. This article helps you set up a retry policy for Blob Storage requests using the Azure Storage client module for Go.
5+
author: pauljewellmsft
6+
ms.author: pauljewell
7+
ms.service: azure-blob-storage
8+
ms.topic: how-to
9+
ms.date: 06/26/2024
10+
ms.custom: devx-track-go, devguide-go
11+
---
12+
13+
# Implement a retry policy with Go
14+
15+
Any application that runs in the cloud or communicates with remote services and resources must be able to handle transient faults. It's common for these applications to experience faults due to a momentary loss of network connectivity, a request timeout when a service or resource is busy, or other factors. Developers should build applications to handle transient faults transparently to improve stability and resiliency.
16+
17+
In this article, you learn how to use the Azure Storage client module for Go to configure a retry policy for an application that connects to Azure Blob Storage. Retry policies define how the application handles failed requests, and should always be tuned to match the business requirements of the application and the nature of the failure.
18+
19+
## Configure retry options
20+
21+
Retry policies for Blob Storage are configured programmatically, offering control over how retry options are applied to various service requests and scenarios. For example, a web app issuing requests based on user interaction might implement a policy with fewer retries and shorter delays to increase responsiveness and notify the user when an error occurs. Alternatively, an app or component running batch requests in the background might increase the number of retries and use an exponential backoff strategy to allow the request time to complete successfully.
22+
23+
The following table lists the fields available to configure in a [RetryOptions](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azcore/policy#RetryOptions) instance, along with the type, a brief description, and the default value if you make no changes. You should be proactive in tuning the values of these properties to meet the needs of your app.
24+
25+
| Property | Type | Description | Default value |
26+
| --- | --- | --- | --- |
27+
| `MaxRetries` | `int32` | Optional. Specifies the maximum number of attempts a failed operation is retried before producing an error. A value less than zero means one try and no retries. | 3 |
28+
| `TryTimeout` | `time.Duration` | Optional. Indicates the maximum time allowed for any single try of an HTTP request. Specify a value greater than zero to enable. Note: Setting this field to a small value might cause premature HTTP request timeouts. | Disabled by default. |
29+
| `RetryDelay` | `time.Duration` | Optional. Specifies the initial amount of delay to use before retrying an operation. The value is used only if the HTTP response doesn't contain a Retry-After header. The delay increases exponentially with each retry up to the maximum specified by MaxRetryDelay. A value less than zero means no delay between retries. | 4 seconds |
30+
| `MaxRetryDelay` | `time.Duration` | Optional. Specifies the maximum delay allowed before retrying an operation. Typically, the value is greater than or equal to the value specified in `RetryDelay`. A value less than zero means there's no maximum. | 60 seconds |
31+
| `StatusCodes` | []int | Optional. Specifies the HTTP status codes that indicate the operation should be retried. Specifying values replaces the default values. Specifying an empty slice disables retries for HTTP status codes. | 408 - http.StatusRequestTimeout</br>429 - http.StatusTooManyRequests</br>500 - http.StatusInternalServerError</br>502 - http.StatusBadGateway</br>503 - http.StatusServiceUnavailable</br>504 - http.StatusGatewayTimeout |
32+
| `ShouldRetry` | `func(*http.Response, error) bool` | Optional. evaluates if the retry policy should retry the request. When specified, the function overrides comparison against the list of HTTP status codes and error checking within the retry policy. `Context` and `NonRetriable` errors remain evaluated before calling `ShouldRetry`. The `*http.Response` and `error` parameters are mutually exclusive, that is, if one is `nil`, the other isn't `nil`. A return value of true means the retry policy should retry. | |
33+
34+
To work with the code example in this article, add the following `import` paths to your code:
35+
36+
```go
37+
import (
38+
"context"
39+
"time"
40+
41+
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
42+
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
43+
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
44+
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
45+
)
46+
```
47+
48+
In the following code example, we configure the retry options in an instance of [RetryOptions](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azcore/policy#RetryOptions), include it in a [ClientOptions](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azcore/policy#ClientOptions) instance, and create a new client object:
49+
50+
```go
51+
options := azblob.ClientOptions{
52+
ClientOptions: azcore.ClientOptions{
53+
Retry: policy.RetryOptions{
54+
MaxRetries: 10,
55+
TryTimeout: time.Minute * 15,
56+
RetryDelay: time.Second * 1,
57+
MaxRetryDelay: time.Second * 60,
58+
StatusCodes: []int{408, 429, 500, 502, 503, 504},
59+
},
60+
},
61+
}
62+
63+
credential, err := azidentity.NewDefaultAzureCredential(nil)
64+
handleError(err)
65+
66+
client, err := azblob.NewClient(accountURL, credential, &options)
67+
handleError(err)
68+
```
69+
70+
In this example, each service request issued from `client` uses the retry options as defined in the `RetryOptions` struct. This policy applies to client requests. You can configure various retry strategies for service clients based on the needs of your app.
71+
72+
## Related content
73+
74+
- For architectural guidance and general best practices for retry policies, see [Transient fault handling](/azure/architecture/best-practices/transient-faults).
75+
- For guidance on implementing a retry pattern for transient failures, see [Retry pattern](/azure/architecture/patterns/retry).

articles/virtual-machines/extensions/dsc-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ ms.devlang: azurecli
1818

1919
# Introduction to the Azure Desired State Configuration extension handler
2020

21+
> [!NOTE]
22+
> Before you enable DSC Extension, we would like you to know that a newer version of DSC is now generally available, managed by a feature of Azure Policy named [Azure Machine Configuration](../../governance/machine-configuration/overview.md). The Azure Machine Configuration service combines features of DSC Extension, Azure Automation State Configuration, and the most commonly requested features from customer feedback. Azure Machine Configuration also includes hybrid machine support through [Arc-enabled servers](../../azure-arc/servers/overview.md).
23+
2124
The Azure VM Extension for Azure virtual machines (VM) and the associated extensions are part of Microsoft Azure infrastructure services. Azure VM extensions are software components that extend VM functionality and simplify various VM management operations.
2225

2326
The primary use for the Azure Desired State Configuration (DSC) extension for Windows PowerShell is to bootstrap a VM to the

0 commit comments

Comments
 (0)