Skip to content

Commit cc98caa

Browse files
authored
Merge pull request #197374 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)
2 parents 02d1fb8 + 20ce1d9 commit cc98caa

File tree

9 files changed

+79
-19
lines changed

9 files changed

+79
-19
lines changed

articles/azure-arc/data/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ For complete release version information, see [Version log](version-log.md).
151151

152152
- Support for readable secondary replicas:
153153
- To set readable secondary replicas use `--readable-secondaries` when you create or update an Arc-enabled SQL Managed Instance deployment.
154-
- Set `--readable secondaries` to any value between 0 and the number of replicas minus 1.
154+
- Set `--readable-secondaries` to any value between 0 and the number of replicas minus 1.
155155
- `--readable-secondaries` only applies to Business Critical tier.
156156
- Automatic backups are taken on the primary instance in a Business Critical service tier when there are multiple replicas. When a failover happens, backups move to the new primary.
157157
- RWX capable storage class is required for backups, for both General Purpose and Business Critical service tiers.

articles/cognitive-services/Speech-Service/language-support.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ The following neural voices are in public preview.
730730
| English (United Kingdom) | `en-GB` | Female | `en-GB-BellaNeural` <sup>New</sup> | General |
731731
| English (United Kingdom) | `en-GB` | Female | `en-GB-HollieNeural` <sup>New</sup> | General |
732732
| English (United Kingdom) | `en-GB` | Female | `en-GB-OliviaNeural` <sup>New</sup> | General |
733-
| English (United Kingdom) | `en-GB` | Girl | `en-GB-MaisieNeural` <sup>New</sup> | General |
733+
| English (United Kingdom) | `en-GB` | Female | `en-GB-MaisieNeural` <sup>New</sup> | General, child voice |
734734
| English (United Kingdom) | `en-GB` | Male | `en-GB-AlfieNeural` <sup>New</sup> | General |
735735
| English (United Kingdom) | `en-GB` | Male | `en-GB-ElliotNeural` <sup>New</sup> | General |
736736
| English (United Kingdom) | `en-GB` | Male | `en-GB-EthanNeural` <sup>New</sup> | General |
@@ -743,7 +743,7 @@ The following neural voices are in public preview.
743743
| French (France) | `fr-FR` | Female | `fr-FR-JacquelineNeural` <sup>New</sup> | General |
744744
| French (France) | `fr-FR` | Female | `fr-FR-JosephineNeural` <sup>New</sup> | General |
745745
| French (France) | `fr-FR` | Female | `fr-FR-YvetteNeural` <sup>New</sup> | General |
746-
| French (France) | `fr-FR` | Girl | `fr-FR-EloiseNeural` <sup>New</sup> | General |
746+
| French (France) | `fr-FR` | Female | `fr-FR-EloiseNeural` <sup>New</sup> | General, child voice |
747747
| French (France) | `fr-FR` | Male | `fr-FR-AlainNeural` <sup>New</sup> | General |
748748
| French (France) | `fr-FR` | Male | `fr-FR-ClaudeNeural` <sup>New</sup> | General |
749749
| French (France) | `fr-FR` | Male | `fr-FR-JeromeNeural` <sup>New</sup> | General |
@@ -755,7 +755,7 @@ The following neural voices are in public preview.
755755
| German (Germany) | `de-DE` | Female | `de-DE-LouisaNeural` <sup>New</sup> | General |
756756
| German (Germany) | `de-DE` | Female | `de-DE-MajaNeural` <sup>New</sup> | General |
757757
| German (Germany) | `de-DE` | Female | `de-DE-TanjaNeural` <sup>New</sup> | General |
758-
| German (Germany) | `de-DE` | Girl | `de-DE-GiselaNeural` <sup>New</sup> | General |
758+
| German (Germany) | `de-DE` | Female | `de-DE-GiselaNeural` <sup>New</sup> | General, child voice |
759759
| German (Germany) | `de-DE` | Male | `de-DE-BerndNeural` <sup>New</sup> | General |
760760
| German (Germany) | `de-DE` | Male | `de-DE-ChristophNeural` <sup>New</sup> | General |
761761
| German (Germany) | `de-DE` | Male | `de-DE-KasperNeural` <sup>New</sup> | General |

articles/data-factory/data-flow-expression-functions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ In Data Factory and Synapse pipelines, use the expression language of the mappin
112112
| [power](data-flow-expressions-usage.md#power) | Raises one number to the power of another. |
113113
| [radians](data-flow-expressions-usage.md#radians) | Converts degrees to radians|
114114
| [random](data-flow-expressions-usage.md#random) | Returns a random number given an optional seed within a partition. The seed should be a fixed value and is used with the partitionId to produce random values |
115-
| [regexExtract](data-flow-expressions-usage.md#regexExtract) | Extract a matching substring for a given regex pattern. The last parameter identifies the match group and is defaulted to 1 if omitted. Use `<regex>`(back quote) to match a string without escaping. |
116-
| [regexMatch](data-flow-expressions-usage.md#regexMatch) | Checks if the string matches the given regex pattern. Use `<regex>`(back quote) to match a string without escaping. |
117-
| [regexReplace](data-flow-expressions-usage.md#regexReplace) | Replace all occurrences of a regex pattern with another substring in the given string Use `<regex>`(back quote) to match a string without escaping. |
115+
| [regexExtract](data-flow-expressions-usage.md#regexExtract) | Extract a matching substring for a given regex pattern. The last parameter identifies the match group and is defaulted to 1 if omitted. Use `` `<regex>` `` (back quote) to match a string without escaping. |
116+
| [regexMatch](data-flow-expressions-usage.md#regexMatch) | Checks if the string matches the given regex pattern. Use `` `<regex>` `` (back quote) to match a string without escaping. |
117+
| [regexReplace](data-flow-expressions-usage.md#regexReplace) | Replace all occurrences of a regex pattern with another substring in the given string Use `` `<regex>` `` (back quote) to match a string without escaping. |
118118
| [regexSplit](data-flow-expressions-usage.md#regexSplit) | Splits a string based on a delimiter based on regex and returns an array of strings. |
119119
| [replace](data-flow-expressions-usage.md#replace) | Replace all occurrences of a substring with another substring in the given string. If the last parameter is omitted, it's default to empty string. |
120120
| [reverse](data-flow-expressions-usage.md#reverse) | Reverses a string. |

articles/hdinsight/hbase/apache-hbase-migrate-new-version.md

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For more information about HDInsight versions and compatibility, see [Azure HDIn
3939

4040
## Apache HBase cluster migration overview
4141

42-
To upgrade your Apache HBase cluster on Azure HDInsight, you complete the following basic steps. For detailed instructions, see the detailed steps and commands.
42+
To upgrade your Apache HBase cluster on Azure HDInsight, complete the following basic steps. For detailed instructions, see the detailed steps and commands, or use the scripts from the section [Migrate HBase using scripts](#migrate-hbase-using-scripts) for automated migration.
4343

4444
Prepare the source cluster:
4545
1. Stop data ingestion.
@@ -206,6 +206,32 @@ sudo -u hbase hdfs dfs -Dfs.azure.page.blob.dir="/hbase-wals" -cp <source-contai
206206

207207
1. If the destination cluster is satisfactory, delete the source cluster.
208208

209+
## Migrate HBase using scripts
210+
211+
1. Execute the script [migrate-hbase-source.sh](https://github.com/Azure/hbase-utils/blob/master/scripts/migrate-hbase-source.sh) on the source cluster and [migrate-hbase-dest.sh](https://github.com/Azure/hbase-utils/blob/master/scripts/migrate-hbase-dest.sh) on the destination cluster. Use the following instructions to execute these scripts.
212+
> [!NOTE]
213+
> These scripts don't copy the HBase old WALs as part of the migration; therefore, the scripts are not to be used on clusters that have either HBase Backup or Replication feature enabled.
214+
215+
2. On source cluster
216+
```bash
217+
sudo bash migrate-hbase-source.sh
218+
```
219+
220+
3. On destination cluster
221+
```bash
222+
sudo bash migrate-hbase-dest.sh -f <src_default_Fs>
223+
```
224+
225+
Mandatory argument for the above command:
226+
227+
```
228+
-f, --src-fs
229+
The fs.defaultFS of the source cluster
230+
For example:
231+
-f wasb://anynamehbase0316encoder-2021-03-17t01-07-55-935z@anynamehbase0hdistorage.blob.core.windows.net
232+
```
233+
234+
209235
## Next steps
210236

211237
To learn more about [Apache HBase](https://hbase.apache.org/) and upgrading HDInsight clusters, see the following articles:

articles/purview/catalog-managed-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Additionally, you can deploy managed private endpoints for your Azure Key Vault
5454

5555
> [!IMPORTANT]
5656
> If you are planning to scan Azure Synapse workspaces using Managed Virtual Network, you are also required to [configure Azure Synapse workspace firewall access](register-scan-synapse-workspace.md#set-up-azure-synapse-workspace-firewall-access) to enable **Allow Azure services and resources to access this workspace**. Currently, we do not support setting up scans for an Azure Synapse workspace from the Microsoft Purview governance portal, if you cannot enable **Allow Azure services and resources to access this workspace** on your Azure Synapse workspaces. If you cannot enable the firewall:
57-
> - You can use [Microsoft Purview Rest API - Scans - Create Or Update](/rest/api/purview/scanningdataplane/scans/create-or-update/) to create a new scan for your Synapse workspaces including dedicated and serverless pools.
57+
> - You can use [Microsoft Purview REST API - Scans - Create Or Update](/rest/api/purview/scanningdataplane/scans/create-or-update/) to create a new scan for your Synapse workspaces including dedicated and serverless pools.
5858
> - You must use **SQL Authentication** as authentication mechanism.
5959
6060
### Managed Virtual Network

articles/security/fundamentals/steps-secure-identity.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ For more information, see the article [Blocking legacy authentication protocols
104104

105105
Using the verify explicitly principle, you should reduce the impact of compromised user credentials when they happen. For each app in your environment, consider the valid use cases: which groups, which networks, which devices and other elements are authorized – then block the rest. With Azure AD Conditional Access, you can control how authorized users access their apps and resources based on specific conditions you define.
106106

107+
For more information on how to use Conditional Access for your Cloud Apps and user actions, see [Conditional Access Cloud apps, actions, and authentication context](../../active-directory/conditional-access/concept-conditional-access-cloud-apps.md).
108+
107109
### Review and govern admin roles
108110

109111
Another Zero Trust pillar is the need to minimize the likelihood a compromised account can operate with a privileged role. This control can be accomplished by assigning the least amount of privilege to an identity. If you’re new to Azure AD Roles, this article will help you understand Azure AD Roles.

articles/virtual-machines/linux/create-upload-ubuntu.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,38 @@ This article assumes that you have already installed an Ubuntu Linux operating s
175175

176176
14. Azure only accepts fixed-size VHDs. If the VM's OS disk is not a fixed-size VHD, use the `Convert-VHD` PowerShell cmdlet and specify the `-VHDType Fixed` option. Please have a look at the docs for `Convert-VHD` here: [Convert-VHD](/powershell/module/hyper-v/convert-vhd).
177177

178+
15. To bring a Generation 2 VM on Azure, follow these steps:
179+
180+
181+
1. Change directory to the boot EFI directory:
182+
183+
```console
184+
# cd /boot/efi/EFI
185+
```
186+
187+
1. Copy the ubuntu directory to a new directory named boot:
188+
189+
```console
190+
# sudo cp -r ubuntu/ boot
191+
```
192+
193+
1. Change directory to the newly created boot directory:
194+
195+
```console
196+
# cd boot
197+
```
198+
199+
1. Rename the shimx64.efi file:
200+
201+
```console
202+
# sudo mv shimx64.efi bootx64.efi
203+
```
204+
205+
1. Rename the grub.cfg file to bootx64.cfg:
206+
207+
```console
208+
# sudo mv grub.cfg bootx64.cfg
209+
```
178210

179211
## Next steps
180212
You're now ready to use your Ubuntu Linux virtual hard disk to create new virtual machines in Azure. If this is the first time that you're uploading the .vhd file to Azure, see [Create a Linux VM from a custom disk](upload-vhd.md#option-1-upload-a-vhd).

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ You must complete specific configuration steps in the operating system for the v
8282
9. Modify the kernel boot line in your grub configuration to include additional kernel parameters for Azure. To do this open "/boot/grub/menu.lst" in a text editor and ensure that the kernel includes the following parameters:
8383

8484
```config-grub
85-
console=ttyS0 earlyprintk=ttyS0 rootdelay=300
85+
console=ttyS0 earlyprintk=ttyS0
8686
```
8787

8888
This will ensure all console messages are sent to the first serial port, which can assist Azure support with debugging issues.
@@ -188,7 +188,7 @@ Preparing an Oracle Linux 7 virtual machine for Azure is very similar to Oracle
188188
9. Modify the kernel boot line in your grub configuration to include additional kernel parameters for Azure. To do this open "/etc/default/grub" in a text editor and edit the `GRUB_CMDLINE_LINUX` parameter, for example:
189189

190190
```config-grub
191-
GRUB_CMDLINE_LINUX="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
191+
GRUB_CMDLINE_LINUX="console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
192192
```
193193

194194
This will also ensure all console messages are sent to the first serial port, which can assist Azure support with debugging issues. It also turns off the naming conventions for NICs in Oracle Linux 7 with the Unbreakable Enterprise Kernel. In addition to the above, it is recommended to *remove* the following parameters:

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ This section assumes that you have already obtained an ISO file from the Red Hat
9696
1. Modify the kernel boot line in your grub configuration to include additional kernel parameters for Azure. To do this modification, open `/boot/grub/menu.lst` in a text editor, and ensure that the default kernel includes the following parameters:
9797

9898
```config-grub
99-
console=ttyS0 earlyprintk=ttyS0 rootdelay=300
99+
console=ttyS0 earlyprintk=ttyS0
100100
```
101101

102102
This will also ensure that all console messages are sent to the first serial port, which can assist Azure support with debugging issues.
@@ -202,7 +202,7 @@ This section assumes that you have already obtained an ISO file from the Red Hat
202202

203203
204204
```config-grub
205-
GRUB_CMDLINE_LINUX="rootdelay=300 console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 earlyprintk=ttyS0 net.ifnames=0"
205+
GRUB_CMDLINE_LINUX="console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 earlyprintk=ttyS0 net.ifnames=0"
206206
GRUB_TERMINAL_OUTPUT="serial console"
207207
GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
208208
```
@@ -393,7 +393,7 @@ This section assumes that you have already obtained an ISO file from the Red Hat
393393
1. Edit `/etc/default/grub` in a text editor, and add the following paramters:
394394

395395
```config-grub
396-
GRUB_CMDLINE_LINUX="rootdelay=300 console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 earlyprintk=ttyS0 net.ifnames=0"
396+
GRUB_CMDLINE_LINUX="console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 earlyprintk=ttyS0 net.ifnames=0"
397397
GRUB_TERMINAL_OUTPUT="serial console"
398398
GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1"
399399
```
@@ -621,7 +621,7 @@ This section shows you how to use KVM to prepare a [RHEL 6](#rhel-6-using-kvm) o
621621
1. Modify the kernel boot line in your grub configuration to include additional kernel parameters for Azure. To do this configuration, open `/boot/grub/menu.lst` in a text editor, and ensure that the default kernel includes the following parameters:
622622

623623
```config-grub
624-
console=ttyS0 earlyprintk=ttyS0 rootdelay=300
624+
console=ttyS0 earlyprintk=ttyS0
625625
```
626626

627627
This will also ensure that all console messages are sent to the first serial port, which can assist Azure support with debugging issues.
@@ -816,7 +816,7 @@ This section shows you how to use KVM to prepare a [RHEL 6](#rhel-6-using-kvm) o
816816
1. Modify the kernel boot line in your grub configuration to include additional kernel parameters for Azure. To do this configuration, open `/etc/default/grub` in a text editor, and edit the `GRUB_CMDLINE_LINUX` parameter. For example:
817817

818818
```config-grub
819-
GRUB_CMDLINE_LINUX="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
819+
GRUB_CMDLINE_LINUX="console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
820820
```
821821

822822
This command also ensures that all console messages are sent to the first serial port, which can assist Azure support with debugging issues. The command also turns off the new RHEL 7 naming conventions for NICs. In addition, we recommend that you remove the following parameters:
@@ -1007,7 +1007,7 @@ This section assumes that you have already installed a RHEL virtual machine in V
10071007
1. Modify the kernel boot line in your grub configuration to include additional kernel parameters for Azure. To do this, open `/etc/default/grub` in a text editor, and edit the `GRUB_CMDLINE_LINUX` parameter. For example:
10081008

10091009
```config-grub
1010-
GRUB_CMDLINE_LINUX="rootdelay=300 console=ttyS0 earlyprintk=ttyS0"
1010+
GRUB_CMDLINE_LINUX="console=ttyS0 earlyprintk=ttyS0"
10111011
```
10121012

10131013
This will also ensure that all console messages are sent to the first serial port, which can assist Azure support with debugging issues. In addition, we recommend that you remove the following parameters:
@@ -1153,7 +1153,7 @@ This section assumes that you have already installed a RHEL virtual machine in V
11531153
1. Modify the kernel boot line in your grub configuration to include additional kernel parameters for Azure. To do this modification, open `/etc/default/grub` in a text editor, and edit the `GRUB_CMDLINE_LINUX` parameter. For example:
11541154

11551155
```config-grub
1156-
GRUB_CMDLINE_LINUX="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
1156+
GRUB_CMDLINE_LINUX="console=ttyS0 earlyprintk=ttyS0 net.ifnames=0"
11571157
```
11581158

11591159
This configuration also ensures that all console messages are sent to the first serial port, which can assist Azure support with debugging issues. It also turns off the new RHEL 7 naming conventions for NICs. In addition, we recommend that you remove the following parameters:
@@ -1396,7 +1396,7 @@ This section shows you how to prepare a RHEL 7 distro from an ISO using a kickst
13961396
EOF
13971397

13981398
# Set the cmdline
1399-
sed -i 's/^\(GRUB_CMDLINE_LINUX\)=".*"$/\1="console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300"/g' /etc/default/grub
1399+
sed -i 's/^\(GRUB_CMDLINE_LINUX\)=".*"$/\1="console=tty1 console=ttyS0 earlyprintk=ttyS0"/g' /etc/default/grub
14001400

14011401
# Enable SSH keepalive
14021402
sed -i 's/^#\(ClientAliveInterval\).*$/\1 180/g' /etc/ssh/sshd_config

0 commit comments

Comments
 (0)