Skip to content

Commit ee9c0a3

Browse files
authored
Merge branch 'MicrosoftDocs:main' into Broken-links-fix-tomcassidy
2 parents 3dd5816 + 51d99b0 commit ee9c0a3

File tree

80 files changed

+2002
-652
lines changed

Some content is hidden

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

80 files changed

+2002
-652
lines changed

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

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
5454
| `gpt-4` (0125-Preview)*<br>**GPT-4 Turbo Preview** | **Preview Model** <br> -Replaces 1106-Preview <br>- Better code generation performance <br> - Reduces cases where the model doesn't complete a task <br> - JSON Mode <br> - parallel function calling <br> - reproducible output (preview) | Input: 128,000 <br> Output: 4,096 | Dec 2023 |
5555
| `gpt-4` (vision-preview)<br>**GPT-4 Turbo with Vision Preview** | **Preview model** <br> - Accepts text and image input. <br> - Supports enhancements <br> - JSON Mode <br> - parallel function calling <br> - reproducible output (preview) | Input: 128,000 <br> Output: 4,096 | Apr 2023 |
5656
| `gpt-4` (1106-Preview)<br>**GPT-4 Turbo Preview** | **Preview Model** <br> - JSON Mode <br> - parallel function calling <br> - reproducible output (preview) | Input: 128,000 <br> Output: 4,096 | Apr 2023 |
57-
| `gpt-4-32k` (0613) | **Older GA model** <br> - Basic function calling with tools | 32,768 | Sep 2021 |
57+
| `gpt-4-32k` (0613) | **Older GA model** <br> - Basic function calling with tools | 32,768 | Sep 2021 |
5858
| `gpt-4` (0613) | **Older GA model** <br> - Basic function calling with tools | 8,192 | Sep 2021 |
59-
| `gpt-4-32k`(0314) | **Older GA model** <br> - Deprecated function calling | 32,768 | Sep 2021 |
60-
| `gpt-4` (0314) | **Older GA model** <br> - Deprecated function calling | 8,192 | Sep 2021 |
59+
| `gpt-4-32k`(0314) | **Older GA model** <br> - [Retirement information](./model-retirements.md#current-models) | 32,768 | Sep 2021 |
60+
| `gpt-4` (0314) | **Older GA model** <br> - [Retirement information](./model-retirements.md#current-models) | 8,192 | Sep 2021 |
6161

6262
> [!CAUTION]
6363
> We don't recommend using preview models in production. We will upgrade all deployments of preview models to either future preview versions or to the latest stable/GA version. Models designated preview do not follow the standard Azure OpenAI model lifecycle.
@@ -76,14 +76,20 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
7676

7777
GPT-3.5 models can understand and generate natural language or code. The most capable and cost effective model in the GPT-3.5 family is GPT-3.5 Turbo, which has been optimized for chat and works well for traditional completions tasks as well. GPT-3.5 Turbo is available for use with the Chat Completions API. GPT-3.5 Turbo Instruct has similar capabilities to `text-davinci-003` using the Completions API instead of the Chat Completions API. We recommend using GPT-3.5 Turbo and GPT-3.5 Turbo Instruct over [legacy GPT-3.5 and GPT-3 models](./legacy-models.md).
7878

79-
- `gpt-35-turbo`
80-
- `gpt-35-turbo-16k`
81-
- `gpt-35-turbo-instruct`
8279

83-
You can see the token context length supported by each model in the [model summary table](#model-summary-table-and-region-availability).
80+
| Model ID | Description | Max Request (tokens) | Training Data (up to) |
81+
| --------- |:---|:------:|:----:|
82+
| `gpt-35-turbo` (0125) **NEW** | **Latest GA Model** <br> - JSON Mode <br> - parallel function calling <br> - reproducible output (preview) <br> - Higher accuracy at responding in requested formats. <br> - Fix for a bug which caused a text encoding issue for non-English language function calls. | Input: 16,385<br> Output: 4,096 | Sep 2021 |
83+
| `gpt-35-turbo` (1106) | **Older GA Model** <br> - JSON Mode <br> - parallel function calling <br> - reproducible output (preview) | Input: 16,385<br> Output: 4,096 | Sep 2021|
84+
| `gpt-35-turbo-instruct` (0914) | **Completions endpoint only** | 4,097 |Sep 2021 |
85+
| `gpt-35-turbo-16k` (0613) | **Older GA Model** <br> - Basic function calling with tools | 16,384 | Sep 2021 |
86+
| `gpt-35-turbo` (0613) | **Older GA Model** <br> - Basic function calling with tools | 4,096 | Sep 2021 |
87+
| `gpt-35-turbo`**<sup>1</sup>** (0301) | **Older GA Model** <br> - [Retirement information](./model-retirements.md#current-models) | 4,096 | Sep 2021 |
8488

8589
To learn more about how to interact with GPT-3.5 Turbo and the Chat Completions API check out our [in-depth how-to](../how-to/chatgpt.md).
8690

91+
**<sup>1</sup>** This model will accept requests > 4,096 tokens. It is not recommended to exceed the 4,096 input token limit as the newer version of the model are capped at 4,096 tokens. If you encounter issues when exceeding 4,096 input tokens with this model this configuration is not officially supported.
92+
8793
## Embeddings
8894

8995
`text-embedding-3-large` is the latest and most capable embedding model. Upgrading between embeddings models is not possible. In order to move from using `text-embedding-ada-002` to `text-embedding-3-large` you would need to generate new embeddings.
@@ -184,23 +190,12 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
184190
> [!NOTE]
185191
> Version `0613` of `gpt-35-turbo` and `gpt-35-turbo-16k` will be retired no earlier than August 1, 2024. Version `0301` of `gpt-35-turbo` will be retired no earlier than August 1, 2024. See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
186192
187-
| Model ID | Max Request (tokens) | Training Data (up to) |
188-
| --------- |:------:|:----:|
189-
| `gpt-35-turbo`**<sup>1</sup>** (0301) | 4,096 | Sep 2021 |
190-
| `gpt-35-turbo` (0613) | 4,096 | Sep 2021 |
191-
| `gpt-35-turbo-16k` (0613) | 16,384 | Sep 2021 |
192-
| `gpt-35-turbo-instruct` (0914) | 4,097 |Sep 2021 |
193-
| `gpt-35-turbo` (1106) | Input: 16,385<br> Output: 4,096 | Sep 2021|
194-
| `gpt-35-turbo` (0125) **NEW** | Input: 16,385<br> Output: 4,096 | Sep 2021 |
195-
196193
### GPT-3.5-Turbo model availability
197194

198195
#### Public cloud regions
199196

200197
[!INCLUDE [GPT-35-Turbo](../includes/model-matrix/standard-gpt-35-turbo.md)]
201198

202-
**<sup>1</sup>** This model will accept requests > 4,096 tokens. It is not recommended to exceed the 4,096 input token limit as the newer version of the model are capped at 4,096 tokens. If you encounter issues when exceeding 4,096 input tokens with this model this configuration is not officially supported.
203-
204199
#### Azure Government regions
205200

206201
The following GPT-3.5 turbo models are available with [Azure Government](/azure/azure-government/documentation-government-welcome):

articles/azure-app-configuration/quickstart-bicep.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
2828

2929
Managing an Azure App Configuration resource with Bicep file requires an Azure Resource Manager role, such as contributor or owner. Accessing Azure App Configuration data (key-values, snapshots) requires an Azure Resource Manager role and an additional Azure App Configuration [data plane role](concept-enable-rbac.md) when the configuration store's ARM authentication mode is set to [pass-through](./quickstart-deployment-overview.md#azure-resource-manager-authentication-mode) ARM authentication mode.
3030

31+
> [!IMPORTANT]
32+
> Configuring ARM authentication mode requires App Configuration control plane API version `2023-08-01-preview` or later.
33+
3134
## Review the Bicep file
3235

3336
The Bicep file used in this quickstart is from [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/app-configuration-store-kv/).
@@ -39,8 +42,8 @@ The Bicep file used in this quickstart is from [Azure Quickstart Templates](http
3942

4043
Two Azure resources are defined in the Bicep file:
4144

42-
- [Microsoft.AppConfiguration/configurationStores](/azure/templates/microsoft.appconfiguration/2020-07-01-preview/configurationstores): create an App Configuration store.
43-
- [Microsoft.AppConfiguration/configurationStores/keyValues](/azure/templates/microsoft.appconfiguration/2020-07-01-preview/configurationstores/keyvalues): create a key-value inside the App Configuration store.
45+
- [Microsoft.AppConfiguration/configurationStores](/azure/templates/microsoft.appconfiguration/configurationstores): create an App Configuration store.
46+
- [Microsoft.AppConfiguration/configurationStores/keyValues](/azure/templates/microsoft.appconfiguration/configurationstores/keyvalues): create a key-value inside the App Configuration store.
4447

4548
With this Bicep file, we create one key with two different values, one of which has a unique label.
4649

articles/azure-app-configuration/quickstart-deployment-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ To learn more about Azure RBAC and Microsoft Entra ID, see [Authorize access to
3333

3434
Azure App Configuration data, such as key-values and snapshots, can be managed in deployment. When managing App Configuration data using this method, it's recommended to set your configuration store's Azure Resource Manager authentication mode to **Pass-through**. This authentication mode ensures that data access requires a combination of data plane and Azure Resource Manager management roles and ensuring that data access can be properly attributed to the deployment caller for auditing purpose.
3535

36+
> [!IMPORTANT]
37+
> App Configuration control plane API version `2023-08-01-preview` or later is required to configure **Azure Resource Manager Authentication Mode** using [ARM template](./quickstart-resource-manager.md), [Bicep](./quickstart-bicep.md), or REST API. See the [REST API examples](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/appconfiguration/resource-manager/Microsoft.AppConfiguration/preview/2023-08-01-preview/examples/ConfigurationStoresCreateWithDataPlaneProxy.json).
38+
3639
### Azure Resource Manager authentication mode
3740

3841
# [Azure portal](#tab/portal)

articles/azure-app-configuration/quickstart-resource-manager.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,24 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
3535

3636
Managing Azure App Configuration resource inside an ARM template requires Azure Resource Manager role, such as contributor or owner. Accessing Azure App Configuration data (key-values, snapshots) requires Azure Resource Manager role and Azure App Configuration [data plane role](concept-enable-rbac.md) under [pass-through](./quickstart-deployment-overview.md#azure-resource-manager-authentication-mode) ARM authentication mode.
3737

38+
> [!IMPORTANT]
39+
> Configuring ARM authentication mode requires App Configuration control plane API version `2023-08-01-preview` or later.
40+
3841
## Review the template
3942

4043
The template used in this quickstart is from [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/app-configuration-store-kv/). It creates a new App Configuration store with two key-values inside. It then uses the `reference` function to output the values of the two key-value resources. Reading the key's value in this way allows it to be used in other places in the template.
4144

4245
The quickstart uses the `copy` element to create multiple instances of key-value resource. To learn more about the `copy` element, see [Resource iteration in ARM templates](../azure-resource-manager/templates/copy-resources.md).
4346

4447
> [!IMPORTANT]
45-
> This template requires App Configuration resource provider version `2020-07-01-preview` or later. This version uses the `reference` function to read key-values. The `listKeyValue` function that was used to read key-values in the previous version is not available starting in version `2020-07-01-preview`.
48+
> This template requires App Configuration control plane API version `2022-05-01` or later. This version uses the `reference` function to read key-values. The `listKeyValue` function that was used to read key-values in the previous version is not available starting in version `2020-07-01-preview`.
4649
4750
:::code language="json" source="~/quickstart-templates/quickstarts/microsoft.appconfiguration/app-configuration-store-kv/azuredeploy.json":::
4851

4952
Two Azure resources are defined in the template:
5053

51-
- [Microsoft.AppConfiguration/configurationStores](/azure/templates/microsoft.appconfiguration/2020-07-01-preview/configurationstores): create an App Configuration store.
52-
- [Microsoft.AppConfiguration/configurationStores/keyValues](/azure/templates/microsoft.appconfiguration/2020-07-01-preview/configurationstores/keyvalues): create a key-value inside the App Configuration store.
54+
- [Microsoft.AppConfiguration/configurationStores](/azure/templates/microsoft.appconfiguration/configurationstores): create an App Configuration store.
55+
- [Microsoft.AppConfiguration/configurationStores/keyValues](/azure/templates/microsoft.appconfiguration/configurationstores/keyvalues): create a key-value inside the App Configuration store.
5356

5457
> [!TIP]
5558
> The `keyValues` resource's name is a combination of key and label. The key and label are joined by the `$` delimiter. The label is optional. In the above example, the `keyValues` resource with name `myKey` creates a key-value without a label.

articles/azure-monitor/containers/prometheus-remote-write-active-directory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ This step is required only if you didn't turn on Azure Key Vault Provider for Se
156156
| Value | Description |
157157
|:---|:---|
158158
| `<CLUSTER-NAME>` | The name of your AKS cluster. |
159-
| `<CONTAINER-IMAGE-VERSION>` | `mcr.microsoft.com/azuremonitor/prometheus/promdev/prom-remotewrite:prom-remotewrite-20230906.1`<br>The remote write container image version. |
159+
| `<CONTAINER-IMAGE-VERSION>` | `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-remote-write/images:prom-remotewrite-20240507.1`<br>The remote write container image version. |
160160
| `<INGESTION-URL>` | The value for **Metrics ingestion endpoint** from the **Overview** page for the Azure Monitor workspace. |
161161
| `<APP-REGISTRATION -CLIENT-ID>` | The client ID of your application. |
162162
| `<TENANT-ID>` | The tenant ID of the Microsoft Entra application. |

articles/azure-monitor/containers/prometheus-remote-write-azure-ad-pod-identity.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,21 @@ The `aadpodidbinding` label must be added to the Prometheus pod for the pod-mana
9898

9999
[!INCLUDE[pod-identity-yaml](../includes/prometheus-sidecar-remote-write-pod-identity-yaml.md)]
100100

101+
1. Replace the following values in the YAML:
102+
103+
| Value | Description |
104+
|:---|:---|
105+
| `<AKS-CLUSTER-NAME>` | The name of your AKS cluster. |
106+
| `<CONTAINER-IMAGE-VERSION>` | `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-remote-write/images:prom-remotewrite-20240507.1`<br> The remote write container image version. |
107+
| `<INGESTION-URL>` | The value for **Metrics ingestion endpoint** from the **Overview** page for the Azure Monitor workspace. |
108+
| `<MANAGED-IDENTITY-CLIENT-ID>` | The value for **Client ID** from the **Overview** page for the managed identity. |
109+
| `<CLUSTER-NAME>` | Name of the cluster that Prometheus is running on. |
110+
111+
> [!IMPORTANT]
112+
> For Azure Government cloud, add the following environment variables in the `env` section of the YAML file:
113+
>
114+
> `- name: INGESTION_AAD_AUDIENCE value: https://monitor.azure.us/`
115+
101116
1. Use Helm to apply the YAML file and update your Prometheus configuration:
102117

103118
```azurecli

articles/azure-monitor/containers/prometheus-remote-write-azure-workload-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ az ad app federated-credential create --id ${APPLICATION_OBJECT_ID} --parameters
164164
| Value | Description |
165165
|:---|:---|
166166
| `<CLUSTER-NAME>` | The name of your AKS cluster. |
167-
| `<CONTAINER-IMAGE-VERSION>` | `mcr.microsoft.com/azuremonitor/prometheus/promdev/prom-remotewrite:prom-remotewrite-20230906.1` <br>The remote write container image version. |
167+
| `<CONTAINER-IMAGE-VERSION>` | `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-remote-write/images:prom-remotewrite-20240507.1` <br>The remote write container image version. |
168168
| `<INGESTION-URL>` | The value for **Metrics ingestion endpoint** from the **Overview** page for the Azure Monitor workspace. |
169169

170170
1. Use Helm to apply the YAML file and update your Prometheus configuration:

articles/azure-monitor/containers/prometheus-remote-write-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ This step isn't required if you're using an AKS identity. An AKS identity alread
118118
| Value | Description |
119119
|:---|:---|
120120
| `<AKS-CLUSTER-NAME>` | The name of your AKS cluster. |
121-
| `<CONTAINER-IMAGE-VERSION>` | `mcr.microsoft.com/azuremonitor/prometheus/promdev/prom-remotewrite:prom-remotewrite-20230906.1`<br> The remote write container image version. |
121+
| `<CONTAINER-IMAGE-VERSION>` | `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-remote-write/images:prom-remotewrite-20240507.1`<br> The remote write container image version. |
122122
| `<INGESTION-URL>` | The value for **Metrics ingestion endpoint** from the **Overview** page for the Azure Monitor workspace. |
123123
| `<MANAGED-IDENTITY-CLIENT-ID>` | The value for **Client ID** from the **Overview** page for the managed identity. |
124124
| `<CLUSTER-NAME>` | Name of the cluster that Prometheus is running on. |
13.7 KB
Loading

articles/azure-resource-manager/bicep/private-module-registry.md

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create private registry for Bicep module
33
description: Learn how to set up an Azure container registry for private Bicep modules
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 04/18/2023
6+
ms.date: 05/10/2024
77
---
88

99
# Create private registry for Bicep modules
@@ -73,14 +73,38 @@ az bicep publish --file storage.bicep --target br:exampleregistry.azurecr.io/bic
7373

7474
---
7575

76+
With Bicep CLI version 0.27.1 or newer, you can publish a module with the Bicep source code in addition to the compiled JSON template. If a module is published with the Bicep source code to a registry, you can press `F12` ([Go to Definition](./visual-studio-code.md#go-to-definition)) from Visual Studio Code to see the Bicep Code. The Bicep extension version 0.27 or new is required to see the Bicep file.
77+
78+
# [PowerShell](#tab/azure-powershell)
79+
80+
```azurepowershell
81+
Publish-AzBicepModule -FilePath ./storage.bicep -Target br:exampleregistry.azurecr.io/bicep/modules/storage:v1 -DocumentationUri https://www.contoso.com/exampleregistry.html -WithSource
82+
```
83+
84+
# [Azure CLI](#tab/azure-cli)
85+
86+
To run this deployment command, you must have the [latest version](/cli/azure/install-azure-cli) of Azure CLI.
87+
88+
```azurecli
89+
az bicep publish --file storage.bicep --target br:exampleregistry.azurecr.io/bicep/modules/storage:v1 --documentationUri https://www.contoso.com/exampleregistry.html --with-source
90+
```
91+
92+
---
93+
94+
With the with source switch, you see an additional layer in the manifest:
95+
96+
:::image type="content" source="./media/private-module-registry/bicep-module-with-source-manifest.png" lightbox="./media/private-module-registry/bicep-module-with-source-manifest.png" alt-text="Screenshot of bicep module registry with source.":::
97+
98+
Note that if the Bicep module references a module in a Private Registry, the ACR endpoint will be visible. To hide the full endpoint, you can configure an alias for the private registry.
99+
76100
## View files in registry
77101

78102
To see the published module in the portal:
79103

80104
1. Sign in to the [Azure portal](https://portal.azure.com).
81105
1. Search for **container registries**.
82106
1. Select your registry.
83-
1. Select **Repositories** from the left menu.
107+
1. Select **Services** -> **Repositories** from the left menu.
84108
1. Select the module path (repository). In the preceding example, the module path name is **bicep/modules/storage**.
85109
1. Select the tag. In the preceding example, the tag is **v1**.
86110
1. The **Artifact reference** matches the reference you'll use in the Bicep file.

0 commit comments

Comments
 (0)