Skip to content

Commit 6e403ec

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into smb
2 parents 5338e2c + 82029f6 commit 6e403ec

File tree

82 files changed

+1008
-801
lines changed

Some content is hidden

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

82 files changed

+1008
-801
lines changed

articles/ai-services/openai/how-to/embeddings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ embeddings = response['data'][0]['embedding']
4848
print(embeddings)
4949
```
5050

51-
# [OpenAI Python 1.0](#tab/python-new)
51+
# [OpenAI Python 1.x](#tab/python-new)
5252

5353
```python
5454
import os

articles/ai-services/openai/includes/chat-completion.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ JSON formatting added artificially for ease of reading.
6969

7070
```
7171

72-
# [OpenAI Python 1.0](#tab/python-new)
72+
# [OpenAI Python 1.x](#tab/python-new)
7373

7474
```python
7575
import os
@@ -330,7 +330,7 @@ while True:
330330
print("\n" + response['choices'][0]['message']['content'] + "\n")
331331
```
332332

333-
# [OpenAI Python 1.0](#tab/python-new)
333+
# [OpenAI Python 1.x](#tab/python-new)
334334

335335
```python
336336
import os
@@ -452,7 +452,7 @@ while True:
452452
print("\n" + response['choices'][0]['message']['content'] + "\n")
453453
```
454454

455-
# [OpenAI Python 1.0](#tab/python-new)
455+
# [OpenAI Python 1.x](#tab/python-new)
456456

457457
```python
458458
import tiktoken

articles/ai-services/openai/includes/chatgpt-python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Install the OpenAI Python client library with:
3636
pip install openai==0.28.1
3737
```
3838

39-
# [OpenAI Python 1.0](#tab/python-new)
39+
# [OpenAI Python 1.x](#tab/python-new)
4040

4141
```console
4242
pip install openai
@@ -86,7 +86,7 @@ print(response)
8686
print(response['choices'][0]['message']['content'])
8787
```
8888

89-
# [OpenAI Python 1.0](#tab/python-new)
89+
# [OpenAI Python 1.x](#tab/python-new)
9090

9191
You need to set the `model` variable to the deployment name you chose when you deployed the GPT-3.5-Turbo or GPT-4 models. Entering the model name will result in an error unless you chose a deployment name that is identical to the underlying model name.
9292

articles/ai-services/openai/includes/python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Install the OpenAI Python client library with:
3535
pip install openai==0.28.1
3636
```
3737

38-
# [OpenAI Python 1.0](#tab/python-new)
38+
# [OpenAI Python 1.x](#tab/python-new)
3939

4040
```console
4141
pip install openai
@@ -95,7 +95,7 @@ text = response['choices'][0]['text'].replace('\n', '').replace(' .', '.').strip
9595
print(start_phrase+text)
9696
```
9797

98-
# [OpenAI Python 1.0](#tab/python-new)
98+
# [OpenAI Python 1.x](#tab/python-new)
9999

100100
```python
101101
import os

articles/aks/create-node-pools.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create node pools in Azure Kubernetes Service (AKS)
33
description: Learn how to create multiple node pools for a cluster in Azure Kubernetes Service (AKS).
44
ms.topic: article
55
ms.custom: event-tier1-build-2022, ignite-2022, devx-track-azurecli, build-2023
6-
ms.date: 07/18/2023
6+
ms.date: 11/06/2023
77
---
88

99
# Create node pools for a cluster in Azure Kubernetes Service (AKS)
@@ -13,7 +13,7 @@ In Azure Kubernetes Service (AKS), nodes of the same configuration are grouped t
1313
To support applications that have different compute or storage demands, you can create *user node pools*. System node pools serve the primary purpose of hosting critical system pods such as CoreDNS and `konnectivity`. User node pools serve the primary purpose of hosting your application pods. For example, use more user node pools to provide GPUs for compute-intensive applications, or access to high-performance SSD storage. However, if you wish to have only one pool in your AKS cluster, you can schedule application pods on system node pools.
1414

1515
> [!NOTE]
16-
> This feature enables more control over creating and managing multiple node pools and requires separate commands for create/update/delete operations. Previously, cluster operations through `az aks create` or `az aks update` used the managedCluster API and were the only options to change your control plane and a single node pool. This feature exposes a separate operation set for agent pools through the agentPool API and requires use of the `az aks nodepool` command set to execute operations on an individual node pool.
16+
> This feature enables more control over creating and managing multiple node pools and requires separate commands for *create/update/delete* (CRUD) operations. Previously, cluster operations through [`az aks create`][az-aks-create] or [`az aks update`][az-aks-update] used the managedCluster API and were the only options to change your control plane and a single node pool. This feature exposes a separate operation set for agent pools through the agentPool API and requires use of the [`az aks nodepool`][az-aks-nodepool] command set to execute operations on an individual node pool.
1717
1818
This article shows you how to create one or more node pools in an AKS cluster.
1919

@@ -29,7 +29,7 @@ The following limitations apply when you create AKS clusters that support multip
2929
* See [Quotas, virtual machine size restrictions, and region availability in Azure Kubernetes Service (AKS)](quotas-skus-regions.md).
3030
* You can delete system node pools if you have another system node pool to take its place in the AKS cluster.
3131
* System pools must contain at least one node, and user node pools may contain zero or more nodes.
32-
* The AKS cluster must use the Standard SKU load balancer to use multiple node pools. The feature isn't supported with Basic SKU load balancers.
32+
* The AKS cluster must use the Standard SKU load balancer to use multiple node pools. This feature isn't supported with Basic SKU load balancers.
3333
* The AKS cluster must use Virtual Machine Scale Sets for the nodes.
3434
* The name of a node pool may only contain lowercase alphanumeric characters and must begin with a lowercase letter.
3535
* For Linux node pools, the length must be between 1-11 characters.
@@ -182,8 +182,8 @@ A workload may require splitting cluster nodes into separate pools for logical i
182182
183183
* All subnets assigned to node pools must belong to the same virtual network.
184184
* System pods must have access to all nodes and pods in the cluster to provide critical functionality, such as DNS resolution and tunneling kubectl logs/exec/port-forward proxy.
185-
* If you expand your VNET after creating the cluster, you must update your cluster before adding a subnet outside the original CIDR block. While AKS errors-out on the agent pool add, the `aks-preview` Azure CLI extension (version 0.5.66+) now supports running `az aks update -g <resourceGroup> -n <clusterName>` without any optional arguments. This command performs an update operation without making any changes, which can recover a cluster stuck in a failed state.
186-
* In clusters with Kubernetes version < 1.23.3, kube-proxy will SNAT traffic from new subnets, which can cause Azure Network Policy to drop the packets.
185+
* If you expand your VNET after creating the cluster, you must update your cluster before adding a subnet outside the original CIDR block. While AKS errors-out on the agent pool add, the `aks-preview` Azure CLI extension (version 0.5.66 and higher) now supports running [`az aks update`][az-aks-update] command with only the required `-g <resourceGroup> -n <clusterName>` arguments. This command performs an update operation without making any changes, which can recover a cluster stuck in a failed state.
186+
* In clusters with Kubernetes version less than 1.23.3, kube-proxy SNATs traffic from new subnets, which can cause Azure Network Policy to drop the packets.
187187
* Windows nodes SNAT traffic to the new subnets until the node pool is reimaged.
188188
* Internal load balancers default to one of the node pool subnets.
189189
@@ -212,8 +212,8 @@ Beginning in Kubernetes version 1.20 and higher, you can specify `containerd` as
212212
> When using `containerd` with Windows Server 2019 node pools:
213213
>
214214
> * Both the control plane and Windows Server 2019 node pools must use Kubernetes version 1.20 or greater.
215-
> * When you create or update a node pool to run Windows Server containers, the default value for `--node-vm-size` is *Standard_D2s_v3*, which was minimum recommended size for Windows Server 2019 node pools prior to Kubernetes 1.20. The minimum recommended size for Windows Server 2019 node pools using `containerd` is *Standard_D4s_v3*. When setting the `--node-vm-size` parameter, please check the list of [restricted VM sizes][restricted-vm-sizes].
216-
> * We highly recommended using [taints or labels][aks-taints] with your Windows Server 2019 node pools running `containerd` and tolerations or node selectors with your deployments to guarantee your workloads are scheduled correctly.
215+
> * When you create or update a node pool to run Windows Server containers, the default value for `--node-vm-size` is *Standard_D2s_v3*, which was minimum recommended size for Windows Server 2019 node pools prior to Kubernetes version 1.20. The minimum recommended size for Windows Server 2019 node pools using `containerd` is *Standard_D4s_v3*. When setting the `--node-vm-size` parameter, check the list of [restricted VM sizes][restricted-vm-sizes].
216+
> * We recommended using [taints or labels][aks-taints] with your Windows Server 2019 node pools running `containerd` and tolerations or node selectors with your deployments to guarantee your workloads are scheduled correctly.
217217
218218
### Add a Windows Server node pool with `containerd`
219219
@@ -285,7 +285,9 @@ In this article, you learned how to create multiple node pools in an AKS cluster
285285
[arm-sku-vm3]: ../virtual-machines/epsv5-epdsv5-series.md
286286
[az-aks-get-credentials]: /cli/azure/aks#az_aks_get_credentials
287287
[az-aks-create]: /cli/azure/aks#az_aks_create
288+
[az-aks-update]: /cli/azure/aks#az_aks_update
288289
[az-aks-delete]: /cli/azure/aks#az_aks_delete
290+
[az-aks-nodepool]: /cli/azure/aks/nodepool
289291
[az-aks-nodepool-add]: /cli/azure/aks/nodepool#az_aks_nodepool_add
290292
[az-aks-nodepool-list]: /cli/azure/aks/nodepool#az_aks_nodepool_list
291293
[az-aks-nodepool-upgrade]: /cli/azure/aks/nodepool#az_aks_nodepool_upgrade

articles/aks/egress-outboundtype.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.subservice: aks-networking
66
ms.custom: devx-track-azurecli
77
ms.author: allensu
88
ms.topic: how-to
9-
ms.date: 06/06/2023
9+
ms.date: 11/06/2023
1010
#Customer intent: As a cluster operator, I want to define my own egress paths with user-defined routes. Since I define this up front I do not want AKS provided load balancer configurations.
1111
---
1212

@@ -15,7 +15,7 @@ ms.date: 06/06/2023
1515
You can customize egress for an AKS cluster to fit specific scenarios. By default, AKS will provision a standard SKU load balancer to be set up and used for egress. However, the default setup may not meet the requirements of all scenarios if public IPs are disallowed or additional hops are required for egress.
1616

1717
This article covers the various types of outbound connectivity that are available in AKS clusters.
18-
how
18+
1919
> [!NOTE]
2020
> You can now update the `outboundType` after cluster creation. This feature is in preview. See [Updating `outboundType after cluster creation (preview)](#updating-outboundtype-after-cluster-creation-preview).
2121

articles/app-service/identity-scenarios.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
22
title: 'App Service authentication recommendations'
3-
description: There are several different authentication solutions available for web apps or web APIs hosted on App Service. This article provides recommendations on which auth solution(s) can be used for specific scenarios such as quickly and simply limiting access to your web app, custom authorization, and incremental consent.
3+
description: Learn about the different authentication options available for web apps or web APIs hosted on App Service. This article provides recommendations on which auth solution(s) can be used for specific scenarios such as quickly and simply limiting access to your web app, custom authorization, and incremental consent. Learn about the benefits and drawbacks of using built-in authentication versus code implementation of authentication.
44
author: rwike77
55
manager: CelesteDG
66
ms.author: ryanwi
77
ms.topic: conceptual
8-
ms.date: 08/10/2023
8+
ms.date: 10/31/2023
99
ms.custom: AppServiceIdentity
1010
---
1111
# Authentication scenarios and recommendations
1212

13-
If you have a web app or an API running in Azure App Service, you can restrict access to it based on the identity of the users or applications that request it. App Service offers several authentication solutions to help you achieve this goal. In this article, you will learn about the different authentication solutions, their benefits and drawbacks, and which authentication solution to use for specific scenarios.
13+
If you have a web app or an API running in Azure App Service, you can restrict access to it based on the identity of the users or applications that request it. App Service offers several authentication solutions to help you achieve this goal. In this article, you will learn about the different authentication options, their benefits and drawbacks, and which authentication solution to use for specific scenarios.
1414

1515
## Authentication solutions
1616

articles/azure-cache-for-redis/cache-best-practices-performance.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ redis-benchmark -h yourcache.redis.cache.windows.net -a yourAccesskey -t GET -n
101101
>These numbers might change as we post newer results periodically.
102102
>
103103
104+
>[!IMPORTANT]
105+
>Microsoft periodically updates the underlying VM used in cache instances. This can change the performance characteristics from cache to cache and from region to region. The example benchmarking values on this page reflect older generation cache hardware in a single region. You may see better or different results in practice.
106+
>
107+
104108
### Standard tier
105109

106110
| Instance | Size | vCPUs | Expected network bandwidth (Mbps)| GET requests per second without SSL (1-kB value size) | GET requests per second with SSL (1-kB value size) |

articles/azure-functions/durable/durable-functions-bindings.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,9 @@ Make sure to choose your Durable Functions development language at the top of th
2121
2222
## Python v2 programming model
2323

24-
Durable Functions provides preview support of the new [Python v2 programming model](../functions-reference-python.md?pivots=python-mode-decorators). To use the v2 model, you must install the Durable Functions SDK, which is the PyPI package `azure-functions-durable`, version `1.2.2` or a later version. During the preview, you can provide feedback and suggestions in the [Durable Functions SDK for Python repo](https://github.com/Azure/azure-functions-durable-python/issues).
25-
26-
Using [Extension Bundles](../functions-bindings-register.md#extension-bundles) isn't currently supported for the v2 model with Durable Functions. You'll instead need to manage your extensions manually as follows:
27-
28-
1. Remove the `extensionBundle` section of your `host.json` file.
29-
30-
1. Run the `func extensions install --package Microsoft.Azure.WebJobs.Extensions.DurableTask --version 2.9.1` command on your terminal. This installs the Durable Functions extension for your app, which allows you to use the v2 model preview. For more information, see [func extensions install](../functions-core-tools-reference.md#func-extensions-install).
24+
Durable Functions is supported in the new [Python v2 programming model](../functions-reference-python.md?pivots=python-mode-decorators). To use the v2 model, you must install the Durable Functions SDK, which is the PyPI package `azure-functions-durable`, version `1.2.2` or a later version. You must also check `host.json` to make sure your app is referencing [Extension Bundles](../functions-bindings-register.md#extension-bundles) version 4.x to use the v2 model with Durable Functions.
3125

26+
You can provide feedback and suggestions in the [Durable Functions SDK for Python repo](https://github.com/Azure/azure-functions-durable-python/issues).
3227
::: zone-end
3328

3429
## Orchestration trigger

articles/azure-functions/functions-bindings-event-grid-output.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,7 @@ The following table explains the properties that you can set on the `options` ob
576576
|---------|---------|----------------------|
577577
|**topicEndpointUri** | The name of an app setting that contains the URI for the custom topic, such as `MyTopicEndpointUri`. |
578578
|**topicKeySetting** | The name of an app setting that contains an access key for the custom topic. |
579+
|**connection**<sup>*</sup> | The value of the common prefix for the setting that contains the topic endpoint URI. When setting the `connection` property, the `topicEndpointUri` and `topicKeySetting` properties shouldn't be set. For more information about the naming format of this application setting, see [Identity-based authentication](#identity-based-authentication). |
579580

580581
# [Model v3](#tab/nodejs-v3)
581582

@@ -588,7 +589,7 @@ The following table explains the binding configuration properties that you set i
588589
|**name** | The variable name used in function code that represents the event. |
589590
|**topicEndpointUri** | The name of an app setting that contains the URI for the custom topic, such as `MyTopicEndpointUri`. |
590591
|**topicKeySetting** | The name of an app setting that contains an access key for the custom topic. |
591-
|**connection**<sup>*</sup> | The value of the common prefix for the setting that contains the topic endpoint URI. For more information about the naming format of this application setting, see [Identity-based authentication](#identity-based-authentication). |
592+
|**connection**<sup>*</sup> | The value of the common prefix for the setting that contains the topic endpoint URI. When setting the `connection` property, the `topicEndpointUri` and `topicKeySetting` properties shouldn't be set. For more information about the naming format of this application setting, see [Identity-based authentication](#identity-based-authentication). |
592593

593594
---
594595

@@ -722,15 +723,15 @@ Use the following steps to configure a topic key:
722723

723724
When using version 3.3.x or higher of the extension, you can connect to an Event Grid topic using an [Microsoft Entra identity](../active-directory/fundamentals/active-directory-whatis.md) to avoid having to obtain and work with topic keys.
724725

725-
To do this, create an application setting that returns the topic endpoint URI, where the name of the setting combines a unique _common prefix_, such as `myawesometopic`, with the value `__topicEndpointUri`. You then use the common prefix `myawesometopic` when you define the `Connection` property in the binding.
726+
You need to create an application setting that returns the topic endpoint URI. The name of the setting should combine a _unique common prefix_ (for example, `myawesometopic`) with the value `__topicEndpointUri`. Then, you must use that common prefix (in this case, `myawesometopic`) when you define the `Connection` property in the binding.
726727

727728
In this mode, the extension requires the following properties:
728729

729730
| Property | Environment variable template | Description | Example value |
730731
|--------------------|----------------------------------------------|---------------------|---------------|
731732
| Topic Endpoint URI | `<CONNECTION_NAME_PREFIX>__topicEndpointUri` | The topic endpoint. | `https://<topic-name>.centralus-1.eventgrid.azure.net/api/events` |
732733
733-
More properties may be set to customize the connection. See [Common properties for identity-based connections](functions-reference.md#common-properties-for-identity-based-connections).
734+
More properties can be used to customize the connection. See [Common properties for identity-based connections](functions-reference.md#common-properties-for-identity-based-connections).
734735

735736
> [!NOTE]
736737
> When using [Azure App Configuration](../azure-app-configuration/quickstart-azure-functions-csharp.md) or [Key Vault](../key-vault/general/overview.md) to provide settings for managed identity-based connections, setting names should use a valid key separator such as `:` or `/` in place of the `__` to ensure names are resolved correctly.

0 commit comments

Comments
 (0)