Merge pull request #274517 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: Taojunshen

articles/active-directory-b2c/custom-policies-series-store-user.md

@@ -206,7 +206,7 @@ We use the `ClaimGenerator` technical profile to execute three claims transforma
                         </Precondition>
                     </Preconditions>
                 </ValidationTechnicalProfile>                        
-                <ValidationTechnicalProfile ReferenceId="DisplayNameClaimGenerator"/>
+                <ValidationTechnicalProfile ReferenceId="UserInputDisplayNameGenerator"/>
                 <ValidationTechnicalProfile ReferenceId="AAD-UserWrite"/>
             </ValidationTechnicalProfiles>
         <!--</TechnicalProfile>-->

articles/active-directory-b2c/index.yml

@@ -228,7 +228,7 @@ conceptualContent:
           - text: Deploy with GitHub actions
             url: deploy-custom-policies-github-action.md
             itemType: how-to-guide
-          - text: Manage resources using Microsoft Powershell
+          - text: Manage resources using Microsoft PowerShell
             url: manage-custom-policies-powershell.md
             itemType: how-to-guide
 

articles/azure-arc/kubernetes/azure-rbac.md

@@ -716,6 +716,11 @@ node-3    Ready    agent    6m33s    v1.18.14
 
 If the secret for the server application's service principal has expired, you'll need to rotate it.
 
+### [Azure CLI >= v2.3.7](#tab/AzureCLI)
+```azurecli
+SERVER_APP_SECRET=$(az ad sp credential reset --id "${SERVER_APP_ID}" --query password -o tsv)
+```
+### [Azure CLI < v2.3.7](#tab/AzureCLI236)
 ```azurecli
 SERVER_APP_SECRET=$(az ad sp credential reset --name "${SERVER_APP_ID}" --credential-description "ArcSecret" --query password -o tsv)
 ```
@@ -726,6 +731,8 @@ Update the secret on the cluster. Include any optional parameters you configured
 az connectedk8s enable-features -n <clusterName> -g <resourceGroupName> --features azure-rbac --app-id "${SERVER_APP_ID}" --app-secret "${SERVER_APP_SECRET}"
 ```
 
+---
+
 ## Next steps
 
 - Securely connect to the cluster by using [Cluster Connect](cluster-connect.md).

articles/azure-resource-manager/management/delete-resource-group.md

@@ -168,7 +168,7 @@ If you have the required access, but the delete request fails, it may be because
 
 ## Can I recover a deleted resource group?
 
-No, you can't recover a deleted resource group. However, you might be able to resore some recently deleted resources.
+No, you can't recover a deleted resource group. However, you might be able to restore some recently deleted resources.
 
 Some resource types support *soft delete*. You might have to configure soft delete before you can use it. For information about enabling soft delete, see:
 

articles/postgresql/flexible-server/how-to-autovacuum-tuning.md

@@ -98,7 +98,7 @@ Use the following query to list the tables in a database and identify the tables
         ,C.reltuples AS reltuples
         ,round(current_setting('autovacuum_vacuum_threshold')::INTEGER + current_setting('autovacuum_vacuum_scale_factor')::NUMERIC * C.reltuples) AS av_threshold
         ,date_trunc('minute', greatest(pg_stat_get_last_vacuum_time(C.oid), pg_stat_get_last_autovacuum_time(C.oid))) AS last_vacuum
-        ,date_trunc('minute', greatest(pg_stat_get_last_analyze_time(C.oid), pg_stat_get_last_analyze_time(C.oid))) AS last_analyze
+        ,date_trunc('minute', greatest(pg_stat_get_last_analyze_time(C.oid), pg_stat_get_last_autoanalyze_time(C.oid))) AS last_analyze
       FROM pg_class C
       LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace)
       WHERE C.relkind IN (

articles/virtual-machines/linux/debian-create-upload-vhd.md

@@ -6,8 +6,8 @@ ms.service: virtual-machines
 ms.custom: linux-related-content
 ms.collection: linux
 ms.topic: how-to
-ms.date: 11/10/2021
-ms.author: srijangupta
+ms.date: 05/01/2024
+ms.author: maries
 ms.reviewer: mattmcinnes
 ---
 # Prepare a Debian VHD for Azure
@@ -24,23 +24,6 @@ This section assumes that you have already installed a Debian Linux operating sy
 * Do not configure a swap partition on the OS disk. The Azure Linux agent can be configured to create a swap file on the temporary resource disk. More information can be found in the steps below.
 * All VHDs on Azure must have a virtual size aligned to 1MB. When converting from a raw disk to VHD, you must ensure that the raw disk size is a multiple of 1MB before conversion. For more information, see [Linux Installation Notes](create-upload-generic.md#general-linux-installation-notes).
 
-## Use Azure-Manage to create Debian VHDs
-There are tools available for generating Debian VHDs for Azure, such as the [azure-manage](https://github.com/credativ/azure-manage) scripts from [Instaclustr](https://www.instaclustr.com/). This is the recommended approach versus creating an image from scratch. For example, to create a Debian 8 VHD run the following commands to download the `azure-manage` utility (and dependencies) and run the `azure_build_image` script:
-
-```console
-# sudo apt-get update
-# sudo apt-get install git qemu-utils mbr kpartx debootstrap
-
-# sudo apt-get install python3-pip python3-dateutil python3-cryptography
-# sudo pip3 install azure-storage azure-servicemanagement-legacy azure-common pytest pyyaml
-# git clone https://github.com/credativ/azure-manage.git
-# cd azure-manage
-# sudo pip3 install .
-
-# sudo azure_build_image --option release=jessie --option image_size_gb=30 --option image_prefix=debian-jessie-azure section
-```
-
-
 ## Prepare a Debian image for Azure
 
 You can create the base Azure Debian Cloud image with the [FAI cloud image builder](https://salsa.debian.org/cloud-team/debian-cloud-images).
@@ -74,20 +57,20 @@ $ sudo chmod 755 ./config_space/scripts/AZURE/10-custom
 Note that it is important to prefix any commands you want to have customizing the image with `$ROOTCMD` as this is aliased as `chroot $target`.
 
 
-## Build the Azure Debian 10 image:
+## Build the Azure Debian image:
 
 ```
-$ make image_buster_azure_amd64
+$ make image_[release]_azure_amd64
 ```
 
 
-This will output a handful of files in the current directory, most notably the `image_buster_azure_amd64.raw` image file.
+This will output a handful of files in the current directory, most notably the `image_[release]_azure_amd64.raw` image file.
 
 To convert the raw image to VHD for Azure, you can do the following:
 
 ```
-rawdisk="image_buster_azure_amd64.raw"
-vhddisk="image_buster_azure_amd64.vhd"
+rawdisk="image_[release]_azure_amd64.raw"
+vhddisk="image_[release]_azure_amd64.vhd"
 
 MB=$((1024*1024))
 size=$(qemu-img info -f raw --output json "$rawdisk" | \
@@ -103,10 +86,20 @@ qemu-img convert -f raw -o subformat=fixed,force_size -O vpc "$rawdisk" "$vhddis
 ```
 
 
-This creates a VHD `image_buster_azure_amd64.vhd` with a rounded size to be able to copy it successfully to an Azure Disk.
+This creates a VHD `image_[release]_azure_amd64.vhd` with a rounded size to be able to copy it successfully to an Azure Disk.
+
+>[!Note]
+> Rather than cloning the salsa repository and building images locally, current stable images can be built and downloaded from [FAI](https://fai-project.org/FAIme/cloud/).
+
+After creating a stable Debian vhd image, before uploading verify the following packages are installed:
+* apt-get install hyperv-daemons
+* apt-get install waagent # *optional but recommended for password resets and the use of extensions*
+* apt-get install cloud-init
 
-Now we need to create the Azure resources for this image (this uses the `$rounded_size_adjusted` variable, so it should be from within the same shell process from above).
+Then perform a full upgrade:
+* apt-get full-upgrade
 
+Now the Azure resources must be created for this image (this uses the `$rounded_size_adjusted` variable, so it should be from within the same shell process from above).
 ```
 az group create -l $LOCATION -n $RG
 
@@ -149,7 +142,7 @@ az vm create \
 >[!Note]
 > If the bandwidth from your local machine to the Azure Disk is causing a long time to process the upload with azcopy, you can use an Azure VM jumpbox to speed up the process. Here's how this can be done:
 >
->1. Create a tarball of the VHD on your local machine: `tar -czvf ./image_buster_azure_amd64.vhd.tar.gz ./image_buster_azure_amd64.vhd`.
+>1. Create a tarball of the VHD on your local machine: `tar -czvf ./image_buster_azure_amd64.vhd.tar.gz ./image_[release]_azure_amd64.vhd`.
 >2. Create an Azure Linux VM (distro of your choice). Make sure that you create it with a large enough disk to hold the extracted VHD!
 >3. Download the azcopy utility to the Azure Linux VM. It can be retrieved from [here](../../storage/common/storage-use-azcopy-v10.md#download-azcopy).
 >4. Copy the tarball to the VM: `scp ./image_buster_azure_amd64.vhd.tar.gz <vm>:~`.

articles/virtual-machines/linux/redhat-create-upload-vhd.md

@@ -222,48 +222,52 @@ EOF
 
 
     ```config-grub
-    GRUB_CMDLINE_LINUX="console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 earlyprintk=ttyS0 net.ifnames=0"
+    GRUB_CMDLINE_LINUX="console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 net.ifnames=0"
     GRUB_TERMINAL_OUTPUT="serial console"
     GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
+    ENABLE_BLSCFG=true
     ```
 
-    This will also ensure that all console messages are sent to the first serial port and enable interaction with the serial console, which can assist Azure support with debugging issues. This configuration also turns off the new RHEL 7 naming conventions for NICs.
+   > [!NOTE]
+   > If [**ENABLE_BLSCFG=false**](https://access.redhat.com/solutions/6929571) is  present in `/etc/default/grub` instead of 'ENABLE_BLSCFG=true` tools such as ___grubedit___ or ___gubby___, which rely on the Boot Loader Specification (BLS) for managing boot entries and configurations, may not function correctly in RHEL 8 and 9.  Be advised, if ENABLE_BLSCFG is not present, the default behavior is "false".
 
-    ```config
-    rhgb quiet crashkernel=auto
-    ```
+   This will also ensure that all console messages are sent to the first serial port and enable interaction with the serial console, which can assist Azure support with debugging issues. This configuration also turns off the new RHEL 7 naming conventions for NICs.
 
-    Graphical and quiet boots aren't useful in a cloud environment where we want all the logs to be sent to the serial port. You can leave the `crashkernel` option configured if desired. Note that this parameter reduces the amount of available memory in the virtual machine by 128 MB or more, which might be problematic on smaller virtual machine sizes.
+   ```config
+   rhgb quiet crashkernel=auto
+   ```
+
+   Graphical and quiet boots aren't useful in a cloud environment where we want all the logs to be sent to the serial port. You can leave the `crashkernel` option configured if desired. Note that this parameter reduces the amount of available memory in the virtual machine by 128 MB or more, which might be problematic on smaller virtual machine sizes.
 
-8. After you're done editing `/etc/default/grub`, run the following command to rebuild the grub configuration:
+7. After you're done editing `/etc/default/grub`, run the following command to rebuild the grub configuration:
 
     ```bash
     sudo grub2-mkconfig -o /boot/grub2/grub.cfg
     ```
     > [!NOTE]
     > If uploading an UEFI enabled VM, the command to update grub is `grub2-mkconfig -o /boot/efi/EFI/redhat/grub.cfg`.
 
-9. Ensure that the SSH server is installed and configured to start at boot time, which is usually the default. Modify `/etc/ssh/sshd_config` to include the following line:
+8. Ensure that the SSH server is installed and configured to start at boot time, which is usually the default. Modify `/etc/ssh/sshd_config` to include the following line:
 
     ```config
     ClientAliveInterval 180
     ```
 
-10. The WALinuxAgent package, `WALinuxAgent-<version>`, has been pushed to the Red Hat extras repository. Enable the extras repository by running the following command:
+9. The WALinuxAgent package, `WALinuxAgent-<version>`, has been pushed to the Red Hat extras repository. Enable the extras repository by running the following command:
 
     ```bash
     sudo subscription-manager repos --enable=rhel-7-server-extras-rpms
     ```
 
-11. Install the Azure Linux Agent, cloud-init and other necessary utilities by running the following command:
+10. Install the Azure Linux Agent, cloud-init and other necessary utilities by running the following command:
 
     ```bash
     sudo yum install -y WALinuxAgent cloud-init cloud-utils-growpart gdisk hyperv-daemons
     sudo systemctl enable waagent.service
     sudo systemctl enable cloud-init.service
     ```
 
-12. Configure cloud-init to handle the provisioning:
+11. Configure cloud-init to handle the provisioning:
 
     1. Configure waagent for cloud-init:
 
@@ -319,7 +323,7 @@ EOF
 
     ```
 
-13. Swap configuration.
+12. Swap configuration.
     Don't create swap space on the operating system disk.
 
     Previously, the Azure Linux Agent was used to automatically configure swap space by using the local resource disk that is attached to the virtual machine after the virtual machine is provisioned on Azure. However, this is now handled by cloud-init, you **must not** use the Linux Agent to format the resource disk create the swap file, modify the following parameters in `/etc/waagent.conf` appropriately:
@@ -353,13 +357,13 @@ EOF
           - ["ephemeral0.2", "none", "swap", "sw,nofail,x-systemd.requires=cloud-init.service,x-systemd.device-timeout=2", "0", "0"]
         EOF
         ```
-14. If you want to unregister the subscription, run the following command:
+13. If you want to unregister the subscription, run the following command:
 
     ```bash
     sudo subscription-manager unregister
     ```
 
-15. Deprovision
+14. Deprovision
 
     Run the following commands to deprovision the virtual machine and prepare it for provisioning on Azure:
 
@@ -375,9 +379,9 @@ EOF
     ```
 
 
-16. Click **Action** > **Shut Down** in Hyper-V Manager. Your Linux VHD is now ready to be [**uploaded to Azure**](./upload-vhd.md#option-1-upload-a-vhd).
+15. Click **Action** > **Shut Down** in Hyper-V Manager. Your Linux VHD is now ready to be [**uploaded to Azure**](./upload-vhd.md#option-1-upload-a-vhd).
 
-### RHEL 8 using Hyper-V Manager
+### RHEL 8+ using Hyper-V Manager
 
 1. In Hyper-V Manager, select the virtual machine.
 

articles/virtual-network-manager/concept-user-defined-route.md

@@ -128,5 +128,5 @@ The following are the limitations of UDR management with Azure Virtual Network M
 ## Next step
 
 > [!div class="nextstepaction"]
-> [Learn how to create user-defined routes in Azure Virtual Network Manager](how-to-create-user-defined-routes.md).
+> [Learn how to create user-defined routes in Azure Virtual Network Manager](how-to-create-user-defined-route.md).