Merge pull request #280174 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

articles/ai-studio/reference/reference-model-inference-api.md

@@ -47,6 +47,8 @@ Models deployed to [serverless API endpoints](../how-to/deploy-models-serverless
 > * [Meta Llama 3 instruct](../how-to/deploy-models-llama.md) family of models
 > * [Mistral-Small](../how-to/deploy-models-mistral.md)
 > * [Mistral-Large](../how-to/deploy-models-mistral.md)
+> * [Jais](../how-to/deploy-jais-models.md) family of models
+> * [Jamba](../how-to/deploy-models-jamba.md) family of models
 > * [Phi-3](../how-to/deploy-models-phi-3.md) family of models
 
 Models deployed to [managed inference](../concepts/deployments-overview.md):
@@ -58,6 +60,9 @@ Models deployed to [managed inference](../concepts/deployments-overview.md):
 
 The API is compatible with Azure OpenAI model deployments.
 
+> [!NOTE]
+> The Azure AI model inference API is available in managed inference (Managed Online Endpoints) for __models deployed after June 24th, 2024__. To take advance of the API, redeploy your endpoint if the model has been deployed before such date.
+
 ## Capabilities
 
 The following section describes some of the capabilities the API exposes. For a full specification of the API, view the [reference section](reference-model-inference-info.md).

articles/aks/azure-blob-csi.md

@@ -34,7 +34,7 @@ Azure Blob storage CSI driver supports the following features:
 
 ## Before you begin
 
-- You need the Azure CLI version 2.42 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
+- Make sure that you have the Azure CLI version 2.42 or later installed and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli]. If you have installed the Azure CLI `aks-preview` extension, make sure that you update the extension to the latest version by calling `az extension update --name aks-preview`.
 
 - Perform the steps in this [link][csi-blob-storage-open-source-driver-uninstall-steps] if you previously installed the [CSI Blob Storage open-source driver][csi-blob-storage-open-source-driver] to access Azure Blob storage from your cluster.
 > [!NOTE]

articles/azure-functions/functions-dotnet-class-library.md

@@ -83,7 +83,9 @@ The following is an example of a minimal `local.settings.json` file with these c
 }
 ```
 
-You might need to make other changes to your app based on the version support of its dependencies.
+If your app uses [`Microsoft.Azure.DurableTask.Netherite.AzureFunctions`](https://www.nuget.org/packages/Microsoft.Azure.DurableTask.Netherite.AzureFunctions), ensure it targets version 1.5.3 or later. Due to a behavior change in .NET 8, apps with older versions of the package will throw an ambiguous constructor exception.
+
+You might need to make other changes to your app based on the version support of its other dependencies.
 
 ## Functions class library project
 

articles/azure-monitor/logs/basic-logs-configure.md

@@ -212,7 +212,7 @@ All custom tables created with or migrated to the [data collection rule (DCR)-ba
 | Kubernetes services | [AKSAudit](/azure/azure-monitor/reference/tables/AKSAudit)<br>[AKSAuditAdmin](/azure/azure-monitor/reference/tables/AKSAuditAdmin)<br>[AKSControlPlane](/azure/azure-monitor/reference/tables/AKSControlPlane) | 
 | Log Analytics | [LASummaryLogs](/azure/azure-monitor/reference/tables/LASummaryLogs) |
 | Managed Lustre | [AFSAuditLogs](/azure/azure-monitor/reference/tables/AFSAuditLogs) |
-| Managed NGINX | [NGXOperationLogs](/azure/azure-monitor/reference/tables/ngxoperationlogs) |
+| Managed NGINX | [NGXOperationLogs](/azure/azure-monitor/reference/tables/ngxoperationlogs) <br>[NGXSecurityLogs](/azure/azure-monitor/reference/tables/ngxsecuritylogs)|
 | Media Services | [AMSLiveEventOperations](/azure/azure-monitor/reference/tables/AMSLiveEventOperations)<br>[AMSKeyDeliveryRequests](/azure/azure-monitor/reference/tables/AMSKeyDeliveryRequests)<br>[AMSMediaAccountHealth](/azure/azure-monitor/reference/tables/AMSMediaAccountHealth)<br>[AMSStreamingEndpointRequests](/azure/azure-monitor/reference/tables/AMSStreamingEndpointRequests) |
 | Microsoft Graph | [MicrosoftGraphActivityLogs](/azure/azure-monitor/reference/tables/microsoftgraphactivitylogs) |
 | Monitor | [AzureMetricsV2](/azure/azure-monitor/reference/tables/AzureMetricsV2) |

articles/azure-monitor/logs/summary-rules.md

@@ -98,9 +98,9 @@ Instead of logging hundreds of similar entries within an hour, the destination t
 
 ## Pricing model
 
-Summary rules don't have a direct cost, and you only pay for the query on the source table(s) and the ingestion to the destination table:
+There is no direct cost for Summary rules, and you only pay for the query on the source table and the results ingestion to the destination table:
 
-| Source table plan | Query cost | Query results ingestion cost |
+| Source table plan | Query cost | Summary results ingestion cost |
 | --- | --- | --- |
 | Analytics | No cost    | Analytics ingested GB | 
 | Basic     | Scanned GB | Analytics ingested GB | 

articles/cloud-shell/pricing.md

@@ -17,8 +17,9 @@ Cloud Shell requires a Microsoft Azure Files share.
 
 ## Storage cost
 
-Cloud Shell requires a new or existing Azure Files share to be mounted to persist files across
-sessions. Storage incurs regular costs. For pricing information, see [Azure Files Pricing][01].
+If you would like to persist files across sessions, Cloud Shell requires a new or existing Azure
+Files share to be mounted. Storage incurs regular costs. For pricing information, see
+[Azure Files Pricing][01].
 
 ## Network costs
 

articles/mysql/TOC.yml

@@ -1,4 +1,4 @@
-- name: Azure Database for MySQL - Flexible Server documentation
+- name: Azure Database for MySQL
   href: index.yml
 - name: Overview
   expanded: true

articles/mysql/index.yml

@@ -1,6 +1,6 @@
 ### YamlMime:Landing
-title: Azure Database for MySQL - Flexible Server documentation
-summary: "Azure Database for MySQL - Flexible Server is a relational database service powered by the MySQL community edition. You can use Azure Database for MySQL - Flexible Server to host a MySQL database in Azure. It's a fully managed database as a service offering that can handle mission-critical workloads with predictable performance and dynamic scalability."
+title: Azure Database for MySQL
+summary: "Azure Database for MySQL is a relational database service powered by the MySQL community edition. You can use Azure Database for MySQL - Flexible Server to host a MySQL database in Azure. It's a fully managed database as a service offering that can handle mission-critical workloads with predictable performance and dynamic scalability."
 metadata:
   description: "Azure Database for MySQL - Flexible Server is a relational database service in the Microsoft cloud that is built for developers and powered by the MySQL community edition. You can use Azure Database for MySQL - Flexible Server to deploy your MySQL database in Azure."
   ms.service: mysql
@@ -144,32 +144,6 @@ landingContent:
             url: ../app-service/quickstart-wordpress.md
 
 # Card 7
-  - title: Azure Database for MySQL - Single Server
-    linkLists:
-      - linkListType: overview
-        links:
-          - text: What is Azure Database for MySQL - Single Server?
-            url: single-server/single-server-overview.md
-          - text: What's new in Azure Database for MySQL - Single Server?
-            url: single-server/single-server-whats-new.md
-      - linkListType: whats-new
-        links:
-          - text: What's new in Azure Database for MySQL - Single Server?
-            url: single-server/single-server-whats-new.md
-      - linkListType: concept
-        links:
-          - text: Server concepts
-            url: single-server/concepts-servers.md
-          - text: Understand pricing tiers
-            url: single-server/concepts-pricing-tiers.md
-          - text: Limitations
-            url: flexible-server/concepts-limitations.md
-      - linkListType: quickstart
-        links:
-          - text: Create a server using Azure CLI
-            url: single-server/quickstart-create-mysql-server-database-using-azure-cli.md
-
-# Card 8
   - title: Troubleshoot
     linkLists:
       - linkListType: how-to-guide
@@ -195,7 +169,7 @@ landingContent:
           - text: Troubleshooting best practices
             url: single-server/concepts-troubleshooting-best-practices.md
 
-# Card 9
+# Card 8
   - title: Reference
     linkLists:
       - linkListType: download

articles/mysql/migrate/whats-happening-to-mysql-single-server.md

@@ -16,7 +16,8 @@ ms.custom:
 
 [!INCLUDE [applies-to-mysql-single-server](../includes/applies-to-mysql-single-server.md)]
 
-**Azure Database for MySQL - Single Server is on the retirement path** and is scheduled for retirement by **September 16, 2024**.
+> [!IMPORTANT]
+> **Azure Database for MySQL - Single Server is on the retirement path** and is scheduled for retirement by **September 16, 2024**.
 
 As part of this retirement, we'll no longer support creating new Single Server instances from the Azure portal beginning **January 16, 2023** and Azure CLI beginning **March 19, 2024**. If you still need to create Single Server instances to meet business continuity needs, raise an Azure support ticket. You'll still be able to create read replicas and perform restores (PITR and geo-restore) for your existing single server instance and this will continue to be supported until the sunset date of **September 16, 2024**.
 

articles/mysql/select-right-deployment-type.md

@@ -24,8 +24,6 @@ When making your decision, consider the following two options:
 
    - [Flexible Server](flexible-server/overview.md) is a fully managed production-ready database service designed for more granular control and flexibility over database management functions and configuration settings. The flexible server architecture allows users to opt for high availability within a single availability zone and across multiple availability zones. Flexible servers provide better cost optimization controls with the ability to stop/start the server and burstable compute tier, ideal for workloads that don't need full compute capacity continuously. Flexible Server also supports reserved instances allowing you to save up to 63% cost, which is ideal for production workloads with predictable compute capacity requirements. The service supports the community version of MySQL 5.7 and 8.0. The service is generally available today in various [Azure regions](flexible-server/overview.md#azure-regions). Flexible servers are best suited for all new developments and migration of production workloads to Azure Database for MySQL service.
 
-   - [Single Server](single-server/single-server-overview.md) is a fully managed database service designed for minimal customization. The single server platform is designed to handle most database management functions such as patching, backups, high availability, and security with minimal user configuration and control. The architecture is optimized for built-in high availability with 99.99% availability in a single availability zone. It supports the community version of MySQL 5.6 (retired), 5.7, and 8.0. The service is generally available today in various [Azure regions](https://azure.microsoft.com/global-infrastructure/services/). Single servers are best-suited **only for existing applications already leveraging single servers**. It's recommended to choose Flexible Server for all new developments or migrations.
-
 - **MySQL on Azure VMs**. This option falls into the industry category of IaaS. With this service, you can run MySQL Server inside a managed virtual machine on the Azure cloud platform. You can install all recent versions and editions of MySQL on a virtual machine.
 
 ## Compare the MySQL deployment options in Azure