Skip to content

Commit 30d2abe

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into simplifyUltra
2 parents 83b329f + 4f4ffdf commit 30d2abe

30 files changed

+205
-69
lines changed

articles/api-management/api-management-howto-deploy-multi-region.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to deploy a Premium tier Azure API Management instance to
55
author: dlepow
66
ms.service: api-management
77
ms.topic: how-to
8-
ms.date: 01/26/2023
8+
ms.date: 01/26/2024
99
ms.author: danlep
1010
---
1111

@@ -125,12 +125,15 @@ Under some conditions, you might need to temporarily disable routing to one of t
125125
* To redirect traffic to other regions during a planned disaster recovery drill that simulates an unavailable region, or during a regional failure
126126

127127
To disable routing to a regional gateway in your API Management instance, update the gateway's `disableGateway` property value to `true`. You can set the value using the [Create or update service](/rest/api/apimanagement/current-ga/api-management-service/create-or-update) REST API, the [az apim update](/cli/azure/apim#az-apim-update) command in the Azure CLI, the [set-azapimanagement](/powershell/module/az.apimanagement/set-azapimanagement) Azure PowerShell cmdlet, or other Azure tools.
128+
129+
>[!NOTE]
130+
> You can only disable routing to a regional gateway when you are using API Management's default routing, not a custom routing solution.
128131

129132
To disable a regional gateway using the Azure CLI:
130133

131134
1. Use the [az apim show](/cli/azure/apim#az-apim-show) command to show the locations, gateway status, and regional URLs configured for the API Management instance.
132135
```azurecli
133-
az apim show --name contoso --resource-group myResourceGroup \
136+
az apim show --name contoso --resource-group apim-hello-world-resource \
134137
--query "additionalLocations[].{Location:location,Disabled:disableGateway,Url:gatewayRegionalUrl}" \
135138
--output table
136139
```
@@ -144,7 +147,7 @@ To disable a regional gateway using the Azure CLI:
144147
```
145148
1. Use the [az apim update](/cli/azure/apim#az-apim-update) command to disable the gateway in an available location, such as West US 2.
146149
```azurecli
147-
az apim update --name contoso --resource-group myResourceGroup \
150+
az apim update --name contoso --resource-group apim-hello-world-resource \
148151
--set additionalLocations[location="West US 2"].disableGateway=true
149152
```
150153

articles/azure-arc/resource-bridge/system-requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ By default, these files are generated in the current CLI directory when `createc
175175

176176
### Kubeconfig
177177

178-
The appliance VM hosts a management Kubernetes cluster. The kubeconfig is a low-privilege Kubernetes configuration file that is used to maintain the appliance VM. By default, it's generated in the current CLI directory when the `deploy` command completes. The kubeconfig should be saved in a secure location to the management machine, because it's required for maintaining the appliance VM.
178+
The appliance VM hosts a management Kubernetes cluster. The kubeconfig is a low-privilege Kubernetes configuration file that is used to maintain the appliance VM. By default, it's generated in the current CLI directory when the `deploy` command completes. The kubeconfig should be saved in a secure location on the management machine, because it's required for maintaining the appliance VM. If the kubeconfig is lost, it can be retrieved by running the `az arcappliance get-credentials` command.
179179

180180
### HCI login configuration file (Azure Stack HCI only)
181181

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/mqtt-automotive-connectivity-and-data-solution.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 'Describes the use case of automotive messaging'
44
ms.topic: conceptual
55
ms.custom:
66
- ignite-2023
7-
ms.date: 11/15/2023
7+
ms.date: 01/29/2024
88
author: msmarioo
99
ms.author: marioo
1010
ms.subservice: mqtt
@@ -286,7 +286,7 @@ Other contributors:
286286
* [Jeff Beman](https://www.linkedin.com/in/jeff-beman-4730726/) | Principal Program Manager, Mobility CVP
287287
* [Frederick Chong](https://www.linkedin.com/in/frederick-chong-5a00224) | Principal PM Manager, MCIGET SDV & Mobility
288288
* [Felipe Prezado](https://www.linkedin.com/in/filipe-prezado-9606bb14) | Principal Program Manager, MCIGET SDV & Mobility
289-
* [Ashita Rastogi](https://www.linkedin.com/in/ashitarastogi/) | Principal Program Manager, Azure Messaging
289+
* Ashita Rastogi | Lead Principal Program Manager, Azure Messaging
290290
* [Henning Rauch](https://www.linkedin.com/in/henning-rauch-adx) | Principal Program Manager, Azure Data Explorer (Kusto)
291291
* [Rajagopal Ravipati](https://www.linkedin.com/in/rajagopal-ravipati-79020a4/) | Partner Software Engineering Manager, Azure Messaging
292292
* [Larry Sullivan](https://www.linkedin.com/in/larry-sullivan-1972654/) | Partner Group Software Engineering Manager, Energy & CVP

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).

0 commit comments

Comments
 (0)