Skip to content

Commit 174b8f8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ingress-options
2 parents 52a6c7c + 4f26944 commit 174b8f8

File tree

61 files changed

+533
-608
lines changed

Some content is hidden

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

61 files changed

+533
-608
lines changed

articles/advisor/advisor-alerts-bicep.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
---
22
title: Create Azure Advisor alerts for new recommendations using Bicep
33
description: Learn how to set up an alert for new recommendations from Azure Advisor using Bicep.
4-
author: orspod
54
ms.topic: quickstart
6-
ms.author: orspodek
75
ms.custom: subject-armqs, mode-arm, devx-track-bicep
86
ms.date: 04/26/2022
97
---

articles/advisor/advisor-azure-resource-graph.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
---
22
title: Advisor data in Azure Resource Graph
33
description: Make queries for Advisor data in Azure Resource Graph
4-
author: orspod
54
ms.topic: article
65
ms.date: 03/12/2020
7-
ms.author: orspodek
8-
96
---
107

118
# Query for Advisor data in Resource Graph Explorer (Azure Resource Graph)

articles/advisor/advisor-quick-fix.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
---
22
title: Quick Fix remediation for Advisor recommendations
33
description: Perform bulk remediation using Quick Fix in Advisor
4-
author: orspod
54
ms.topic: article
65
ms.date: 03/13/2020
7-
ms.author: orspodek
8-
96
---
107

118
# Quick Fix remediation for Advisor

articles/advisor/advisor-recommendations-digest.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
---
2-
32
title: Recommendation digest for Azure Advisor
43
description: Get periodic summary for your active recommendations
5-
author: orspod
64
ms.topic: article
75
ms.date: 03/16/2020
8-
ms.author: orspodek
9-
106
---
117

128
# Configure periodic summary for recommendations

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,18 @@ The following Embeddings models are available with [Azure Government](/azure/azu
254254

255255
### Assistants (Preview)
256256

257-
For Assistants you need a combination of a supported model and a supported region. Certain tools and capabilities require the latest models. For example, [parallel function calling](../how-to/assistant-functions.md) requires the latest 1106 models.
257+
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..
258258

259259
| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` |
260260
|-----|---|---|---|---|---|
261261
| Australia East ||||| |
262-
| East US 2 || ||| |
263-
| Sweden Central ||||| |
262+
| East US || | | ||
263+
| East US 2 || ||| |
264+
| France Central ||||| |
265+
| Norway East | | | || |
266+
| Sweden Central ||||| |
267+
| UK South ||||| |
268+
264269

265270
For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md).
266271

articles/ai-services/openai/how-to/use-your-data-securely.md

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ When using the API, pass the `filter` parameter in each API request. For example
105105

106106
## Resources configuration
107107

108-
Use the following sections to configure your resources for optimal secure usage. Even if you plan to only secure part of your resources, you still need to follow all the steps below.
108+
Use the following sections to configure your resources for optimal secure usage. Even if you plan to only secure part of your resources, you still need to follow all the steps below.
109+
110+
This article describes network settings related to disabling public network for Azure OpenAI resources, Azure AI search resources, and storage accounts. Using selected networks with IP rules is not supported, because the services' IP addresses are dynamic.
109111

110112
## Create resource group
111113

@@ -372,40 +374,4 @@ curl -i -X GET https://my-resource.openai.azure.com/openai/extensions/on-your-da
372374

373375
### Inference API
374376

375-
See the [inference API reference article](/azure/ai-services/openai/reference#completions-extensions) for details on the request and response objects used by the inference API.
376-
377-
More notes:
378-
379-
* **Do not** set `dataSources[0].parameters.key`. The service uses system assigned managed identity to authenticate the Azure AI Search.
380-
* **Do not** set `embeddingEndpoint` or `embeddingKey`. Instead, to enable vector search (with `queryType` set properly), use `embeddingDeploymentName`.
381-
382-
Example:
383-
384-
```bash
385-
accessToken=$(az account get-access-token --resource https://cognitiveservices.azure.com/ --query "accessToken" --output tsv)
386-
curl -i -X POST https://my-resource.openai.azure.com/openai/deployments/turbo/extensions/chat/completions?api-version=2023-10-01-preview \
387-
-H "Content-Type: application/json" \
388-
-H "Authorization: Bearer $accessToken" \
389-
-d \
390-
'
391-
{
392-
"dataSources": [
393-
{
394-
"type": "AzureCognitiveSearch",
395-
"parameters": {
396-
"endpoint": "https://my-search-service.search.windows.net",
397-
"indexName": "my-index",
398-
"queryType": "vector",
399-
"embeddingDeploymentName": "ada"
400-
}
401-
}
402-
],
403-
"messages": [
404-
{
405-
"role": "user",
406-
"content": "Who is the primary DRI for QnA v2 Authoring service?"
407-
}
408-
]
409-
}
410-
'
411-
```
377+
See the [inference API reference article](../references/on-your-data.md) for details on the request and response objects used by the inference API.

articles/aks/azure-cni-overlay.md

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,13 @@ Since the cluster is already using a private CIDR for pods which doesn't overlap
196196
> [!NOTE]
197197
> When upgrading from Kubenet to CNI Overlay, the route table will no longer be required for pod routing. If the cluster is using a customer provided route table, the routes which were being used to direct pod traffic to the correct node will automatically be deleted during the migration operation. If the cluster is using a managed route table (the route table was created by AKS and lives in the node resource group) then that route table will be deleted as part of the migration.
198198
199-
## Dual-stack Networking (Preview)
199+
## Dual-stack Networking
200200

201201
You can deploy your AKS clusters in a dual-stack mode when using Overlay networking and a dual-stack Azure virtual network. In this configuration, nodes receive both an IPv4 and IPv6 address from the Azure virtual network subnet. Pods receive both an IPv4 and IPv6 address from a logically different address space to the Azure virtual network subnet of the nodes. Network address translation (NAT) is then configured so that the pods can reach resources on the Azure virtual network. The source IP address of the traffic is NAT'd to the node's primary IP address of the same family (IPv4 to IPv4 and IPv6 to IPv6).
202202

203-
[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
204-
205203
### Prerequisites
206204

207205
- You must have Azure CLI 2.48.0 or later installed.
208-
- You must register the `Microsoft.ContainerService` `AzureOverlayDualStackPreview` feature flag.
209206
- Kubernetes version 1.26.3 or greater.
210207

211208
### Limitations
@@ -231,26 +228,6 @@ The following attributes are provided to support dual-stack clusters:
231228
* If no values are supplied, the default value `10.0.0.0/16,fd12:3456:789a:1::/108` is used.
232229
* The IPv6 subnet assigned to `--service-cidrs` can be no larger than a /108.
233230

234-
### Register the `AzureOverlayDualStackPreview` feature flag
235-
236-
1. Register the `AzureOverlayDualStackPreview` feature flag using the [`az feature register`][az-feature-register] command. It takes a few minutes for the status to show *Registered*.
237-
238-
```azurecli-interactive
239-
az feature register --namespace "Microsoft.ContainerService" --name "AzureOverlayDualStackPreview"
240-
```
241-
242-
2. Verify the registration status using the [`az feature show`][az-feature-show] command.
243-
244-
```azurecli-interactive
245-
az feature show --namespace "Microsoft.ContainerService" --name "AzureOverlayDualStackPreview"
246-
```
247-
248-
3. When the status reflects *Registered*, refresh the registration of the *Microsoft.ContainerService* resource provider using the [`az provider register`][az-provider-register] command.
249-
250-
```azurecli-interactive
251-
az provider register --namespace Microsoft.ContainerService
252-
```
253-
254231
### Create a dual-stack AKS cluster
255232

256233
1. Create an Azure resource group for the cluster using the [`az group create`][az-group-create] command.

articles/aks/load-balancer-standard.md

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to use a public load balancer with a Standard SKU to expo
55
ms.subservice: aks-networking
66
ms.custom: devx-track-azurecli
77
ms.topic: how-to
8-
ms.date: 10/30/2023
8+
ms.date: 01/23/2024
99
ms.author: allensu
1010
author: asudbring
1111
#Customer intent: As a cluster operator or developer, I want to learn how to create a service in AKS that uses an Azure Load Balancer with a Standard SKU.
@@ -125,7 +125,7 @@ You can customize different settings for your standard public load balancer at c
125125
> [!IMPORTANT]
126126
> Only one outbound IP option (managed IPs, bring your own IP, or IP prefix) can be used at a given time.
127127

128-
### Change the inbound pool type (PREVIEW)
128+
### Change the inbound pool type
129129

130130
AKS nodes can be referenced in the load balancer backend pools by either their IP configuration (Azure Virtual Machine Scale Sets based membership) or by their IP address only. Utilizing the IP address based backend pool membership provides higher efficiencies when updating services and provisioning load balancers, especially at high node counts. Provisioning new clusters with IP based backend pools and converting existing clusters is now supported. When combined with NAT Gateway or user-defined routing egress types, provisioning of new nodes and services are more performant.
131131

@@ -136,48 +136,13 @@ Two different pool membership types are available:
136136

137137
#### Requirements
138138

139-
* The `aks-preview` extension must be at least version 0.5.103.
140139
* The AKS cluster must be version 1.23 or newer.
141140
* The AKS cluster must be using standard load balancers and virtual machine scale sets.
142141

143142
#### Limitations
144143

145144
* Clusters using IP based backend pools are limited to 2500 nodes.
146145

147-
[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
148-
149-
#### Install the aks-preview CLI extension
150-
151-
```azurecli-interactive
152-
# Install the aks-preview extension
153-
az extension add --name aks-preview
154-
155-
# Update the extension to make sure you have the latest version installed
156-
az extension update --name aks-preview
157-
```
158-
159-
#### Register the `IPBasedLoadBalancerPreview` preview feature
160-
161-
To create an AKS cluster with IP based backend pools, you must enable the `IPBasedLoadBalancerPreview` feature flag on your subscription.
162-
163-
Register the `IPBasedLoadBalancerPreview` feature flag by using the `az feature register` command, as shown in the following example:
164-
165-
```azurecli-interactive
166-
az feature register --namespace "Microsoft.ContainerService" --name "IPBasedLoadBalancerPreview"
167-
```
168-
169-
It takes a few minutes for the status to show *Registered*. Verify the registration status by using the `az feature list` command:
170-
171-
```azurecli-interactive
172-
az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/IPBasedLoadBalancerPreview')].{Name:name,State:properties.state}"
173-
```
174-
175-
When the feature has been registered, refresh the registration of the *Microsoft.ContainerService* resource provider by using the `az provider register` command:
176-
177-
```azurecli-interactive
178-
az provider register --namespace Microsoft.ContainerService
179-
```
180-
181146
#### Create a new AKS cluster with IP-based inbound pool membership
182147

183148
```azurecli-interactive

articles/aks/use-node-public-ips.md

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Use instance-level public IPs in Azure Kubernetes Service (AKS)
33
description: Learn how to manage instance-level public IPs Azure Kubernetes Service (AKS)
44
ms.topic: article
55
ms.custom: devx-track-azurecli
6-
ms.date: 1/12/2023
6+
ms.date: 01/23/2024
77
ms.author: pahealy
88
author: phealy
99
---
@@ -132,7 +132,7 @@ az aks nodepool add --cluster-name <clusterName> -n <nodepoolName> -l <location>
132132
--node-public-ip-tags RoutingPreference=Internet
133133
```
134134

135-
## Allow host port connections and add node pools to application security groups (PREVIEW)
135+
## Allow host port connections and add node pools to application security groups
136136

137137
AKS nodes utilizing node public IPs that host services on their host address need to have an NSG rule added to allow the traffic. Adding the desired ports in the node pool configuration will create the appropriate allow rules in the cluster network security group.
138138

@@ -149,47 +149,11 @@ Examples:
149149
- 53/udp,80/tcp
150150
- 50000-60000/tcp
151151

152-
[!INCLUDE [preview features callout](includes/preview/preview-callout.md)]
153-
154152
### Requirements
155153

156154
* AKS version 1.24 or greater is required.
157155
* Version 0.5.110 of the aks-preview extension is required.
158156

159-
### Install the aks-preview Azure CLI extension
160-
161-
To install the aks-preview extension, run the following command:
162-
163-
```azurecli
164-
az extension add --name aks-preview
165-
```
166-
167-
Run the following command to update to the latest version of the extension released:
168-
169-
```azurecli
170-
az extension update --name aks-preview
171-
```
172-
173-
### Register the 'NodePublicIPNSGControlPreview' feature flag
174-
175-
Register the `NodePublicIPNSGControlPreview` feature flag by using the [az feature register][az-feature-register] command, as shown in the following example:
176-
177-
```azurecli-interactive
178-
az feature register --namespace "Microsoft.ContainerService" --name "NodePublicIPNSGControlPreview"
179-
```
180-
181-
It takes a few minutes for the status to show *Registered*. Verify the registration status by using the [az feature show][az-feature-show] command:
182-
183-
```azurecli-interactive
184-
az feature show --namespace "Microsoft.ContainerService" --name "NodePublicIPNSGControlPreview"
185-
```
186-
187-
When the status reflects *Registered*, refresh the registration of the *Microsoft.ContainerService* resource provider by using the [az provider register][az-provider-register] command:
188-
189-
```azurecli-interactive
190-
az provider register --namespace Microsoft.ContainerService
191-
```
192-
193157
### Create a new cluster with allowed ports and application security groups
194158

195159
```azurecli-interactive

0 commit comments

Comments
 (0)