Merge pull request #260575 from MicrosoftDocs/main

12/7 11:00 AM IST Publish

Author: Saisang

articles/ai-services/openai/how-to/json-mode.md

@@ -90,7 +90,7 @@ $messages += @{
 }
 $messages += @{
   role     = 'user'
-  content  = 'Who through the final pitch during the world series each year from 1979 to 1989?'
+  content  = 'Who threw the final pitch during the world series each year from 1979 to 1989?'
 }
 $messages += @{
   role     = 'user'
@@ -155,4 +155,4 @@ BadRequestError: Error code: 400 - {'error': {'message': "'messages' must contai
 You should check `finish_reason` for the value `length` before parsing the response. The model might generate partial JSON. This means that output from the model was larger than the available max_tokens that were set as part of the request, or the conversation itself exceeded the token limit.
 
 JSON mode produces JSON that is valid and parses without error. However, there's no guarantee for
-output to match a specific schema, even if requested in the prompt.
+output to match a specific schema, even if requested in the prompt.

articles/ai-services/openai/how-to/reproducible-output.md

@@ -24,8 +24,8 @@ Reproducible output is only currently supported with the following:
 
 ### Supported models
 
-- `gpt-4-1106-preview`
-- `gpt-35-turbo-1106`
+- `gpt-4-1106-preview` ([region availability](../concepts/models.md#gpt-4-and-gpt-4-turbo-preview-model-availability))
+- `gpt-35-turbo-1106` ([region availability)](../concepts/models.md#gpt-35-turbo-model-availability))
 
 ### API Version
 
@@ -35,6 +35,8 @@ Reproducible output is only currently supported with the following:
 
 First we'll generate three responses to the same question to demonstrate the variability that is common to Chat Completion responses even when other parameters are the same:
 
+# [Python](#tab/pyton)
+
 ```python
 import os
 from openai import AzureOpenAI
@@ -65,6 +67,47 @@ for i in range(3):
   del response
 ```
 
+# [PowerShell](#tab/powershell)
+
+```powershell-interactive
+$openai = @{
+   api_key     = $Env:AZURE_OPENAI_KEY
+   api_base    = $Env:AZURE_OPENAI_ENDPOINT # like the following https://YOUR_RESOURCE_NAME.openai.azure.com/
+   api_version = '2023-12-01-preview' # may change in the future
+   name        = 'YOUR-DEPLOYMENT-NAME-HERE' # name you chose for your deployment
+}
+
+$headers = @{
+  'api-key' = $openai.api_key
+}
+
+$messages  = @()
+$messages += @{
+  role     = 'system'
+  content  = 'You are a helpful assistant.'
+}
+$messages += @{
+  role     = 'user'
+  content  = 'Tell me a story about how the universe began?'
+}
+
+$body         = @{
+  #seed       = 42
+  temperature = 0.7
+  max_tokens  = 200
+  messages    = $messages
+} | ConvertTo-Json
+
+$url = "$($openai.api_base)/openai/deployments/$($openai.name)/chat/completions?api-version=$($openai.api_version)"
+
+for ($i=0; $i -le 2; $i++) {
+  $response = Invoke-RestMethod -Uri $url -Headers $headers -Body $body -Method Post -ContentType 'application/json'
+  write-host "Story Version $($i+1)`n---`n$($response.choices[0].message.content)`n---`n"
+}
+```
+
+---
+
 ### Output
 
 ```output
@@ -104,6 +147,8 @@ Notice that while each story might have similar elements and some verbatim repet
 
 Now we'll run the same code as before but this time uncomment the line for the parameter that says `seed=42`
 
+# [Python](#tab/pyton)
+
 ```python
 import os
 from openai import AzureOpenAI
@@ -134,6 +179,47 @@ for i in range(3):
   del response
 ```
 
+# [PowerShell](#tab/powershell)
+
+```powershell-interactive
+$openai = @{
+   api_key     = $Env:AZURE_OPENAI_KEY
+   api_base    = $Env:AZURE_OPENAI_ENDPOINT # like the following https://YOUR_RESOURCE_NAME.openai.azure.com/
+   api_version = '2023-12-01-preview' # may change in the future
+   name        = 'YOUR-DEPLOYMENT-NAME-HERE' # name you chose for your deployment
+}
+
+$headers = @{
+  'api-key' = $openai.api_key
+}
+
+$messages  = @()
+$messages += @{
+  role     = 'system'
+  content  = 'You are a helpful assistant.'
+}
+$messages += @{
+  role     = 'user'
+  content  = 'Tell me a story about how the universe began?'
+}
+
+$body         = @{
+  seed        = 42
+  temperature = 0.7
+  max_tokens  = 200
+  messages    = $messages
+} | ConvertTo-Json
+
+$url = "$($openai.api_base)/openai/deployments/$($openai.name)/chat/completions?api-version=$($openai.api_version)"
+
+for ($i=0; $i -le 2; $i++) {
+  $response = Invoke-RestMethod -Uri $url -Headers $headers -Body $body -Method Post -ContentType 'application/json'
+  write-host "Story Version $($i+1)`n---`n$($response.choices[0].message.content)`n---`n"
+}
+```
+
+---
+
 ### Output
 
 ```
@@ -179,7 +265,7 @@ This fingerprint represents the backend configuration that the model runs with.
 
 It can be used with the seed request parameter to understand when backend changes have been made that might affect determinism.
 
-To view the full chat completion object with `system_fingerprint`, you could add ` print(response.model_dump_json(indent=2))` to the previous code next to the existing print statement. This change results in the following additional information being part of the output:
+To view the full chat completion object with `system_fingerprint`, you could add ` print(response.model_dump_json(indent=2))` to the previous Python code next to the existing print statement, or `$response | convertto-json -depth 5` at the end of the PowerShell example. This change results in the following additional information being part of the output:
 
 ### Output
 

articles/ai-services/openai/includes/embeddings-powershell.md

@@ -143,7 +143,7 @@ param(
     [string]$content
 )
     # tab, line breaks, empty space
-    $replace = @('\t','\r\n','\n','\r','  ')
+    $replace = @('\t','\r\n','\n','\r')
     # non-UTF8 characters
     $replace += @('[^\x00-\x7F]')
     # html
@@ -157,7 +157,7 @@ param(
     # markdown
     $replace += @('###','##','#','```')
     $replace | ForEach-Object {
-        $content = $content -replace $_, ' '
+        $content = $content -replace $_, ' ' -replace '  ',' '
     }
     return $content
 }
@@ -413,4 +413,4 @@ the entire datatable). As a learning exercise, try creating a PowerShell script
 [09]: ../concepts/understand-embeddings.md#cosine-similarity
 [10]: /azure/search/vector-search-overview
 [11]: https://platform.openai.com/docs/guides/rate-limits/error-mitigation
-[12]: https://www.powershellgallery.com/packages/Measure-VectorSimilarity/
+[12]: https://www.powershellgallery.com/packages/Measure-VectorSimilarity/

articles/ai-studio/toc.yml

@@ -187,10 +187,6 @@
   items:
   - name: Azure AI SDK for Python
     href: /python/api/overview/azure/ai
-  - name: Azure CLI
-    href: /cli/azure/cognitiveservices
-  - name: Azure PowerShell
-    href: /powershell/module/azurerm.cognitiveservices/
   - name: Azure Policy built-ins
     displayName: samples, policies, definitions
     href: ../ai-services/policy-reference.md?context=/azure/ai-studio/context/context

articles/aks/trusted-access-feature.md

@@ -4,7 +4,7 @@ description: Learn how to use the Trusted Access feature to enable Azure resourc
 author: schaffererin
 ms.topic: article
 ms.custom: devx-track-azurecli
-ms.date: 05/23/2023
+ms.date: 12/04/2023
 ms.author: schaffererin
 ---
 
@@ -26,6 +26,9 @@ This article shows you how to enable secure access from your Azure services to y
 
 [!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
 
+> [!NOTE]
+> The Trusted Access API is GA. We provide GA support for CLI, however it's still in preview and requires the `aks-preview` extension.
+
 ## Trusted Access feature overview
 
 Trusted Access enables you to give explicit consent to your system-assigned MSI of allowed resources to access your AKS clusters using an Azure resource *RoleBinding*. Your Azure resources access AKS clusters through the AKS regional gateway via system-assigned managed identity authentication with the appropriate Kubernetes permissions via an Azure resource *Role*. The Trusted Access feature allows you to access AKS clusters with different configurations, including but not limited to [private clusters](private-clusters.md), [clusters with local accounts disabled](manage-local-accounts-managed-azure-ad.md#disable-local-accounts), [Microsoft Entra ID clusters](azure-ad-integration-cli.md), and [authorized IP range clusters](api-server-authorized-ip-ranges.md).

articles/aks/upgrade-aks-cluster.md

@@ -289,7 +289,9 @@ To stagger a node upgrade in a controlled manner and minimize application downti
     ...
     default 2m1s Normal Drain node/aks-nodepool1-96663640-vmss000001 Draining node: [aks-nodepool1-96663640-vmss000001]
     ...
-    default 9m22s Normal Surge node/aks-nodepool1-96663640-vmss000002 Created a surge node [aks-nodepool1-96663640-vmss000002 nodepool1] for agentpool %!s(MISSING)
+    default 1m45s Normal Upgrade node/aks-nodepool1-96663640-vmss000001   Soak duration 5m0s after draining node: aks-nodepool1-96663640-vmss000001
+    ...
+    default 9m22s Normal Surge node/aks-nodepool1-96663640-vmss000002 Created a surge node [aks-nodepool1-96663640-vmss000002 nodepool1] for agentpool nodepool1
     ...
     ```
 

articles/azure-monitor/agents/log-analytics-agent.md

@@ -14,7 +14,7 @@ ms.reviewer: luki
 This article provides a detailed overview of the Log Analytics agent and the agent's system and network requirements and deployment methods.
 
 >[!IMPORTANT]
->The Log Analytics agent is on a **deprecation path** and won't be supported after **August 31, 2024**. If you use the Log Analytics agent to ingest data to Azure Monitor, [migrate to the new Azure Monitor agent](./azure-monitor-agent-migration.md) prior to that date.
+>The Log Analytics agent is on a **deprecation path** and won't be supported after **August 31, 2024**. Any new data centers brought online after January 1 2024 will not support the Log Analytics agent. If you use the Log Analytics agent to ingest data to Azure Monitor, [migrate to the new Azure Monitor agent](./azure-monitor-agent-migration.md) prior to that date.
 
 You might also see the Log Analytics agent referred to as Microsoft Monitoring Agent (MMA).
 

articles/azure-monitor/containers/container-insights-metric-alerts.md

@@ -11,7 +11,8 @@ ms.reviewer: aul
 Metric alerts in Azure Monitor proactively identify issues related to system resources of your Azure resources, including monitored Kubernetes clusters. Container insights provides preconfigured alert rules so that you don't have to create your own. This article describes the different types of alert rules you can create and how to enable and configure them.
 
 > [!IMPORTANT]
-> Container insights in Azure Monitor now supports alerts based on Prometheus metrics, and metric rules will be retired on March 14, 2026. If you already use alerts based on custom metrics, you should migrate to Prometheus alerts and disable the equivalent custom metric alerts. As of August 15, 2023, you will no longer be able to configure new custom metric recommended alerts using the portal.
+> Azure Monitor now supports alerts based on Prometheus metrics, and metric rules in Container insights will be retired on May 31, 2024 (this was previously announced as March 14, 2026). If you already use alerts based on custom metrics, you should migrate to Prometheus alerts and disable the equivalent custom metric alerts. As of August 15, 2023, you are no longer be able to configure new custom metric recommended alerts using the portal.
+
 ## Types of metric alert rules
 
 There are two types of metric rules used by Container insights based on either Prometheus metrics or custom metrics. See a list of the specific alert rules for each at [Alert rule details](#alert-rule-details).
@@ -50,6 +51,7 @@ The methods currently available for creating Prometheus alert rules are Azure Re
 1. To deploy community and recommended alerts, follow this [template](https://aka.ms/azureprometheus-alerts-bicep) and follow the README.md file in the same folder for how to deploy.
 
 
+
 ---
 
 ### Edit Prometheus alert rules
@@ -104,6 +106,7 @@ The configuration change can take a few minutes to finish before it takes effect
 
 > [!IMPORTANT]
 > Metric alerts (preview) are retiring and no longer recommended. As of August 15, 2023, you will no longer be able to configure new custom metric recommended alerts using the portal. Please refer to the migration guidance at [Migrate from Container insights recommended alerts to Prometheus recommended alert rules (preview)](#migrate-from-metric-rules-to-prometheus-rules-preview).
+
 ### Prerequisites
 
   - You might need to enable collection of custom metrics for your cluster. See [Metrics collected by Container insights](container-insights-custom-metrics.md).
@@ -158,6 +161,8 @@ To disable custom alert rules, use the same ARM template to create the rule, but
 
 
 
+
+
 ## Migrate from metric rules to Prometheus rules (preview)
 If you're using metric alert rules to monitor your Kubernetes cluster, you should transition to Prometheus recommended alert rules (preview) before March 14, 2026 when metric alerts are retired.
 

articles/azure-resource-manager/bicep/outputs.md

@@ -3,7 +3,7 @@ title: Outputs in Bicep
 description: Describes how to define output values in Bicep
 ms.topic: conceptual
 ms.custom: devx-track-bicep
-ms.date: 09/28/2022
+ms.date: 12/06/2023
 ---
 
 # Outputs in Bicep
@@ -15,10 +15,10 @@ This article describes how to define output values in a Bicep file. You use outp
 The syntax for defining an output value is:
 
 ```bicep
-output <name> <data-type> = <value>
+output <name> <data-type or type-expression> = <value>
 ```
 
-An output can have the same name as a parameter, variable, module, or resource. Each output value must resolve to one of the [data types](data-types.md).
+An output can have the same name as a parameter, variable, module, or resource. Each output value must resolve to one of the [data types](data-types.md), or [user-defined data type expression](./user-defined-data-types.md).
 
 The following example shows how to return a property from a deployed resource. In the example, `publicIP` is the symbolic name for a public IP address that is deployed in the Bicep file. The output value gets the fully qualified domain name for the public IP address.
 
@@ -40,6 +40,16 @@ var user = {
 output stringOutput string = user['user-name']
 ```
 
+The following example shows how to use type expression:
+
+```bicep
+param foo 'a' | 'b' = 'a'
+
+output out 'a' | 'b' = foo
+```
+
+For more information, see [User-defined data types](./user-defined-data-types.md).
+
 ## Conditional output
 
 When the value to return depends on a condition in the deployment, use the `?` operator.

articles/azure-resource-manager/bicep/parameters.md

@@ -3,7 +3,7 @@ title: Parameters in Bicep files
 description: Describes how to define parameters in a Bicep file.
 ms.topic: conceptual
 ms.custom: devx-track-bicep
-ms.date: 10/12/2023
+ms.date: 12/06/2023
 ---
 
 # Parameters in Bicep
@@ -14,7 +14,7 @@ Resource Manager resolves parameter values before starting the deployment operat
 
 Each parameter must be set to one of the [data types](data-types.md).
 
-You are limited to 256 parameters in a Bicep file. For more information, see [Template limits](../templates/best-practices.md#template-limits).
+You're limited to 256 parameters in a Bicep file. For more information, see [Template limits](../templates/best-practices.md#template-limits).
 
 For parameter best practices, see [Parameters](./best-practices.md#parameters).
 
@@ -50,6 +50,17 @@ param <parameter-name> = <value>
 
 For more information, see [Parameters file](./parameter-files.md).
 
+User-defined type expressions can be used as the type clause of a `param` statement. For example:
+
+```bicep
+param storageAccountConfig {
+  name: string
+  sku: string
+}
+```
+
+For more information, see [User-defined data types](./user-defined-data-types.md#user-defined-data-type-syntax).
+
 ## Default value
 
 You can specify a default value for a parameter. The default value is used when a value isn't provided during deployment.
@@ -184,7 +195,7 @@ When you hover your cursor over **storageAccountName** in VS Code, you see the f
 
 :::image type="content" source="./media/parameters/vscode-bicep-extension-description-decorator-markdown.png" alt-text="Use Markdown-formatted text in VSCode":::
 
-Make sure the text is well-formatted Markdown. Otherwise the text won't be rendered correctly.
+Make sure the text follows proper Markdown formatting; otherwise, it may not display correctly when rendered
 
 ### Metadata
 
@@ -201,7 +212,7 @@ You might use this decorator to track information about the parameter that doesn
 param settings object
 ```
 
-When you provide a `@metadata()` decorator with a property that conflicts with another decorator, that decorator always takes precedence over anything in the `@metadata()` decorator. Consequently, the conflicting property within the @metadata() value is redundant and will be replaced. For more information, see [No conflicting metadata](./linter-rule-no-conflicting-metadata.md).
+When you provide a `@metadata()` decorator with a property that conflicts with another decorator, that decorator always takes precedence over anything in the `@metadata()` decorator. So, the conflicting property within the @metadata() value is redundant and will be replaced. For more information, see [No conflicting metadata](./linter-rule-no-conflicting-metadata.md).
 
 ## Use parameter