Skip to content

Commit 1dfaab9

Browse files
authored
Merge pull request #264489 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 5e6ec18 + e76c3d6 commit 1dfaab9

File tree

9 files changed

+28
-17
lines changed

9 files changed

+28
-17
lines changed

articles/azure-arc/servers/ssh-arc-troubleshoot.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,15 @@ Resolution:
120120
- Confirm success by running ```az provider show -n Microsoft.HybridConnectivity```, verify that `registrationState` is set to `Registered`
121121
- Restart the hybrid agent on the Arc-enabled server
122122

123+
### Cannot connect after updating CLI tool and Arc agent
124+
125+
This issue occurs when the updated command creates a new service configuration before the Arc agent is updated. This will only impact Azure Arc versions older than 1.31 when updating to a version 1.31 or newer. Error:
126+
127+
- Connection closed by UNKNOWN port 65535
128+
129+
Resolution:
130+
131+
- Delete the existing service configuration and allow it to be re-created by the CLI command at the next connection. Run ```az rest --method delete --uri https://management.azure.com/subscriptions/<SUB_ID>/resourceGroups/<RG_NAME>/providers/Microsoft.HybridCompute/machines/<VM_NAME>/providers/Microsoft.HybridConnectivity/endpoints/default/serviceconfigurations/SSH?api-version=2023-03-15```
123132

124133
## Disable SSH to Arc-enabled servers
125134

articles/azure-monitor/alerts/alerts-troubleshoot.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,15 @@ If you can see a fired alert in the portal, but its configured action did not tr
150150

151151
1. **Did your webhook become unresponsive or return errors?**
152152

153-
The webhook response timeout period is 10 seconds. When the HTTP endpoint does not respond or when the following HTTP status codes are returned, the webhook call is retried up to two times:
154-
155-
- `408`
156-
- `429`
157-
- `503`
158-
- `504`
159-
160-
One retry occurs after 10 seconds and another retry occurs after 100 seconds. If the second retry fails, the endpoint is not called again for 15 minutes for any action group.
153+
Webhook action groups generally follow these rules when called:
154+
- When a webhook is invoked, if the first call fails, it is retried at least 1 more time, and up to 5 times (5 retries) at various delay intervals (5, 20, 40 seconds).
155+
- The delay between 1st and 2nd attempt is 5 seconds
156+
- The delay between 2nd and 3rd attempt is 20 seconds
157+
- The delay between 3rd and 4th attempt is 5 seconds
158+
- The delay between 4th and 5th attempt is 40 seconds
159+
- The delay between 5th and 6th attempt is 5 seconds
160+
- After retries attempted to call the webhook fail, no action group calls the endpoint for 15 minutes.
161+
- The retry logic assumes that the call can be retried. The status codes: 408, 429, 503, 504, or `HttpRequestException`, `WebException`, or `TaskCancellationException` allow for the call to be retried.
161162

162163
## Action or notification happened more than once
163164

articles/azure-sql-edge/high-availability-sql-edge-containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To create a container in Kubernetes, see [Deploy a Azure SQL Edge container in K
4141
## Next steps
4242

4343
To deploy Azure SQL Edge containers in Azure Kubernetes Service (AKS), see the following articles:
44-
- [Deploy a Azure SQL Edge container in Kubernetes](deploy-Kubernetes.md)
44+
- [Deploy an Azure SQL Edge container in Kubernetes](deploy-Kubernetes.md)
4545
- [Machine Learning and Artificial Intelligence with ONNX in SQL Edge](onnx-overview.md).
4646
- [Building an end to end IoT Solution with SQL Edge using IoT Edge](tutorial-deploy-azure-resources.md).
4747
- [Data Streaming in Azure SQL Edge](stream-data.md)

articles/dms/howto-sql-server-to-azure-sql-managed-instance-powershell-offline.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To complete these steps, you need:
4141
* To enable the TCP/IP protocol, which is disabled by default with SQL Server Express installation. Enable the TCP/IP protocol by following the article [Enable or Disable a Server Network Protocol](/sql/database-engine/configure-windows/enable-or-disable-a-server-network-protocol#SSMSProcedure).
4242
* To configure your [Windows Firewall for database engine access](/sql/database-engine/configure-windows/configure-a-windows-firewall-for-database-engine-access).
4343
* An Azure subscription. If you don't have one, [create a free account](https://azure.microsoft.com/free/) before you begin.
44-
* A SQL Managed Instance. You can create a SQL Managed Instance by following the detail in the article [Create a ASQL Managed Instance](/azure/azure-sql/managed-instance/instance-create-quickstart).
44+
* A SQL Managed Instance. You can create a SQL Managed Instance by following the detail in the article [Create an Azure SQL Managed Instance](/azure/azure-sql/managed-instance/instance-create-quickstart).
4545
* To download and install [Data Migration Assistant](https://www.microsoft.com/download/details.aspx?id=53595) v3.3 or later.
4646
* A Microsoft Azure Virtual Network created using the Azure Resource Manager deployment model, which provides the Azure Database Migration Service with site-to-site connectivity to your on-premises source servers by using either [ExpressRoute](../expressroute/expressroute-introduction.md) or [VPN](../vpn-gateway/vpn-gateway-about-vpngateways.md).
4747
* A completed assessment of your on-premises database and schema migration using Data Migration Assistant, as described in the article [Performing a SQL Server migration assessment](/sql/dma/dma-assesssqlonprem).
@@ -113,7 +113,7 @@ $sourceConnInfo = New-AzDmsConnInfo -ServerType SQL `
113113
-TrustServerCertificate:$true
114114
```
115115

116-
The next example shows creation of Connection Info for a Azure SQL Managed Instance named ‘targetmanagedinstance’:
116+
The next example shows creation of Connection Info for an Azure SQL Managed Instance named ‘targetmanagedinstance’:
117117

118118
```powershell
119119
$targetResourceId = (Get-AzSqlInstance -Name "targetmanagedinstance").Id
@@ -180,7 +180,7 @@ $backupFileShare = New-AzDmsFileShare -Path $backupFileSharePath -Credential $ba
180180

181181
The next step is to select the source and target databases by using the `New-AzDmsSelectedDB` cmdlet.
182182

183-
The following example is for migrating a single database from SQL Server to a Azure SQL Managed Instance:
183+
The following example is for migrating a single database from SQL Server to an Azure SQL Managed Instance:
184184

185185
```powershell
186186
$selectedDbs = @()
@@ -190,7 +190,7 @@ $selectedDbs += New-AzDmsSelectedDB -MigrateSqlServerSqlDbMi `
190190
-BackupFileShare $backupFileShare `
191191
```
192192

193-
If an entire SQL Server instance needs a lift-and-shift into a Azure SQL Managed Instance, then a loop to take all databases from the source is provided below. In the following example, for $Server, $SourceUserName, and $SourcePassword, provide your source SQL Server details.
193+
If an entire SQL Server instance needs a lift-and-shift into an Azure SQL Managed Instance, then a loop to take all databases from the source is provided below. In the following example, for $Server, $SourceUserName, and $SourcePassword, provide your source SQL Server details.
194194

195195
```powershell
196196
$Query = "(select name as Database_Name from master.sys.databases where Database_id>4)";

articles/event-grid/push-delivery-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The following articles provide you with information on how to use Event Grid or
8282

8383
- [Learn about System Topics](system-topics.md)
8484
- [Learn about Partner Topics](partner-events-overview.md)
85-
- [Learn bout Event Domains](event-domains.md)
85+
- [Learn about Event Domains](event-domains.md)
8686
- [Learn about event handlers](event-handlers.md)
8787
- [Learn about event filtering](event-filtering.md)
8888
- [Publish and subscribe using custom topics](custom-event-quickstart-portal.md).

articles/networking/nva-accelerated-connections.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ This list will be updated as more regions become available. The following region
6969
* West US
7070
* East US 2
7171
* Central US
72+
* South UK
73+
* West Europe
7274

7375
## Supported SKUs
7476

articles/service-fabric/service-fabric-tutorial-create-vnet-and-linux-cluster.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ The following is a template snippet for the Service Fabric Linux extension:
104104
"durabilityLevel": "Silver",
105105
"enableParallelJobs": true,
106106
"nicPrefixOverride": "[variables('subnet0Prefix')]",
107-
"dataPath": "D:\\\\SvcFab",
108107
"certificate": {
109108
"commonNames": [
110109
"[parameters('certificateCommonName')]"

articles/virtual-desktop/install-windows-client-per-user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.author: daknappe
99

1010
# Install the Remote Desktop client for Windows on a per-user basis with Intune or Configuration Manager
1111

12-
You can install the [Remote Desktop client for Windows](./users/connect-windows.md) on either a per-system or per-user basis. Installing it on a per-system basis installs the client on the machines for all users by default, and administrators control updates. Per-user installation installs the application to a subfolder within the local AppData folder of each user's profile, enabling users to install updates with needing administrative rights.
12+
You can install the [Remote Desktop client for Windows](./users/connect-windows.md) on either a per-system or per-user basis. Installing it on a per-system basis installs the client on the machines for all users by default, and administrators control updates. Per-user installation installs the application to a subfolder within the local AppData folder of each user's profile, enabling users to install updates without needing administrative rights.
1313

1414
When you install the client using `msiexec.exe`, per-system is the default method of client installation. You can use the parameters `ALLUSERS=2 MSIINSTALLPERUSER=1` with `msiexec` to install the client per-user, however if you're deploying the client with Intune or Configuration Manager, using `msiexec` directly to install the client causes it to be installed per-system, regardless of the parameters used. Wrapping the `msiexec` command in a PowerShell script enables the client to be successfully installed per-user.
1515

articles/virtual-machines/linux/disk-encryption-key-vault-aad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ When you need encryption to be enabled on a running VM in Azure, Azure Disk Encr
9292
9393
9494
### <a name="bkmk_ADappPSH"></a> Set up a Microsoft Entra app and service principal with Azure PowerShell
95-
To execute the following commands, get and use the [Azure PowerShell module](/powershell/azure/what-is-azure-powershell).https://learn.microsoft.com/en-us/powershell/azure/what-is-azure-powershell?view=azps-11.2.0
95+
To execute the following commands, get and use the [Azure PowerShell module](/powershell/azure/what-is-azure-powershell).
9696
9797
1. Use the [New-AzADApplication](/powershell/module/az.resources/new-azadapplication) PowerShell cmdlet to create a Microsoft Entra application. MyApplicationHomePage and the MyApplicationUri can be any values you wish.
9898

0 commit comments

Comments
 (0)