Merge pull request #230334 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: huypub

articles/aks/cluster-configuration.md

@@ -130,9 +130,8 @@ Mariner can be deployed on AKS through Azure CLI or ARM templates.
 
 ### Prerequisites
 
-1. You need the latest version of Azure CLI. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][azure-cli-install].
-2. You need the `aks-preview` Azure CLI extension for the ability to select the Mariner 2.0 operating system SKU. Run `az extension remove --name aks-preview` to clear any previous versions, then run `az extension add --name aks-preview`.
-3. If you don't already have kubectl installed, install it through Azure CLI using `az aks install-cli` or follow the [upstream instructions](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/).
+1. You need the Azure CLI version 2.44.1 or later installed and configured. Run `az --version` to find the version currently installed. If you need to install or upgrade, see [Install Azure CLI][azure-cli-install].
+1. If you don't already have kubectl installed, install it through Azure CLI using `az aks install-cli` or follow the [upstream instructions](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/).
 
 ### Deploy an AKS Mariner cluster with Azure CLI
 
@@ -141,7 +140,7 @@ Use the following example commands to create a Mariner cluster.
 ```azurecli
 az group create --name MarinerTest --location eastus
 
-az aks create --name testMarinerCluster --resource-group MarinerTest --os-sku mariner
+az aks create --name testMarinerCluster --resource-group MarinerTest --os-sku mariner --generate-ssh-keys
 
 az aks get-credentials --resource-group MarinerTest --name testMarinerCluster
 
@@ -150,9 +149,14 @@ kubectl get pods --all-namespaces
 
 ### Deploy an AKS Mariner cluster with an ARM template
 
-To add Mariner to an existing ARM template, you need to add `"osSKU": "mariner"` and `"mode": "System"` to `agentPoolProfiles` and set the apiVersion to 2021-03-01 or newer (`"apiVersion": "2021-03-01"`). The following deployment uses the ARM template "marineraksarm.yml".
+To add Mariner to an existing ARM template, you need to do the following:
 
-```yml
+- Add `"osSKU": "mariner"` and `"mode": "System"` to agentPoolProfiles property.
+- Set the apiVersion to 2021-03-01 or newer: `"apiVersion": "2021-03-01"`
+
+The following deployment uses the ARM template `marineraksarm.json`.
+
+```json
 {
   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
   "contentVersion": "1.0.0.1",
@@ -173,6 +177,7 @@ To add Mariner to an existing ARM template, you need to add `"osSKU": "mariner"`
     },
     "dnsPrefix": {
       "type": "string",
+      "defaultValue": "mariner",
       "metadata": {
         "description": "Optional DNS prefix to use with hosted Kubernetes API server FQDN."
       }
@@ -281,12 +286,12 @@ To add Mariner to an existing ARM template, you need to add `"osSKU": "mariner"`
 }
 ```
 
-Create this file on your system and fill it with the contents of the Mariner AKS YAML file.
+Create this file on your system and include the settings defined in the `marineraksarm.json` file.
 
 ```azurecli
 az group create --name MarinerTest --location eastus
 
-az deployment group create --resource-group MarinerTest --template-file marineraksarm.yml --parameters clusterName=testMarinerCluster dnsPrefix=marineraks1 linuxAdminUsername=azureuser sshRSAPublicKey=`<contents of your id_rsa.pub>`
+az deployment group create --resource-group MarinerTest --template-file marineraksarm.json --parameters linuxAdminUsername=azureuser sshRSAPublicKey=`<contents of your id_rsa.pub>`
 
 az aks get-credentials --resource-group MarinerTest --name testMarinerCluster
 

articles/aks/learn/quick-kubernetes-deploy-bicep.md

@@ -77,7 +77,7 @@ For more AKS samples, see the [AKS quickstart templates][aks-quickstart-template
 
     ```azurecli
     az group create --name myResourceGroup --location eastus
-    az deployment group create --resource-group myResourceGroup --template-file main.bicep --parameters clusterName=<cluster-name> dnsPrefix=<dns-previs> linuxAdminUsername=<linux-admin-username> sshRSAPublicKey='<ssh-key>'
+    az deployment group create --resource-group myResourceGroup --template-file main.bicep --parameters clusterName=<cluster-name> dnsPrefix=<dns-prefix> linuxAdminUsername=<linux-admin-username> sshRSAPublicKey='<ssh-key>'
     ```
 
     # [PowerShell](#tab/PowerShell)

articles/aks/node-updates-kured.md

@@ -66,7 +66,7 @@ helm repo update
 kubectl create namespace kured
 
 # Install kured in that namespace with Helm 3 (only on Linux nodes, kured is not working on Windows nodes)
-helm install my-release kubereboot/kured --namespace kured --set nodeSelector."kubernetes\.io/os"=linux
+helm install my-release kubereboot/kured --namespace kured --set controller.nodeSelector."kubernetes\.io/os"=linux
 ```
 
 You can also configure additional parameters for `kured`, such as integration with Prometheus or Slack. For more information about additional configuration parameters, see the [kured Helm chart][kured-install].

articles/azure-fluid-relay/how-tos/azure-function-token-provider.md

@@ -197,7 +197,7 @@ TokenProviders can be implemented in many ways, but must implement two separate
 
 To ensure that the tenant secret key is kept secure, it's stored in a secure backend location and is only accessible from within the Azure Function. To retrieve tokens, you need to make a `GET` or `POST` request to your deployed Azure Function, providing the `tenantID` and `documentId`, and `userID`/`userName`. The Azure Function is responsible for the mapping between the tenant ID and a tenant key secret to appropriately generate and sign the token.
 
-The example implementation below handles making these requests to your Azure Function. It uses the [axios](https://www.npmjs.com/package/axios) library to make HTTP requests. You can use other libraries or approaches to making an HTTP request from server code.
+The example implementation below handles making these requests to your Azure Function. It uses the [axios](https://www.npmjs.com/package/axios) library to make HTTP requests. You can use other libraries or approaches to making an HTTP request from server code. This specific implementation is also provided for you as an export from the `@fluidframework/azure-client` package.
 
 ```typescript
 import { ITokenProvider, ITokenResponse } from "@fluidframework/routerlicious-driver";

articles/azure-fluid-relay/quickstarts/quickstart-dice-roll.md

@@ -73,7 +73,9 @@ const serviceConfig = {
 ```
 
 > [!WARNING]
-> During development, you can use `InsecureTokenProvider` to generate and sign authentication tokens that the Azure Fluid Relay service will accept. However, as the name implies, this is insecure and should not be used in production environments. The Azure Fluid Relay resource creation process provides you with a secret key which can be used to sign secure requests. **To ensure that this secret doesn't get exposed, this should be replaced with another implementation of ITokenProvider that fetches the token from a secure, developer-provided backend service prior to releasing to production.** An example implementation is [AzureFunctionTokenProvider](https://fluidframework.com/docs/apis/azure-client/azurefunctiontokenprovider-class). For more information, see [How to: Write a TokenProvider with an Azure Function](../how-tos/azure-function-token-provider.md).
+> During development, you can use `InsecureTokenProvider` to generate and sign authentication tokens that the Azure Fluid Relay service will accept. However, as the name implies, this is insecure and should not be used in production environments. The Azure Fluid Relay resource creation process provides you with a secret key which can be used to sign secure requests. **To ensure that this secret doesn't get exposed, this should be replaced with another implementation of ITokenProvider that fetches the token from a secure, developer-provided backend service prior to releasing to production.**
+>
+> One secure approach is outlined in ["How to: Write a TokenProvider with an Azure Function"](../how-tos/azure-function-token-provider.md).
 
 ### Build and run the client only
 

articles/azure-signalr/signalr-quickstart-azure-functions-python.md

@@ -69,7 +69,7 @@ This quickstart can be run on macOS, Windows, or Linux.
             {
               "type": "http",
               "direction": "out",
-              "name": "res"
+              "name": "$return"
             }
           ]
         }

articles/cognitive-services/openai/how-to/prepare-dataset.md

@@ -24,6 +24,7 @@ The first step of customizing your model is to prepare a high quality dataset. T
 - Each completion should start with a whitespace due to our tokenization, which tokenizes most words with a preceding whitespace.
 - Each completion should end with a fixed stop sequence to inform the model when the completion ends. A stop sequence could be `\n`, `###`, or any other token that doesn't appear in any completion.
 - For inference, you should format your prompts in the same way as you did when creating the training dataset, including the same separator. Also specify the same stop sequence to properly truncate the completion.
+- The dataset cannot exceed 100 Mb in total file size.
 
 ## Best practices
 

articles/container-instances/container-instances-application-gateway.md

@@ -120,6 +120,7 @@ az network application-gateway create \
   --vnet-name myVNet \
   --subnet myAGSubnet \
   --servers "$ACI_IP"
+  --priority 100
 ```
 
 

articles/sap/center-sap-solutions/deploy-s4hana.md

@@ -26,6 +26,12 @@ In this how-to guide, you'll learn how to deploy S/4HANA infrastructure in *Azur
 - A **User-assigned managed identity** which has Contributor role access on the Subscription or atleast all resource groups (Compute, Network,Storage). If you wish to install SAP Software through the Azure Center for SAP solutions, also provide Storage Blob data Reader, Reader and Data Access roles to the identity on SAP bits storage account where you would store the SAP Media.
 - A [network set up for your infrastructure deployment](prepare-network.md).
 - Availability of either Standard_D4ds_v4 or Standard_E4s_v3 SKUS which will be used for "Deployer VM".
+- [Review the quotas for your Azure subscription](../../quotas/view-quotas.md). If the quotas are low, you might need to create a support request before creating your infrastructure deployment. Otherwise, you might experience deployment failures or an **Insufficient quota** error. 
+- Note the SAP Application Performance Standard (SAPS) and database memory size that you need to allow Azure Center for SAP solutions to size your SAP system. If you're not sure, you can also select the VMs. There are:
+    - A single or cluster of ASCS VMs, which make up a single ASCS instance in the VIS.
+    - A single or cluster of Database VMs, which make up a single Database instance in the VIS.
+    - A single Application Server VM, which makes up a single Application instance in the VIS. Depending on the number of Application Servers being deployed or registered, there can be multiple application instances.
+
 
 ## Deployment types
 

articles/static-web-apps/deploy-nextjs-hybrid.md

@@ -111,12 +111,18 @@ Once the workflow is complete, you can refresh the browser to view your web app.
 
 Now any changes made to the `main` branch starts a new build and deployment of your website.
 
+
+>[!NOTE]
+>If you have trouble deploying a Next.js Hybrid application with more than 100Mb app size, use the `standalone` feature of Next.js. Refer to the [standalone](#enable-standalone-feature) section for more information. 
+
+
 ### Sync changes
 
 When you created the app, Azure Static Web Apps created a GitHub Actions file in your repository. Synchronize with the server by pulling down the latest to your local repository.
 
 Return to the terminal and run the following command `git pull origin main`.
 
+
 ## Add Server-Rendered data
 
 To insert data server-rendered data to a Next.js page, you need to first export a special function.