Merge branch 'main' into release-2024-openai-batch

Author: v-alje

.openpublishing.redirection.json

@@ -1,5 +1,20 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/storage/files/storage-files-migration-storsimple-1200.md",
+      "redirect_url": "/previous-versions/azure/storage/files/storage-files-migration-storsimple-1200",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/files/storage-files-migration-storsimple-8000.md",
+      "redirect_url": "/previous-versions/azure/storage/files/storage-files-migration-storsimple-8000",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/file-sync/file-sync-storsimple-cost-comparison.md",
+      "redirect_url": "/previous-versions/azure/storage/file-sync/file-sync-storsimple-cost-comparison",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/advisor/advisor-alerts.md",
       "redirect_url": "/azure/advisor/advisor-alerts-portal",

.openpublishing.redirection.sentinel.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path": "articles/sentinel/cef-name-mapping.md",
+            "redirect_url": "/azure/sentinel/cef-syslog-ama-overview",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/sentinel/detect-threats-built-in.md#use-analytics-rule-templates",
             "redirect_url": "/azure/sentinel/create-analytics-rule-from-template",

CODEOWNERS

@@ -1,5 +1,11 @@
 # Codeowners file
 # Each line is a file pattern followed by one or more owners.
 
-# Specify owners for the aks folder
+# Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
 /articles/aks @tynevi @thomps23
+/articles/defender-for-cloud  @tynevi @thomps23
+/articles/attestation  @tynevi @thomps23
+/articles/confidential-ledger  @tynevi @thomps23
+/articles/dedicated-hsm  @tynevi @thomps23
+/articles/key-vault  @tynevi @thomps23
+/articles/payment-hsm  @tynevi @thomps23

articles/ai-services/content-safety/studio-quickstart.md

@@ -23,9 +23,12 @@ In this quickstart, get started with the Azure AI Content Safety service using C
 
 * An active Azure account. If you don't have one, you can [create one for free](https://azure.microsoft.com/free/cognitive-services/).
 * A [Content Safety](https://aka.ms/acs-create) Azure resource.
-* Assign `Cognitive Services User` role to your account to ensure the studio experience. Go to [Azure portal](https://portal.azure.com/), navigate to your Content Safety resource or Azure AI Services resource, and select **Access Control** in the left navigation bar, then click **+ Add role assignment**, choose the `Cognitive Services User` role and select the member of your account that you need to assign this role to, then review and assign. It might take few minutes for the assignment to take effect.
+* Assign `Cognitive Services User` role to your account. Go to the [Azure Portal](https://portal.azure.com/), navigate to your Content Safety resource or Azure AI Services resource, and select **Access Control** in the left navigation bar, then select **+ Add role assignment**, choose the `Cognitive Services User` role and select the member of your account that you need to assign this role to, then review and assign. It might take few minutes for the assignment to take effect.
 * Sign in to [Content Safety Studio](https://contentsafety.cognitive.azure.com) with your Azure subscription and Content Safety resource. 
 
+> [!IMPORTANT]
+> * You must assign the `Cognitive Services User` role to your Azure account to use the studio experience. Go to the [Azure Portal](https://portal.azure.com/), navigate to your Content Safety resource or Azure AI Services resource, and select **Access Control** in the left navigation bar, then select **+ Add role assignment**, choose the `Cognitive Services User` role and select the member of your account that you need to assign this role to, then review and assign. It might take few minutes for the assignment to take effect.
+
 
 ## Analyze text content
 The [Moderate text content](https://contentsafety.cognitive.azure.com/text) page provides capability for you to quickly try out text moderation.

articles/ai-studio/toc.yml

@@ -119,7 +119,7 @@ items:
         href: how-to/fine-tune-model-llama.md
     - name: Deploy JAIS models
       href: how-to/deploy-jais-models.md
-    - name: Deploy Jamba Instruct model
+    - name: Deploy AI21 Jamba Instruct model
       href: how-to/deploy-models-jamba.md
     - name: Deploy Mistral family models
       href: how-to/deploy-models-mistral.md

articles/analysis-services/TOC.yml

@@ -70,7 +70,7 @@
       href: analysis-services-vnet-gateway.md
     - name: Manage a server
       href: analysis-services-manage.md
-    - name: Monitor
+    - name: Monitor Analysis Services
       href: monitor-analysis-services.md
     - name: Set up diagnostic logging
       href: analysis-services-logging.md

articles/analysis-services/analysis-services-async-refresh.md

@@ -57,7 +57,7 @@ https://westus.asazure.windows.net/servers/myserver/models/AdventureWorks/refres
 All calls must be authenticated with a valid Microsoft Entra ID (OAuth 2) token in the Authorization header and must meet the following requirements:
 
 - The token must be either a user token or an application service principal.
-- The token must have the audience set to exactly `https://*.asazure.windows.net`. Note that `*` isn't a placeholder or a wildcard, and the audience must have the `*` character as the subdomain. Specifying an invalid audience results in authentication failure.
+- The token must have the audience set to exactly `https://*.asazure.windows.net`. Note that `*` isn't a placeholder or a wildcard, and the audience must have the `*` character as the subdomain. Custom audiences, such as https://customersubdomain.asazure.windows.net, are not supported. Specifying an invalid audience results in authentication failure.
 - The user or application must have sufficient permissions on the server or model to make the requested call. The permission level is determined by roles within the model or the admin group on the server.
 
     > [!IMPORTANT]

articles/analysis-services/analysis-services-logging.md

@@ -24,79 +24,9 @@ This article describes how to set up, view, and manage [Azure Monitor resource l
 
 You can select **Engine**, **Service**, and **Metrics** log categories. For a listing of what's logged for each category, see [Supported resource logs for Microsoft.AnalysisServices/servers](monitor-analysis-services-reference.md#supported-resource-logs-for-microsoftanalysisservicesservers).
 
-## Set up diagnostics logging
+## Set up diagnostic settings
 
-### Azure portal
-
-1. In [Azure portal](https://portal.azure.com) > server, click **Diagnostic settings** in the left navigation, and then click **Turn on diagnostics**.
-
-    ![Screenshot showing Turn on diagnostics in the Azure portal.](./media/analysis-services-logging/aas-logging-turn-on-diagnostics.png)
-
-2. In **Diagnostic settings**, specify the following options: 
-
-    * **Name**. Enter a name for the logs to create.
-
-    * **Archive to a storage account**. To use this option, you need an existing storage account to connect to. See [Create a storage account](/azure/storage/common/storage-account-create). Follow the instructions to create a Resource Manager, general-purpose account, then select your storage account by returning to this page in the portal. It may take a few minutes for newly created storage accounts to appear in the drop-down menu.
-    * **Stream to an event hub**. To use this option, you need an existing Event Hub namespace and event hub to connect to. To learn more, see [Create an Event Hubs namespace and an event hub using the Azure portal](/azure/event-hubs/event-hubs-create). Then return to this page in the portal to select the Event Hub namespace and policy name.
-    * **Send to Azure Monitor (Log Analytics workspace)**. To use this option, either use an existing workspace or [create a new workspace](/azure/azure-monitor/logs/quick-create-workspace) resource in the portal. For more information on viewing your logs, see [View logs in Log Analytics workspace](#view-logs-in-log-analytics-workspace) in this article.
-
-    * **Engine**. Select this option to log xEvents. If you're archiving to a storage account, you can select the retention period for the resource logs. Logs are autodeleted after the retention period expires.
-    * **Service**. Select this option to log service level events. If you are archiving to a storage account, you can select the retention period for the resource logs. Logs are autodeleted after the retention period expires.
-    * **Metrics**. Select this option to store verbose data in [Metrics](analysis-services-monitor.md#server-metrics). If you are archiving to a storage account, you can select the retention period for the resource logs. Logs are autodeleted after the retention period expires.
-
-3. Click **Save**.
-
-    If you receive an error that says "Failed to update diagnostics for \<workspace name>. The subscription \<subscription id> is not registered to use microsoft.insights." follow the [Troubleshoot Azure Diagnostics](../azure-monitor/essentials/resource-logs.md) instructions to register the account, then retry this procedure.
-
-    If you want to change how your resource logs are saved at any point in the future, you can return to this page to modify settings.
-
-### PowerShell
-
-Here are the basic commands to get you going. If you want step-by-step help on setting up logging to a storage account by using PowerShell, see the tutorial later in this article.
-
-To enable metrics and resource logging by using PowerShell, use the following commands:
-
-- To enable storage of resource logs in a storage account, use this command:
-
-   ```powershell
-   Set-AzDiagnosticSetting -ResourceId [your resource id] -StorageAccountId [your storage account id] -Enabled $true
-   ```
-
-   The storage account ID is the resource ID for the storage account where you want to send the logs.
-
-- To enable streaming of resource logs to an event hub, use this command:
-
-   ```powershell
-   Set-AzDiagnosticSetting -ResourceId [your resource id] -ServiceBusRuleId [your service bus rule id] -Enabled $true
-   ```
-
-   The Azure Service Bus rule ID is a string with this format:
-
-   ```powershell
-   {service bus resource ID}/authorizationrules/{key name}
-   ``` 
-
-- To enable sending resource logs to a Log Analytics workspace, use this command:
-
-   ```powershell
-   Set-AzDiagnosticSetting -ResourceId [your resource id] -WorkspaceId [resource id of the log analytics workspace] -Enabled $true
-   ```
-
-- You can obtain the resource ID of your Log Analytics workspace by using the following command:
-
-   ```powershell
-   (Get-AzOperationalInsightsWorkspace).ResourceId
-   ```
-
-You can combine these parameters to enable multiple output options.
-
-### REST API
-
-Learn how to [change diagnostics settings by using the Azure Monitor REST API](/rest/api/monitor/). 
-
-### Resource Manager template
-
-Learn how to [enable diagnostics settings at resource creation by using a Resource Manager template](../azure-monitor/essentials/resource-manager-diagnostic-settings.md). 
+To learn how to set up diagnostic settings using the Azure portal, Azure CLI, PowerShell, or Azure Resource Manager, see [Create diagnostic settings in Azure Monitor](/azure/azure-monitor/essentials/create-diagnostic-settings).
 
 ## Manage your logs
 

articles/analysis-services/monitor-analysis-services-reference.md

@@ -20,7 +20,7 @@ See [Monitor Azure Analysis Services](monitor-analysis-services.md) for details
 ### Supported metrics for Microsoft.AnalysisServices/servers
 The following table lists the metrics available for the Microsoft.AnalysisServices/servers resource type.
 [!INCLUDE [horz-monitor-ref-metrics-tableheader](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-tableheader.md)]
-[!INCLUDE [Microsoft.AnalysisServices/servers](~/azure-reference-other-repo/azure-monitor-ref/supported-metrics/includes/microsoft-analysisservices-servers-metrics-include.md)]
+[!INCLUDE [Microsoft.AnalysisServices/servers](~/reusable-content/ce-skilling/azure/includes/azure-monitor/reference/metrics/microsoft-analysisservices-servers-metrics-include.md)]
 
 [!INCLUDE [horz-monitor-ref-metrics-dimensions-intro](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-dimensions-intro.md)]
 [!INCLUDE [horz-monitor-ref-metrics-dimensions](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-metrics-dimensions.md)]
@@ -29,7 +29,7 @@ Analysis Services metrics have the dimension `ServerResourceType`.
 [!INCLUDE [horz-monitor-ref-resource-logs](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-ref-resource-logs.md)]
 
 ### Supported resource logs for Microsoft.AnalysisServices/servers
-[!INCLUDE [Microsoft.AnalysisServices/servers](~/azure-reference-other-repo/azure-monitor-ref/supported-logs/includes/microsoft-analysisservices-servers-logs-include.md)]
+[!INCLUDE [Microsoft.AnalysisServices/servers](~/reusable-content/ce-skilling/azure/includes/azure-monitor/reference/logs/microsoft-analysisservices-servers-logs-include.md)]
 
 When you set up logging for Analysis Services, you can select **Engine** or **Service** events to log.
 

articles/analysis-services/monitor-analysis-services.md

@@ -30,8 +30,11 @@ For a list of available metrics for Analysis Services, see [Analysis Services mo
 
 [!INCLUDE [horz-monitor-resource-logs](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-resource-logs.md)]
 - For the available resource log categories, associated Log Analytics tables, and the logs schemas for Analysis Services, see [Analysis Services monitoring data reference](monitor-analysis-services-reference.md#resource-logs).
+
 ## Analysis Services resource logs
 
+To learn how to set up diagnostics logging, see [Set up diagnostic logging](analysis-services-logging.md).
+
 When you set up logging for Analysis Services, you can select **Engine** or **Service** events to log, or select **AllMetrics** to log metrics data. For more information, see [Supported resource logs for Microsoft.AnalysisServices/servers](monitor-analysis-services-reference.md#supported-resource-logs-for-microsoftanalysisservicesservers).
 
 [!INCLUDE [horz-monitor-activity-log](~/reusable-content/ce-skilling/azure/includes/azure-monitor/horizontals/horz-monitor-activity-log.md)]