Skip to content

Commit 96ba476

Browse files
authored
Merge pull request #262425 from MicrosoftDocs/main
1/4/2024 AM Publish
2 parents a780259 + 6ecdc2b commit 96ba476

File tree

115 files changed

+2856
-1289
lines changed

Some content is hidden

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

115 files changed

+2856
-1289
lines changed

articles/ai-services/cognitive-services-data-loss-prevention.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,15 @@ The following services support data loss prevention configuration:
103103
* Speech Service
104104
* QnA Maker
105105
106+
107+
## Limitations
108+
109+
[Azure OpenAI on your data - text](./openai/concepts/use-your-data.md) features don't support data loss prevention yet. When `restrictOutboundNetworkAccess` is set as true, all requests to the following APIs will fail immediately to prevent potential data loss.
110+
111+
* /extensions/chat/completions (with text models)
112+
* /extensions/on-your-data/ingestion-jobs
113+
114+
106115
## Next steps
107116
108117
* [Configure Virtual Networks](cognitive-services-virtual-networks.md)

articles/ai-services/openai/how-to/create-resource.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ In this article, you review examples for creating and deploying resources in the
4646

4747
- Make API calls and generate text with [Azure OpenAI Service quickstarts](../quickstart.md).
4848
- Learn more about the [Azure OpenAI Service models](../concepts/models.md).
49+
- For information on pricing visit the [Azure OpenAI pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/)

articles/ai-services/openai/includes/create-resource-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The following steps show how to create an Azure OpenAI resource in the Azure por
3939
| **Resource group** | The Azure resource group to contain your Azure OpenAI resource. You can create a new group or use a pre-existing group. |
4040
| **Region** | The location of your instance. Different locations can introduce latency, but they don't affect the runtime availability of your resource. |
4141
| **Name** | A descriptive name for your Azure OpenAI Service resource, such as _MyOpenAIResource_. |
42-
| **Pricing Tier** | The pricing tier for the resource. Currently, only the Standard tier is available for the Azure OpenAI Service. |
42+
| **Pricing Tier** | The pricing tier for the resource. Currently, only the Standard tier is available for the Azure OpenAI Service. For more info on pricing visit the [Azure OpenAI pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) |
4343

4444
:::image type="content" source="../media/create-resource/create-resource-basic-settings.png" alt-text="Screenshot that shows how to configure an Azure OpenAI resource in the Azure portal.":::
4545

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ deployment_name='REPLACE_WITH_YOUR_DEPLOYMENT_NAME' #This will correspond to the
113113
print('Sending a test completion job')
114114
start_phrase = 'Write a tagline for an ice cream shop. '
115115
response = client.completions.create(model=deployment_name, prompt=start_phrase, max_tokens=10)
116-
print(response.choices[0].text)
116+
print(start_phrase+response.choices[0].text)
117117
```
118118

119119
---

articles/azure-arc/servers/deployment-options.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Connected Machine agent deployment options
33
description: Learn about the different options to onboard machines to Azure Arc-enabled servers.
4-
ms.date: 05/04/2023
4+
ms.date: 01/03/2024
55
ms.topic: how-to
66
---
77

@@ -24,6 +24,8 @@ The following table highlights each method so that you can determine which works
2424
| At scale | [Connect machines with a Configuration Manager custom task sequence](onboard-configuration-manager-custom-task.md)
2525
| At scale | [Connect Windows machines using Group Policy](onboard-group-policy-powershell.md)
2626
| At scale | [Connect machines from Automation Update Management](onboard-update-management-machines.md) to create a service principal that installs and configures the agent for multiple machines managed with Azure Automation Update Management to connect machines non-interactively. |
27+
| At scale | [Connect your VMware vCenter server to Azure Arc by using the helper script](../vmware-vsphere/quick-start-connect-vcenter-to-arc-using-script.md) if you're using VMware vCenter to manage your on-premises estate. |
28+
| At scale | [Connect your System Center Virtual Machine Manager management server to Azure Arc by using the helper script](../system-center-virtual-machine-manager/quickstart-connect-system-center-virtual-machine-manager-to-arc.md) if you're using SCVMM to manage your on-premises estate. |
2729

2830
> [!IMPORTANT]
2931
> The Connected Machine agent cannot be installed on an Azure virtual machine. The install script will warn you and roll back if it detects the server is running in Azure.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: How to prepare to deliver Extended Security Updates for Windows Server 2012 through Azure Arc
33
description: Learn how to prepare to deliver Extended Security Updates for Windows Server 2012 through Azure Arc.
4-
ms.date: 11/22/2023
4+
ms.date: 01/03/2024
55
ms.topic: conceptual
66
---
77

@@ -56,7 +56,7 @@ You must also download both the licensing package and servicing stack update (SS
5656

5757
### Deployment options
5858

59-
There are several at-scale onboarding options for Azure Arc-enabled servers, including running a [Custom Task Sequence](onboard-configuration-manager-custom-task.md) through Configuration Manager and deploying a [Scheduled Task through Group Policy](onboard-group-policy-powershell.md).
59+
There are several at-scale onboarding options for Azure Arc-enabled servers, including running a [Custom Task Sequence](onboard-configuration-manager-custom-task.md) through Configuration Manager and deploying a [Scheduled Task through Group Policy](onboard-group-policy-powershell.md). There are also at-scale ESU delivery options for [VMware vCenter managed VMs](../vmware-vsphere/deliver-extended-security-updates-for-vmware-vms-through-arc.md) and [SCVMM managed VMs](../system-center-virtual-machine-manager/deliver-esus-for-system-center-virtual-machine-manager-vms.md) through Azure Arc.
6060

6161
> [!NOTE]
6262
> Delivery of ESUs through Azure Arc to virtual machines running on Virtual Desktop Infrastructure (VDI) is not recommended. VDI systems should use Multiple Activation Keys (MAK) to apply ESUs. See [Access your Multiple Activation Key from the Microsoft 365 Admin Center](/windows-server/get-started/extended-security-updates-deploy) to learn more.

0 commit comments

Comments
 (0)