fixing merge conflict

Author: aahill

articles/ai-foundry/.openpublishing.redirection.ai-studio.json

@@ -10,6 +10,16 @@
           "redirect_url": "/azure/ai-foundry/what-is-azure-ai-foundry",
           "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/ai-foundry/how-to/deploy-models-mistral-open.md",
+            "redirect_url": "/azure/ai-foundry/foundry-models/concepts/models#mistral-ai",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/ai-studio/how-to/deploy-models-gretel-navigator.md",
+            "redirect_url": "/azure/ai-foundry/concepts/models-inference-examples",
+            "redirect_document_id": true
+        },
         {
           "source_path_from_root": "/articles/ai-foundry/whats-new-ai-foundry.md",
           "redirect_url": "/azure/ai-foundry/whats-new-azure-ai-foundry",
@@ -150,6 +160,16 @@
             "redirect_url": "/azure/ai-foundry/concepts/models-featured#cohere-rerank",
             "redirect_document_id": false
           },
+          {
+            "source_path_from_root": "/articles/ai-foundry/foundry-models/overview.md",
+            "redirect_url": "/azure/ai-foundry/foundry-models/concepts/models",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/ai-foundry/how-to/deploy-models-gretel-navigator.md",
+            "redirect_url": "/azure/ai-foundry/concepts/models-inference-examples#gretel-navigator",
+            "redirect_document_id": false
+          },
           {
             "source_path_from_root": "/articles/ai-studio/how-to/deploy-models-deepseek.md",
             "redirect_url": "/azure/ai-foundry/how-to/deploy-models-deepseek",
@@ -160,11 +180,6 @@
             "redirect_url": "/azure/ai-foundry/model-inference/tutorials/get-started-deepseek-r1?context=%2Fazure%2Fai-foundry%2Fcontext%2Fcontext",
             "redirect_document_id": false
           },
-          {
-            "source_path_from_root": "/articles/ai-studio/how-to/deploy-models-gretel-navigator.md",
-            "redirect_url": "/azure/ai-foundry/how-to/deploy-models-gretel-navigator",
-            "redirect_document_id": true
-          },
           {
             "source_path_from_root": "/articles/ai-studio/how-to/deploy-models-jais.md",
             "redirect_url": "/azure/ai-foundry/how-to/deploy-models-jais",
@@ -225,11 +240,6 @@
             "redirect_url": "/azure/ai-foundry/concepts/foundry-models-overview",
             "redirect_document_id": false
           },
-          {
-            "source_path_from_root": "/articles/ai-studio/how-to/deploy-models-mistral-open.md",
-            "redirect_url": "/azure/ai-foundry/how-to/deploy-models-mistral-open",
-            "redirect_document_id": true
-          },
           {
             "source_path_from_root": "/articles/ai-studio/how-to/deploy-models-mistral.md",
             "redirect_url": "/azure/ai-foundry/how-to/deploy-models-mistral",
@@ -457,7 +467,7 @@
           },
           {
             "source_path_from_root": "/articles/ai-foundry/foundry-models/supported-languages-openai.md",
-            "redirect_url": "/azure/ai-services/openai/supported-languages",
+            "redirect_url": "/azure/ai-foundry/openai/supported-languages",
             "redirect_document_id": false
           },
           {
@@ -575,6 +585,11 @@
             "redirect_url": "/azure/ai-foundry/how-to/prompt-flow-tools/embedding-tool",
             "redirect_document_id": true
           },
+          {
+            "source_path_from_root": "/articles/ai-studio/how-to/deploy-models-mistral-open.md",
+            "redirect_url": "/azure/ai-foundry/foundry-models/concepts/models",
+            "redirect_document_id": true
+          },
           {
             "source_path_from_root": "/articles/ai-studio/how-to/prompt-flow-tools/index-lookup-tool.md",
             "redirect_url": "/azure/ai-foundry/how-to/prompt-flow-tools/index-lookup-tool",
@@ -930,8 +945,8 @@
         },
         {
             "source_path_from_root": "/articles/ai-studio/quickstarts/assistants.md",
-            "redirect_url": "/azure/ai-services/openai/assistants-quickstart",
-            "redirect_document_id": true
+            "redirect_url": "/azure/ai-foundry/openai/how-to/assistant",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/ai-studio/how-to/prompt-flow-tools/vector-db-lookup-tool.md",
@@ -1095,7 +1110,7 @@
           },
           {
             "source_path_from_root": "/articles/ai-studio/quickstarts/multimodal-vision.md",
-            "redirect_url": "/azure/ai-services/openai/gpt-v-quickstart",
+            "redirect_url": "/azure/ai-foundry/openai/gpt-v-quickstart",
             "redirect_document_id": false
           },
           {

articles/ai-foundry/agents/concepts/threads-runs-messages.md

@@ -19,7 +19,7 @@ Azure AI Foundry Agent Service supports persistent threads, runs, and messages,
 
 When you use an Agent, there are a series of steps that are involved.
 
-- **Creating an agent:** You create an agent to start sending messages and recieving responses.
+- **Creating an agent:** You create an agent to start sending messages and receiving responses.
 - **Creating a thread:** You create a thread once and append messages to it as users reply. This ensures that the conversation history is maintained and managed automatically.
 - **Sending messages:** Messages can be sent by both the agent and the user. These messages can include text, images, and other files, providing a rich interaction experience.
 - **Running the agent:** When a run is initiated, the agent processes the messages in the thread and performs tasks based on its configuration. It may append new messages to the thread as part of its response.
@@ -34,11 +34,11 @@ A custom AI that uses AI models in conjunction with tools.
 
 ## Threads
 
-Threads are conversation sessions between an agent and a user. They store messages and automatically handle truncation to fit content into a model’s context. When you create a thread, you can append new messages to it as users respond.
+Threads are conversation sessions between an agent and a user. They store messages and automatically handle truncation to fit content into a model’s context. When you create a thread, you can append new messages (maximum of 100,000 per thread) to it as users respond.
 
 ## Messages
 
-Messages are the individual pieces of communication within a thread. They can be created by either the agent or the user and can include text, or other files. Messages are stored as a list within the thread, allowing for a structured and organized conversation flow.
+Messages are the individual pieces of communication within a thread. They can be created by either the agent or the user and can include text, or other files. Messages are stored as a list within the thread, allowing for a structured and organized conversation flow. You can attach up to 100,000 messages to a single thread.
 
 ## Runs
 

articles/ai-foundry/agents/how-to/connected-agents.md

@@ -230,7 +230,7 @@ To create a multi-agent setup, follow these steps:
     ```python
     import os
     from azure.ai.projects import AIProjectClient
-    from azure.ai.projects.models import ConnectedAgentTool, MessageRole
+    from azure.ai.agents.models import ConnectedAgentTool, MessageRole
     from azure.identity import DefaultAzureCredential
 
 
@@ -255,7 +255,7 @@ To create a multi-agent setup, follow these steps:
 
     ```python
     connected_agent = ConnectedAgentTool(
-        id=stock_price_agent.id, name=connected_agent_name, description="Gets the stock price of a company"
+        id=stock_price_agent.id, name=stock_price_agent.name, description="Gets the stock price of a company"
     )
     ```
 

articles/ai-foundry/agents/how-to/metrics.md

@@ -1,7 +1,7 @@
 ---
 title: Monitor Azure AI Foundry Agent Service
 description: Start here to learn how to use Azure Monitor to capture and analyze metrics for your Azure AI Foundry Agent Service.
-ms.date: 07/23/2025
+ms.date: 06/02/2025
 ms.custom: horz-monitor, subject-monitoring
 ms.topic: conceptual
 author: aahill
@@ -15,6 +15,8 @@ ms.service: azure-ai-agent-service
 
 Monitoring is available for agents in a [standard agent setup](../concepts/standard-agent-setup.md).
 
+[!INCLUDE [Feature preview](../../openai/includes/preview-feature.md)]
+
 > [!IMPORTANT]
 > Monitoring support is currently limited to Azure AI Foundry hubs. Azure AI Foundry projects are not supported.
 
@@ -45,17 +47,17 @@ For a list of all metrics it's possible to gather for all resources in Azure Mon
 ## Azure AI Foundry Agent Service metrics
 Azure AI Foundry Agent Service has commonality with a subset of Azure AI services. Here's a list of currently available metrics on Azure Monitor:
 
-| Metric              | Description                                                                             | Name in REST API         | Unit        | Aggregation                            | Dimensions                                                      | Time Grains| DS Export |
-|---------------------|-----------------------------------------------------------------------------------------|--------------------------|-------------|----------------------------------------|-----------------------------------------------------------------|-----------|
-| Agent Events        | Number of events (create, delete, update) for AI Agents in this project                 | `AgentEvents`            | Count       | Average, Maximum, Minimum, Total (Sum) | `EventType`                                                     | PT1M      | No |
-| Indexed Files Read  | Number of indexed files read by AI agents via file search in this project               | `AgentIndexedFilesRead`  | Count       | Average, Maximum, Minimum, Total (Sum) | `ErrorCode`, `Status`, `VectorStoreId`, `AgentId`               | PT1M      | No |
-| Runs                | Number of runs by AI Agents in this project                                             | `AgentRuns`              | Count       | Average, Maximum, Minimum, Total (Sum) | `AgentId`, `RunStatus`, `StatusCode`, `StreamType`, `ThreadId`  | PT1M      | No |
-| User Message Events | Number of events (create, update delete) for user messages to AI Agents in this project | `AgentUserMessageEvents` | Count       | Average, Maximum, Minimum, Total (Sum) | `EventType`, `AgentId`, `ThreadId`                              | PT1M      | No |
-| Thread Events       | Number of events (create, delete) for AI Agent threads in this project                  | `AgentThreadEvents`      | Count       | Average, Maximum, Minimum, Total (Sum) | `AgentId`, `EventType`                                          | PT1M      | No |
-| Input Tokens        | Number of prompt tokens processed (input) by AI Agents in this project                  | `AgentInputTokens`       | Count       | Average, Maximum, Minimum, Total (Sum) | `AgentId`, `ModelName`, `ModelVersion`                          | PT1M      | No |
-| Output Tokens       | Number of tokens generated (output) by AI Agents in this project                        | `AgentOutputTokens`      | Count       | Average, Maximum, Minimum, Total (Sum) | `AgentId`, `ModelName`, `ModelVersion`                          | PT1M      | No |
-| Total Tokens        | Sum of tokens processed (input) and generated (output) by AI Agents in this project     | `AgentTotalTokens`       | Count       | Average, Maximum, Minimum, Total (Sum) | `AgentId`, `ModelName`, `ModelVersion`                          | PT1M      | No |
-| Tool Calls          | Number of tool calls made by AI Agents in this project                                  | `AgentToolCalls`         | Count       | Average, Maximum, Minimum, Total (Sum) | `AgentId`, `ToolName`                                           | PT1M      | No |
+| **Metric**      | **Name in REST API** | **Unit** | **Aggregation**                            | **Dimensions**                                         | **Time Grains** | **DS Export** |
+|-----------------|----------------------|----------|--------------------------------------------|--------------------------------------------------------|-----------------|---------------|
+| Agents          | `Agents`             | Count    | Average, Maximum, Minimum, Total (Sum)     | `EventType`                                            | PT1M            | No            |
+| IndexedFiles    | `IndexedFiles`       | Count    | Average, Maximum, Minimum, Total (Sum)     | `ErrorCode`, `Status`, `VectorStoreId`                | PT1M            | No            |
+| Messages        | `Messages`           | Count    | Average, Maximum, Minimum, Total (Sum)     | `EventType`, `ThreadId`                               | PT1M            | No            |
+| Runs            | `Runs`               | Count    | Average, Maximum, Minimum, Total (Sum)     | `AgentId`, `RunStatus`, `StatusCode`, `StreamType`    | PT1M            | No            |
+| Threads         | `Threads`            | Count    | Average, Maximum, Minimum, Total (Sum)     | `EventType`                                            | PT1M            | No            |
+| Tokens          | `Tokens`             | Count    | Average, Maximum, Minimum, Total (Sum)     | `AgentId`, `TokenType`                                | PT1M            | No            |
+| ToolCalls       | `ToolCalls`          | Count    | Average, Maximum, Minimum, Total (Sum)     | `AgentId`, `ToolName`                                 | PT1M            | No            |
+
+
 
 ## Analyze monitoring data
 
@@ -94,4 +96,4 @@ You can set alerts for any metric listed in the [monitoring data reference](../r
 ## Related content
 
 - See [Monitoring data reference](../reference/monitor-service.md) for a reference of the metrics and other important values created for Azure AI Foundry Agent Service.
-- See [Monitoring Azure resources with Azure Monitor](/azure/azure-monitor/essentials/monitor-azure-resource) for general details on monitoring Azure resources.
+- See [Monitoring Azure resources with Azure Monitor](/azure/azure-monitor/essentials/monitor-azure-resource) for general details on monitoring Azure resources.