Merge pull request #262554 from MicrosoftDocs/main

1/5/2024 AM Publish

Author: Taojunshen

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

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the different model capabilities that are available with Azure OpenAI. 
 ms.service: azure-ai-openai
 ms.topic: conceptual 
-ms.date: 01/03/2024
+ms.date: 01/05/2024
 ms.custom: event-tier1-build-2022, references_regions, build-2023, build-2023-dataai, refefences_regions
 manager: nitinme
 author: mrbullwinkle #ChrisHMSFT
@@ -145,7 +145,7 @@ These models can only be used with Embedding API requests.
 
 |  Model ID  |  Model Availability  | Max Request (tokens) | Training Data (up to)  | Output Dimensions |
 |---|---| :---:|:---:|:---:|
-| `text-embedding-ada-002` (version 2) | Australia East <br> Canada East <br> East US <br> East US2 <br> France Central <br> Japan East <br> North Central US <br> South Central US <br> Sweden Central <br> Switzerland North <br> UK South <br> West Europe |8,191 | Sep 2021 | 1,536 |
+| `text-embedding-ada-002` (version 2) | Australia East <br> Canada East <br> East US <br> East US2 <br> France Central <br> Japan East <br> North Central US <br> Norway East <br> South Central US <br> Sweden Central <br> Switzerland North <br> UK South <br> West Europe <br> West US |8,191 | Sep 2021 | 1,536 |
 | `text-embedding-ada-002` (version 1) | East US <br> South Central US <br> West Europe |2,046 | Sep 2021 | 1,536 |
 
 ### DALL-E models (Preview)

articles/ai-services/openai/reference.md

@@ -379,9 +379,9 @@ curl -i -X POST YOUR_RESOURCE_NAME/openai/deployments/YOUR_DEPLOYMENT_NAME/exten
         {
             "type": "AzureCognitiveSearch",
             "parameters": {
-                "endpoint": "'YOUR_AZURE_COGNITIVE_SEARCH_ENDPOINT'",
-                "key": "'YOUR_AZURE_COGNITIVE_SEARCH_KEY'",
-                "indexName": "'YOUR_AZURE_COGNITIVE_SEARCH_INDEX_NAME'"
+                "endpoint": "YOUR_AZURE_COGNITIVE_SEARCH_ENDPOINT",
+                "key": "YOUR_AZURE_COGNITIVE_SEARCH_KEY",
+                "indexName": "YOUR_AZURE_COGNITIVE_SEARCH_INDEX_NAME"
             }
         }
     ],

articles/azure-app-configuration/howto-set-up-private-access.md

@@ -50,13 +50,13 @@ This command will prompt your web browser to launch and load an Azure sign-in pa
 
 1. Fill out the form with the following information:
 
-    | Parameter              | Description                                                                                                                                                                 | Example                 |
-    |------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------|
-    | Subscription           | Select an Azure subscription. Your private endpoint must be in the same subscription as your virtual network. You'll select a virtual network later in this how-to guide.   | *MyAzureSubscription*   |
-    | Resource group         | Select a resource group or create a new one.                                                                                                                                | *MyResourceGroup*       |
-    | Name                   | Enter a name for the new private endpoint for your App Configuration store.                                                                                                 | *MyPrivateEndpoint*     |
-    | Network Interface Name | This field is completed automatically. Optionally edit the name of the network interface.                                                                                   | *MyPrivateEndpoint-nic* |
-    | Region                 | Select a region. Your private endpoint must be in the same region as your virtual network.                                                                                  | *Central US*            |
+    | Parameter              | Description                                                                                                                                                                                                                                                                      | Example                 |
+    |------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------|
+    | Subscription           | Select an Azure subscription. Your private endpoint must be in the same subscription as your virtual network. You'll select a virtual network later in this how-to guide.                                                                                                        | *MyAzureSubscription*   |
+    | Resource group         | Select a resource group or create a new one.                                                                                                                                                                                                                                     | *MyResourceGroup*       |
+    | Name                   | Enter a unique name for the new private endpoint for your App Configuration store. When using the Azure portal, the private endpoint connection name will be the same as the private endpoint name. App Configuration stores must have unique private endpoint connection names. | *MyPrivateEndpoint*     |
+    | Network Interface Name | This field is completed automatically. Optionally edit the name of the network interface.                                                                                                                                                                                        | *MyPrivateEndpoint-nic* |
+    | Region                 | Select a region. Your private endpoint must be in the same region as your virtual network.                                                                                                                                                                                       | *Central US*            |
 
    :::image type="content" source="./media/private-endpoint/basics.png" alt-text="Screenshot of the Azure portal, create a private endpoint, basics tab.":::
 
@@ -141,7 +141,7 @@ Once deployment is complete, you'll get a notification that your endpoint has be
     > | `<private-endpoint-name>`          | Enter a name for your new private endpoint.                                                                                      | `MyPrivateEndpoint`                                                                                                          |
     > | `<vnet-name>`                      | Enter the name of an existing vnet.                                                                                              | `Myvnet`                                                                                                                     |
     > | `<private-connection-resource-id>` | Enter your App Configuration store's private connection resource ID. This the ID you saved from the output of the previous step. | `/subscriptions/123/resourceGroups/MyResourceGroup/providers/Microsoft.AppConfiguration/configurationStores/MyAppConfigStore`|
-    > | `<connection-name>`                | Enter a connection name.                                                                                                         |`MyConnection`                                                                                                                |
+    > | `<connection-name>`                | Enter a connection name. App Configuration stores must have unique private endpoint connection names.                            |`MyConnection`                                                                                                                |
     > | `<location>`                       | Enter an Azure region. Your private endpoint must be in the same region as your virtual network.                                 |`centralus`                                                                                                                   |  
 
 ---

articles/azure-monitor/agents/azure-monitor-agent-migration.md

@@ -15,7 +15,7 @@ ms.custom:
 [Azure Monitor Agent (AMA)](./agents-overview.md) replaces the Log Analytics agent (also known as MMA and OMS) for Windows and Linux machines, in Azure and non-Azure environments, including on-premises and third-party clouds. The agent introduces a simplified, flexible method of configuring data collection using [data collection rules (DCRs)](../essentials/data-collection-rule-overview.md). This article provides guidance on how to implement a successful migration from the Log Analytics agent to Azure Monitor Agent.
 
 > [!IMPORTANT]
-> The Log Analytics agent will be [retired on **August 31, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). After this date, Microsoft will no longer provide any support for the Log Analytics agent. If you're currently using the Log Analytics agent with Azure Monitor or [other supported features and services](#migrate-additional-services-and-features), start planning your migration to Azure Monitor Agent by using the information in this article.
+> The Log Analytics agent will be [retired on **August 31, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). After this date, Microsoft will no longer provide any support for the Log Analytics agent. If you're currently using the Log Analytics agent with Azure Monitor or [other supported features and services](#migrate-additional-services-and-features), start planning your migration to Azure Monitor Agent by using the information in this article.  If you are using the Log Analytics Agent for SCOM you will need to [migrate to the SCOM Agent](../vm/scom-managed-instance-overview.md)
 
 ## Benefits
 

articles/azure-monitor/app/java-standalone-sampling-overrides.md

@@ -192,7 +192,8 @@ Span attribute names are based on the OpenTelemetry semantic conventions. (HTTP,
 
 https://github.com/open-telemetry/semantic-conventions/blob/main/docs/README.md
 
-To see the exact set of attributes captured by Application Insights Java for your application, set the
+>[!Note]
+> To see the exact set of attributes captured by Application Insights Java for your application, set the
 [self-diagnostics level to debug](./java-standalone-config.md#self-diagnostics), and look for debug messages starting
 with the text "exporting span".
 

articles/azure-monitor/app/opentelemetry-add-modify.md

@@ -2222,7 +2222,7 @@ Use the add [custom property example](#add-a-custom-property-to-a-span), but rep
     class SpanFilteringProcessor(SpanProcessor):
 
         # Prevents exporting spans from internal activities.
-        def on_start(self, span):
+        def on_start(self, span, parent_context):
             # Check if the span is an internal activity.
             if span._kind is SpanKind.INTERNAL:
                 # Create a new span context with the following properties:
@@ -2235,7 +2235,7 @@ Use the add [custom property example](#add-a-custom-property-to-a-span), but rep
                     span.context.trace_id,
                     span.context.span_id,
                     span.context.is_remote,
-                    TraceFlags.DEFAULT,
+                    TraceFlags(TraceFlags.DEFAULT),
                     span.context.trace_state,
                 )
 

articles/azure-resource-manager/bicep/deployment-stacks.md

@@ -101,11 +101,11 @@ az stack sub create \
   --name '<deployment-stack-name>' \
   --location '<location>' \
   --template-file '<bicep-file-name>' \
-  --deployment-resource-group-name' <resource-group-name>' \
+  --deployment-resource-group' <resource-group-name>' \
   --deny-settings-mode 'none'
 ```
 
-The `deployment-resource-group-name` parameter specifies the resource group used to store the managed resources. If the parameter isn't specified, the managed resources are stored in the subscription scope.
+The `deployment-resource-group` parameter specifies the resource group used to store the managed resources. If the parameter isn't specified, the managed resources are stored in the subscription scope.
 
 # [Portal](#tab/azure-portal)
 
@@ -280,7 +280,7 @@ az stack sub create \
   --name '<deployment-stack-name>' \
   --location '<location>' \
   --template-file '<bicep-file-name>' \
-  --deployment-resource-group-name '<resource-group-name>' \
+  --deployment-resource-group '<resource-group-name>' \
   --deny-settings-mode 'none'
 ```
 

articles/azure-resource-manager/management/tag-support.md

@@ -2331,7 +2331,7 @@ To get the same data as a file of comma-separated values, download [tag-support.
 > | networkVirtualAppliances | Yes | Yes |
 > | networkWatchers | Yes | Yes |
 > | networkWatchers / connectionMonitors | Yes | No |
-> | networkWatchers / flowLogs | Yes | Yes |
+> | networkWatchers / flowLogs | Yes | No |
 > | networkWatchers / lenses | Yes | No |
 > | networkWatchers / pingMeshes | Yes | No |
 > | p2sVpnGateways | Yes | Yes |

articles/bastion/bastion-overview.md

@@ -23,7 +23,7 @@ The following diagram shows connections to virtual machines via a Bastion deploy
 |Benefit    |Description|
 |-----------|-----------|
 |RDP and SSH through the Azure portal|You can get to the RDP and SSH session directly in the Azure portal using a single-click seamless experience.|
-|Remote Session over TLS and firewall traversal for RDP/SSH|Azure Bastion uses an HTML5 based web client that is automatically streamed to your local device. Your RDP/SSH session is over TLS on port 443. This enables the traffic to traverse firewalls more securely. Bastion supports TLS 1.2 and above. Older TLS versions aren't supported.|
+|Remote Session over TLS and firewall traversal for RDP/SSH|Azure Bastion uses an HTML5 based web client that is automatically streamed to your local device. Your RDP/SSH session is over TLS on port 443. This enables the traffic to traverse firewalls more securely. Bastion supports TLS 1.2. Older TLS versions aren't supported.|
 |No Public IP address required on the Azure VM| Azure Bastion opens the RDP/SSH connection to your Azure VM by using the private IP address on your VM. You don't need a public IP address on your virtual machine.|
 |No hassle of managing Network Security Groups (NSGs)| You don't need to apply any NSGs to the Azure Bastion subnet. Because Azure Bastion connects to your virtual machines over private IP, you can configure your NSGs to allow RDP/SSH from Azure Bastion only. This removes the hassle of managing NSGs each time you need to securely connect to your virtual machines. For more information about NSGs, see [Network Security Groups](../virtual-network/network-security-groups-overview.md#security-rules).|
 |No need to manage a separate bastion host on a VM |Azure Bastion is a fully managed platform PaaS service from Azure that is hardened internally to provide you secure RDP/SSH connectivity.|

articles/container-apps/start-containers.md

@@ -33,7 +33,7 @@ Containers package your applications in an easy-to-transport unit. Here are a fe
 
 - **Consistency**: Goods in a shipping container remain safe and unchanged during transport. Similarly, a software container guarantees consistent application behavior among different environments.
 
-- **Flexibility**: Despite the diverse contents of a shipping container, transportation methods remain standardized. Software containers encapsulate different apps and technologies, but maintain are maintained in a standardized fashion.
+- **Flexibility**: Despite the diverse contents of a shipping container, transportation methods remain standardized. Software containers encapsulate different apps and technologies, but are maintained in a standardized fashion.
 
 - **Efficiency**: Just as shipping containers optimize transport by allowing efficient stacking on ships and trucks, software containers optimize the use of computing resources. This optimization allows multiple containers to operate simultaneously on a single server.