Skip to content

Commit d7ae827

Browse files
authored
Merge pull request #260015 from MicrosoftDocs/main
Publish to live, Friday 4 AM PST, 12/1
2 parents 17b16c2 + debee09 commit d7ae827

File tree

41 files changed

+717
-186
lines changed

Some content is hidden

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

41 files changed

+717
-186
lines changed

articles/ai-services/custom-vision-service/export-programmatically.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,4 @@ Integrate your exported model into an application by exploring one of the follow
9393
* See the sample for [CoreML model in an iOS application](https://go.microsoft.com/fwlink/?linkid=857726) for real-time image classification with Swift.
9494
* See the sample for [Tensorflow model in an Android application](https://github.com/Azure-Samples/cognitive-services-android-customvision-sample) for real-time image classification on Android.
9595
* See the sample for [CoreML model with Xamarin](https://github.com/xamarin/ios-samples/tree/master/ios11/CoreMLAzureModel) for real-time image classification in a Xamarin iOS app.
96+
* See the sample for how to use the exported model [(VAIDK/OpenVino)](https://github.com/Azure-Samples/customvision-export-samples)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ After ingesting your data, you can start chatting with the model on your data us
165165
* [C#](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/tests/Samples/Sample08_UseYourOwnData.cs)
166166
* [Java](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/openai/azure-ai-openai/src/samples/java/com/azure/ai/openai/ChatCompletionsWithYourData.java)
167167
* [JavaScript](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/openai/openai/samples/v1-beta/javascript/bringYourOwnData.js)
168+
* [PowerShell](../use-your-data-quickstart.md?tabs=command-line%2Cpowershell&pivots=programming-language-powershell#example-powershell-commands)
168169
* [Python](https://github.com/openai/openai-cookbook/blob/main/examples/azure/chat_with_your_own_data.ipynb)
169170

170171
# [Azure Cosmos DB for MongoDB vCore](#tab/mongo-db)

articles/aks/open-service-mesh-about.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ OSM runs an Envoy-based control plane on Kubernetes and can be configured with [
1414

1515
Microsoft started the OSM project, but it's now governed by the [Cloud Native Computing Foundation (CNCF)](https://www.cncf.io/).
1616

17+
> [!NOTE]
18+
> With the retirement of [Open Service Mesh (OSM)](https://docs.openservicemesh.io/) by the Cloud Native Computing Foundation (CNCF), we recommend identifying your OSM configurations and migrating them to an equivalent Istio configuration. For information about migrating from OSM to Istio, see [Migration guidance for Open Service Mesh (OSM) configurations to Istio](open-service-mesh-istio-migration-guidance.md).
19+
1720
## Enable the OSM add-on
1821

1922
OSM can be added to your Azure Kubernetes Service (AKS) cluster by enabling the OSM add-on using the [Azure CLI][osm-azure-cli] or a [Bicep template][osm-bicep]. The OSM add-on provides a fully supported installation of OSM that's integrated with AKS.

articles/aks/open-service-mesh-binary.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ zone_pivot_groups: client-operating-system
1111

1212
This article will discuss how to download the OSM client library to be used to operate and configure the OSM add-on for AKS, and how to configure the binary for your environment.
1313

14+
> [!NOTE]
15+
> With the retirement of [Open Service Mesh (OSM)](https://docs.openservicemesh.io/) by the Cloud Native Computing Foundation (CNCF), we recommend identifying your OSM configurations and migrating them to an equivalent Istio configuration. For information about migrating from OSM to Istio, see [Migration guidance for Open Service Mesh (OSM) configurations to Istio](open-service-mesh-istio-migration-guidance.md).
16+
1417
> [!IMPORTANT]
1518
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM.
1619
>

articles/aks/open-service-mesh-deploy-addon-az-cli.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ ms.author: pgibson
1111

1212
This article shows you how to install the Open Service Mesh (OSM) add-on on an Azure Kubernetes Service (AKS) cluster. The OSM add-on installs the OSM mesh on your cluster. The OSM mesh is a service mesh that provides traffic management, policy enforcement, and telemetry collection for your applications. For more information about the OSM mesh, see [Open Service Mesh](https://openservicemesh.io/).
1313

14+
> [!NOTE]
15+
> With the retirement of [Open Service Mesh (OSM)](https://docs.openservicemesh.io/) by the Cloud Native Computing Foundation (CNCF), we recommend identifying your OSM configurations and migrating them to an equivalent Istio configuration. For information about migrating from OSM to Istio, see [Migration guidance for Open Service Mesh (OSM) configurations to Istio](open-service-mesh-istio-migration-guidance.md).
16+
1417
> [!IMPORTANT]
1518
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM.
1619
>

articles/aks/open-service-mesh-deploy-addon-bicep.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ ms.editor: schaffererin
1212

1313
This article shows you how to deploy the Open Service Mesh (OSM) add-on to Azure Kubernetes Service (AKS) using a [Bicep](../azure-resource-manager/bicep/index.yml) template.
1414

15+
> [!NOTE]
16+
> With the retirement of [Open Service Mesh (OSM)](https://docs.openservicemesh.io/) by the Cloud Native Computing Foundation (CNCF), we recommend identifying your OSM configurations and migrating them to an equivalent Istio configuration. For information about migrating from OSM to Istio, see [Migration guidance for Open Service Mesh (OSM) configurations to Istio](open-service-mesh-istio-migration-guidance.md).
17+
1518
> [!IMPORTANT]
1619
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM.
1720
>

articles/aks/open-service-mesh-integrations.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ ms.date: 03/23/2022
99

1010
The Open Service Mesh (OSM) add-on integrates with features provided by Azure and some open source projects.
1111

12+
> [!NOTE]
13+
> With the retirement of [Open Service Mesh (OSM)](https://docs.openservicemesh.io/) by the Cloud Native Computing Foundation (CNCF), we recommend identifying your OSM configurations and migrating them to an equivalent Istio configuration. For information about migrating from OSM to Istio, see [Migration guidance for Open Service Mesh (OSM) configurations to Istio](open-service-mesh-istio-migration-guidance.md).
14+
1215
> [!IMPORTANT]
1316
> Integrations with open source projects aren't covered by the [AKS support policy][aks-support-policy].
1417

articles/aks/open-service-mesh-troubleshoot.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ ms.author: pgibson
1010

1111
When you deploy the Open Service Mesh (OSM) add-on for Azure Kubernetes Service (AKS), you may experience problems associated with the service mesh configuration. The article explores common troubleshooting errors and how to resolve them.
1212

13+
> [!NOTE]
14+
> With the retirement of [Open Service Mesh (OSM)](https://docs.openservicemesh.io/) by the Cloud Native Computing Foundation (CNCF), we recommend identifying your OSM configurations and migrating them to an equivalent Istio configuration. For information about migrating from OSM to Istio, see [Migration guidance for Open Service Mesh (OSM) configurations to Istio](open-service-mesh-istio-migration-guidance.md).
15+
1316
## Verifying and troubleshooting OSM components
1417

1518
### Check OSM Controller deployment, pod, and service

articles/aks/open-service-mesh-uninstall-add-on.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ ms.date: 06/19/2023
1010

1111
This article shows you how to uninstall the OMS add-on and related resources from your AKS cluster.
1212

13+
> [!NOTE]
14+
> With the retirement of [Open Service Mesh (OSM)](https://docs.openservicemesh.io/) by the Cloud Native Computing Foundation (CNCF), we recommend identifying your OSM configurations and migrating them to an equivalent Istio configuration. For information about migrating from OSM to Istio, see [Migration guidance for Open Service Mesh (OSM) configurations to Istio](open-service-mesh-istio-migration-guidance.md).
15+
1316
## Disable the OSM add-on from your cluster
1417

1518
* Disable the OSM add-on from your cluster using the [`az aks disable-addon`][az-aks-disable-addon] command and the `--addons` parameter.

articles/cosmos-db/postgresql/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@
132132
displayName: backup, restore, outage
133133
- name: High availability
134134
href: concepts-high-availability.md
135+
- name: Availability zones
136+
href: concepts-availability-zones.md
135137
- name: Replication
136138
href: concepts-read-replicas.md
137139
- name: Connection pooling (PgBouncer)
@@ -211,6 +213,8 @@
211213
items:
212214
- name: Configure high availability
213215
href: howto-high-availability.md
216+
- name: Use availability zones
217+
href: howto-availability-zones.md
214218
- name: Manage read replicas
215219
href: howto-read-replicas-portal.md
216220
displayName: replication, read replica

0 commit comments

Comments
 (0)