Skip to content

Commit 98c9c1c

Browse files
authored
Merge pull request #231539 from MicrosoftDocs/main
3/21 OOB Publish at 8AM
2 parents c077689 + 3ba48d4 commit 98c9c1c

Some content is hidden

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

53 files changed

+1118
-509
lines changed

articles/active-directory/fundamentals/azure-ad-data-residency.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: fundamentals
1010
ms.topic: conceptual
11-
ms.date: 01/31/2023
11+
ms.date: 03/21/2023
1212
ms.author: jricketts
1313
ms.reviewer: jricketts
1414
ms.custom: "it-pro"
@@ -88,7 +88,6 @@ Learn more: [Azure Active Directory, Product overview](https://www.microsoft.com
8888
|Azure AD Connect Health|Azure AD Connect Health generates alerts and reports in Azure Tables storage and blob storage.|In geo location|
8989
|Azure AD dynamic membership for groups, Azure AD self-service group management|Azure Tables storage holds dynamic membership rule definitions.|In geo location|
9090
|Azure AD Application Proxy|Azure AD Application Proxy stores metadata about the tenant, connector machines, and configuration data in Azure SQL.|In geo location|
91-
|Azure AD password reset |Azure AD password reset is a back-end service using Redis Cache to track session state. To learn more, go to redis.com to see [Introduction to Redis](https://redis.io/docs/about/).|See, Intro to Redis link in center column.|
9291
|Azure AD password writeback in Azure AD Connect|During initial configuration, Azure AD Connect generates an asymmetric keypair, using the Rivest–Shamir–Adleman (RSA) cryptosystem. It then sends the public key to the self-service password reset (SSPR) cloud service, which performs two operations: </br></br>1. Creates two Azure Service Bus relays for the Azure AD Connect on-premises service to communicate securely with the SSPR service </br> 2. Generates an Advanced Encryption Standard (AES) key, K1 </br></br> The Azure Service Bus relay locations, corresponding listener keys, and a copy of the AES key (K1) goes to Azure AD Connect in the response. Future communications between SSPR and Azure AD Connect occur over the new ServiceBus channel and are encrypted using SSL. </br> New password resets, submitted during operation, are encrypted with the RSA public key generated by the client during onboarding. The private key on the Azure AD Connect machine decrypts them, which prevents pipeline subsystems from accessing the plaintext password. </br> The AES key encrypts the message payload (encrypted passwords, more data, and metadata), which prevents malicious ServiceBus attackers from tampering with the payload, even with full access to the internal ServiceBus channel. </br> For password writeback, Azure AD Connect need keys and data: </br></br> - The AES key (K1) that encrypts the reset payload, or change requests from the SSPR service to Azure AD Connect, via the ServiceBus pipeline </br> - The private key, from the asymmetric key pair that decrypts the passwords, in reset or change request payloads </br> - The ServiceBus listener keys </br></br> The AES key (K1) and the asymmetric keypair rotate a minimum of every 180 days, a duration you can change during certain onboarding or offboarding configuration events. An example is a customer disables and re-enables password writeback, which might occur during component upgrade during service and maintenance. </br> The writeback keys and data stored in the Azure AD Connect database are encrypted by data protection application programming interfaces (DPAPI) (CALG_AES_256). The result is the master ADSync encryption key stored in the Windows Credential Vault in the context of the ADSync on-premises service account. The Windows Credential Vault supplies automatic secret re-encryption as the password for the service account changes. To reset the service account password invalidates secrets in the Windows Credential Vault for the service account. Manual changes to a new service account might invalidate the stored secrets.</br> By default, the ADSync service runs in the context of a virtual service account. The account might be customized during installation to a least-privileged domain service account, a managed service account (MSA), or a group managed service account (gMSA). While virtual and managed service accounts have automatic password rotation, customers manage password rotation for a custom provisioned domain account. As noted, to reset the password causes loss of stored secrets. |In geo location|
9392
|Azure AD Device Registration Service |Azure AD Device Registration Service has computer and device lifecycle management in the directory, which enable scenarios such as device-state conditional access, and mobile device management.|In geo location|
9493
|Azure AD provisioning|Azure AD provisioning creates, removes, and updates users in systems, such as software as service (SaaS) applications. It manages user creation in Azure AD and on-premises AD from cloud HR sources, like Workday. The service stores its configuration in an Azure Cosmos DB, which stores the group membership data for the user directory it keeps. Cosmos DB replicates the database to multiple datacenters in the same region as the tenant, which isolates the data, according to the Azure AD cloud solution model. Replication creates high availability and multiple reading and writing endpoints. Cosmos DB has encryption on the database information, and the encryption keys are stored in the secrets storage for Microsoft.|In geo location|

articles/aks/cluster-autoscaler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Both the horizontal pod autoscaler and cluster autoscaler can also decrease the
3030
The cluster autoscaler may be unable to scale down if pods can't move, such as in the following situations:
3131

3232
* A pod is directly created and isn't backed by a controller object, such as a deployment or replica set.
33-
* A pod disruption budget (PDB) is too restrictive and doesn't allow the number of pods to be fall below a certain threshold.
33+
* A pod disruption budget (PDB) is too restrictive and doesn't allow the number of pods to fall below a certain threshold.
3434
* A pod uses node selectors or anti-affinity that can't be honored if scheduled on a different node.
3535

3636
For more information about how the cluster autoscaler may be unable to scale down, see [What types of pods can prevent the cluster autoscaler from removing a node?][autoscaler-scaledown].

articles/cognitive-services/openai/chatgpt-quickstart.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
2-
title: 'Quickstart - Using the ChatGPT API'
2+
title: 'Quickstart - Get started using ChatGPT (Preview) and GPT-4 (Preview) with Azure OpenAI Service'
33
titleSuffix: Azure OpenAI Service
4-
description: Walkthrough on how to get started with Azure OpenAI Service ChatGPT API.
4+
description: Walkthrough on how to get started with ChatGPT and GPT-4 on Azure OpenAI Service.
55
services: cognitive-services
66
manager: nitinme
77
ms.service: cognitive-services
88
ms.subservice: openai
99
ms.topic: quickstart
1010
author: mrbullwinkle
1111
ms.author: mbullwin
12-
ms.date: 02/07/2023
12+
ms.date: 03/21/2023
1313
zone_pivot_groups: openai-quickstart
1414
recommendations: false
1515
---
1616

17-
# Quickstart: Get started using ChatGPT with Azure OpenAI Service
17+
# Quickstart: Get started using ChatGPT (preview) and GPT-4 (preview) with Azure OpenAI Service
1818

1919
Use this article to get started using Azure OpenAI.
2020

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

Lines changed: 30 additions & 9 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: cognitive-services
66
ms.topic: conceptual
7-
ms.date: 03/09/2023
7+
ms.date: 03/21/2023
88
ms.custom: event-tier1-build-2022, references_regions
99
manager: nitinme
1010
author: ChrisHMSFT
@@ -19,7 +19,8 @@ Azure OpenAI provides access to many different models, grouped by family and cap
1919

2020
| Model family | Description |
2121
|--|--|
22-
| [GPT-3](#gpt-3-models) | A series of models that can understand and generate natural language. This includes the new [ChatGPT model](#chatgpt-gpt-35-turbo). |
22+
| [GPT-4](#gpt-4-models) | A set of models that improve on GPT-3.5 and can understand as well as generate natural language and code. **These models are currently in preview.**|
23+
| [GPT-3](#gpt-3-models) | A series of models that can understand and generate natural language. This includes the new [ChatGPT model (preview)](#chatgpt-gpt-35-turbo-preview). |
2324
| [Codex](#codex-models) | A series of models that can understand and generate code, including translating natural language to code. |
2425
| [Embeddings](#embeddings-models) | A set of models that can understand and use embeddings. An embedding is a special format of data representation that can be easily utilized by machine learning models and algorithms. The embedding is an information dense representation of the semantic meaning of a piece of text. Currently, we offer three families of Embeddings models for different functionalities: similarity, text search, and code search. |
2526

@@ -53,7 +54,17 @@ You can get a list of models that are available for both inference and fine-tuni
5354

5455
## Finding the right model
5556

56-
We recommend starting with the most capable model in a model family to confirm whether the model capabilities meet your requirements. Then you can stay with that model or move to a model with lower capability and cost, optimizing around that model's capabilities.
57+
We recommend starting with the most capable model in a model family to confirm whether the model capabilities meet your requirements. Then you can stay with that model or move to a model with lower capability and cost, optimizing around that model's capabilities.
58+
59+
## GPT-4 models (preview)
60+
61+
GPT-4 can solve difficult problems with greater accuracy than any of OpenAI's previous models. Like gpt-35-turbo, GPT-4 is optimized for chat but works well for traditional completions tasks.
62+
63+
These models are currently in preview. For access, existing Azure OpenAI customers can [apply by filling out this form](https://aka.ms/oai/get-gpt4).
64+
- `gpt-4`
65+
- `gpt-4-32k`
66+
67+
The `gpt-4` supports 8192 max input tokens and the `gpt-4-32k` supports up to 32,768 tokens.
5768

5869
## GPT-3 models
5970

@@ -92,11 +103,11 @@ Ada is usually the fastest model and can perform tasks like parsing text, addres
92103

93104
**Use for**: Parsing text, simple classification, address correction, keywords
94105

95-
### ChatGPT (gpt-35-turbo)
106+
### ChatGPT (gpt-35-turbo) (preview)
96107

97108
The ChatGPT model (gpt-35-turbo) is a language model designed for conversational interfaces and the model behaves differently than previous GPT-3 models. Previous models were text-in and text-out, meaning they accepted a prompt string and returned a completion to append to the prompt. However, the ChatGPT model is conversation-in and message-out. The model expects a prompt string formatted in a specific chat-like transcript format, and returns a completion that represents a model-written message in the chat.
98109

99-
The ChatGPT model uses the same completion API that you use for other models like text-davinci-002, but it requires a unique prompt format. It's important to use the new prompt format to get the best results. Without the right prompts, the model tends to be verbose and provides less useful responses. To learn more check out our [in-depth how-to](../how-to/chatgpt.md).
110+
To learn more about the ChatGPT model and how to interact with the Chat API check out our [in-depth how-to](../how-to/chatgpt.md).
100111

101112
## Codex models
102113

@@ -173,13 +184,23 @@ When using our embeddings models, keep in mind their limitations and risks.
173184
| davinci<sup>1</sup> | Yes | No | N/A | East US<sup>2</sup>, South Central US, West Europe<sup>2</sup> | 2,049 | Oct 2019|
174185
| text-davinci-001 | Yes | No | South Central US, West Europe | N/A | | |
175186
| text-davinci-002 | Yes | No | East US, South Central US, West Europe | N/A | 4,097 | Jun 2021 |
176-
| text-davinci-003 | Yes | No | East US | N/A | 4,097 | Jun 2021 |
187+
| text-davinci-003 | Yes | No | East US, West Europe | N/A | 4,097 | Jun 2021 |
177188
| text-davinci-fine-tune-002<sup>1</sup> | Yes | No | N/A | East US, West Europe<sup>2</sup> | | |
178-
| gpt-35-turbo<sup>3</sup> (ChatGPT) | Yes | No | N/A | East US, South Central US | 4,096 | Sep 2021
189+
| gpt-35-turbo<sup>3</sup> (ChatGPT) (preview) | Yes | No | East US, South Central US | N/A | 4,096 | Sep 2021
179190

180191
<sup>1</sup> The model is available by request only. Currently we aren't accepting new requests to use the model.
181192
<br><sup>2</sup> East US and West Europe are currently unavailable for new customers to fine-tune due to high demand. Please use US South Central region for fine-tuning.
182-
<br><sup>3</sup> Currently, only version `"0301"` of this model is available. This version of the model will be deprecated on 8/1/2023 in favor of newer version of the gpt-35-model. See [ChatGPT model versioning](../how-to/chatgpt.md#model-versioning) for more details.
193+
<br><sup>3</sup> Currently, only version `0301` of this model is available. This version of the model will be deprecated on 8/1/2023 in favor of newer version of the gpt-35-model. See [ChatGPT model versioning](../how-to/chatgpt.md#model-versioning) for more details.
194+
195+
### GPT-4 Models
196+
197+
| Model ID | Supports Completions | Supports Embeddings | Base model Regions | Fine-Tuning Regions | Max Request (tokens) | Training Data (up to) |
198+
| ----------------------- | -------------------- | ------------------- | ------------------------- | ------------------- | -------------------- | ---------------------- |
199+
| `gpt-4` <sup>1,</sup><sup>2</sup> (preview) | Yes | No | East US, South Central US | N/A | 8,192 | September 2021 |
200+
| `gpt-4-32k` <sup>1,</sup><sup>2</sup> (preview) | Yes | No | East US, South Central US | N/A | 32,768 | September 2021 |
201+
202+
<sup>1</sup> The model is in preview and only available by request.<br>
203+
<sup>2</sup> Currently, only version `0314` of this model is available.
183204

184205
### Codex Models
185206
| Model ID | Supports Completions | Supports Embeddings | Base model Regions | Fine-Tuning Regions | Max Request (tokens) | Training Data (up to) |
@@ -194,7 +215,7 @@ When using our embeddings models, keep in mind their limitations and risks.
194215
### Embeddings Models
195216
| Model ID | Supports Completions | Supports Embeddings | Base model Regions | Fine-Tuning Regions | Max Request (tokens) | Training Data (up to) |
196217
| --- | --- | --- | --- | --- | --- | --- |
197-
| text-embeddings-ada-002 | No | Yes | East US, South Central US, West Europe | N/A |2,046 | Sep 2021 |
218+
| text-embedding-ada-002 | No | Yes | East US, South Central US, West Europe | N/A |8,192 | Sep 2021 |
198219
| text-similarity-ada-001 | No | Yes | East US, South Central US, West Europe | N/A | 2,046 | Aug 2020 |
199220
| text-similarity-babbage-001 | No | Yes | South Central US, West Europe | N/A | 2,046 | Aug 2020 |
200221
| text-similarity-curie-001 | No | Yes | East US, South Central US, West Europe | N/A | 2046 | Aug 2020 |

0 commit comments

Comments
 (0)