Skip to content

Commit 06fdb2a

Browse files
authored
Merge pull request #215583 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 10/24
2 parents ed65f16 + 9a2189d commit 06fdb2a

30 files changed

+81
-111
lines changed

articles/active-directory-b2c/threat-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The smart lockout feature uses many factors to determine when an account should
5555
- Passwords such as 12456! and 1234567! (or newAccount1234 and newaccount1234) are so similar that the algorithm interprets them as human error and counts them as a single try.
5656
- Larger variations in pattern, such as 12456! and ABCD2!, are counted as separate tries.
5757

58-
When testing the smart lockout feature, use a distinctive pattern for each password you enter. Consider using password generation web apps, such as `https://password-generator.net/`.
58+
When testing the smart lockout feature, use a distinctive pattern for each password you enter. Consider using password generation web apps, such as `https://password-gen.com/`.
5959

6060
When the smart lockout threshold is reached, you'll see the following message while the account is locked: **Your account is temporarily locked to prevent unauthorized use. Try again later**. The error messages can be [localized](localization-string-ids.md#sign-up-or-sign-in-error-messages).
6161

articles/aks/operator-best-practices-run-at-scale.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ To scale AKS clusters beyond 1000 nodes, you need to request a node limit quota
2020
To increase the node limit beyond 1000, you must have the following pre-requisites:
2121
- An existing AKS cluster that needs the node limit increase. This cluster shouldn't be deleted as that will remove the limit increase.
2222
- Uptime SLA enabled on your cluster.
23+
- Clusters should use Kubernetes version 1.23 or above
2324

2425
> [!NOTE]
2526
> It may take up to a week to enable your clusters with the larger node limit.

articles/azure-monitor/alerts/alerts-create-new-alert-rule.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ You can create a new alert rule using the [Azure CLI](/cli/azure/get-started-wit
282282
### [Log alert](#tab/log)
283283
284284
To create a log alert rule that monitors count of system event errors:
285+
285286
```azurecli
286287
az monitor scheduled-query create -g {ResourceGroup} -n {nameofthealert} --scopes {vm_id} --condition "count \'union Event, Syslog | where TimeGenerated > a(1h) | where EventLevelName == \"Error\" or SeverityLevel== \"err\"\' > 2" --description {descriptionofthealert}
287288
```
@@ -299,10 +300,10 @@ You can create a new alert rule using the [Azure CLI](/cli/azure/get-started-wit
299300
- [az monitor activity-log alert action-group](/cli/azure/monitor/activity-log/alert/action-group): Add an action group to the activity log alert rule.
300301
301302
---
302-
303303
## Create a new alert rule using PowerShell
304304
305305
- To create a metric alert rule using PowerShell, use this cmdlet: [Add-AzMetricAlertRuleV2](/powershell/module/az.monitor/add-azmetricalertrulev2)
306+
- To create a log alert rule using PowerShell, use this cmdlet: [New-AzScheduledQueryRule](/powershell/module/az.monitor/new-azscheduledqueryrule)
306307
- To create an activity log alert rule using PowerShell, use this cmdlet: [Set-AzActivityLogAlert](/powershell/module/az.monitor/set-azactivitylogalert)
307308
308309
## Create an activity log alert rule from the Activity log pane
@@ -450,7 +451,7 @@ The *sampleActivityLogAlert.parameters.json* file contains the values provided f
450451

451452
## Changes to log alert rule creation experience
452453

453-
If you're creating a new log alert rule, please note that current alert rule wizard is a little different from the earlier experience:
454+
If you're creating a new log alert rule, note that current alert rule wizard is a little different from the earlier experience:
454455

455456
- Previously, search results were included in the payload of the triggered alert and its associated notifications. The email included only 10 rows from the unfiltered results while the webhook payload contained 1000 unfiltered results. To get detailed context information about the alert so that you can decide on the appropriate action:
456457
- We recommend using [Dimensions](alerts-types.md#narrow-the-target-using-dimensions). Dimensions provide the column value that fired the alert, giving you context for why the alert fired and how to fix the issue.

articles/azure-monitor/alerts/alerts-manage-alert-rules.md

Lines changed: 27 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -49,45 +49,20 @@ To enable recommended alert rules:
4949

5050
## Manage metric alert rules with the Azure CLI
5151

52-
This section describes how to do manage metric alert rules using the cross-platform [Azure CLI](/cli/azure/get-started-with-azure-cli). The following examples use [Azure Cloud Shell](../../cloud-shell/overview.md).
52+
This section describes how to manage metric alert rules using the cross-platform [Azure CLI](/cli/azure/get-started-with-azure-cli). The following examples use [Azure Cloud Shell](../../cloud-shell/overview.md).
5353

5454
1. In the [portal](https://portal.azure.com/), select **Cloud Shell**.
55-
56-
You can use commands with ``--help`` option to learn more about the command and how to use it. For example, the following command shows you the list of commands available for creating, viewing, and managing metric alerts.
57-
58-
```azurecli
59-
az monitor metrics alert --help
60-
```
61-
62-
### View all the metric alerts in a resource group
63-
64-
```azurecli
65-
az monitor metrics alert list -g {ResourceGroup}
66-
```
67-
68-
### See the details of a particular metric alert rule
69-
70-
Use the name or the resource ID of the rule in the following commands:
71-
72-
```azurecli
73-
az monitor metrics alert show -g {ResourceGroup} -n {AlertRuleName}
74-
```
75-
76-
```azurecli
77-
az monitor metrics alert show --ids {RuleResourceId}
78-
```
79-
80-
### Disable a metric alert rule
81-
82-
```azurecli
83-
az monitor metrics alert update -g {ResourceGroup} -n {AlertRuleName} --enabled false
84-
```
85-
86-
### Delete a metric alert rule
87-
88-
```azurecli
89-
az monitor metrics alert delete -g {ResourceGroup} -n {AlertRuleName}
90-
```
55+
1. Use these options of the `az monitor metrics alert` CLI command in this table:
56+
57+
58+
|What you want to do|CLI command |
59+
|---------|---------|
60+
|View all the metric alerts in a resource group|`az monitor metrics alert list -g {ResourceGroup}`|
61+
|See the details of a metric alert rule|`az monitor metrics alert show -g {ResourceGroup} -n {AlertRuleName}`|
62+
| |`az monitor metrics alert show --ids {RuleResourceId}`|
63+
|Disable a metric alert rule|`az monitor metrics alert update -g {ResourceGroup} -n {AlertRuleName} --enabled false`|
64+
|Delete a metric alert rule|`az monitor metrics alert delete -g {ResourceGroup} -n {AlertRuleName}`|
65+
|Learn more about the command|`az monitor metrics alert --help`|
9166

9267
## Manage metric alert rules with PowerShell
9368

@@ -115,41 +90,17 @@ This section describes how to manage log alerts using the cross-platform [Azure
11590
11691

11792
1. In the [portal](https://portal.azure.com/), select **Cloud Shell**.
118-
119-
You can use commands with ``--help`` option to learn more about the command and how to use it. For example, the following command shows you the list of commands available for creating, viewing, and managing log alerts.
120-
121-
```azurecli
122-
az monitor scheduled-query --help
123-
```
124-
125-
### View all the log alert rules in a resource group
126-
127-
```azurecli
128-
az monitor scheduled-query list -g {ResourceGroup}
129-
```
130-
131-
### See the details of a log alert rule
132-
133-
Use the name or the resource ID of the rule in the following command:
134-
135-
```azurecli
136-
az monitor scheduled-query show -g {ResourceGroup} -n {AlertRuleName}
137-
```
138-
```azurecli
139-
az monitor scheduled-query show --ids {RuleResourceId}
140-
```
141-
142-
### Disable a log alert rule
143-
144-
```azurecli
145-
az monitor scheduled-query update -g {ResourceGroup} -n {AlertRuleName} --disabled true
146-
```
147-
148-
### Delete a log alert rule
149-
150-
```azurecli
151-
az monitor scheduled-query delete -g {ResourceGroup} -n {AlertRuleName}
152-
```
93+
1. Use these options of the `az monitor scheduled-query alert` CLI command in this table:
94+
95+
96+
|What you want to do|CLI command |
97+
|---------|---------|
98+
|View all the log alert rules in a resource group|`az monitor scheduled-query list -g {ResourceGroup}`|
99+
|See the details of a log alert rule|`az monitor scheduled-query show -g {ResourceGroup} -n {AlertRuleName}`|
100+
| |`az monitor scheduled-query show --ids {RuleResourceId}`|
101+
|Disable a log alert rule|`az monitor scheduled-query update -g {ResourceGroup} -n {AlertRuleName} --disabled true`|
102+
|Delete a log alert rule|`az monitor scheduled-query delete -g {ResourceGroup} -n {AlertRuleName}`|
103+
|Learn more about the command|`az monitor scheduled-query --help`|
153104

154105
### Manage log alert rules using the Azure Resource Manager CLI with [templates](./alerts-log-create-templates.md)
155106

@@ -164,6 +115,10 @@ az deployment group create \
164115

165116
A 201 response is returned on successful creation. 200 is returned on successful updates.
166117

118+
## Manage log alert rules with PowerShell
119+
120+
Log alert rules have this dedicated PowerShell cmdlet:
121+
- [New-AzScheduledQueryRule](/powershell/module/az.monitor/new-azscheduledqueryrule): Creates a new log alert rule or updates an existing log alert rule.
167122
## Manage activity log alert rules using PowerShell
168123

169124
Activity log alerts have these dedicated PowerShell cmdlets:

articles/data-factory/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ items:
11801180
- name: Azure files
11811181
href: connector-troubleshoot-azure-files.md
11821182
displayName: troubleshooting
1183-
- name: Azure Synapse Analytics, Azure SQL Database, and SQL Server
1183+
- name: Azure Synapse Analytics, Azure SQL Database, SQL Server, Azure SQL Managed Instance, and Amazon RDS for SQL Server
11841184
href: connector-troubleshoot-synapse-sql.md
11851185
displayName: troubleshooting
11861186
- name: Azure Table Storage

articles/data-factory/azure-ssis-integration-runtime-express-virtual-network-injection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ For more information, see the [DNS server name resolution](../virtual-network/vi
7474

7575
At present, for Azure-SSIS IR to use your own DNS server, you need to configure it with a standard custom setup following these steps:
7676

77-
1. Download a custom setup script ([main.cmd](https://expressvnet.blob.core.windows.net/customsetup/main.cmd)) + its associated file ([setupdnsserver.ps1](https://expressvnet.blob.core.windows.net/customsetup/setupdnsserver.ps1)).
77+
1. Download a custom setup script ([main.cmd](https://expressvnet.blob.core.windows.net/customsetup/main.cmd?sp=r&st=2022-10-24T07:34:04Z&se=2042-10-24T15:34:04Z&spr=https&sv=2021-06-08&sr=b&sig=dfU16IBua6T%2FB2splQS6rZIXmgkSABaFUZd6%2BWF7fnc%3D)) + its associated file ([setupdnsserver.ps1](https://expressvnet.blob.core.windows.net/customsetup/setupdnsserver.ps1?sp=r&st=2022-10-24T07:36:00Z&se=2042-10-24T15:36:00Z&spr=https&sv=2021-06-08&sr=b&sig=TbspnXbFQv3NPnsRkNe7Q84EdLQT2f1KL%2FxqczFtaw0%3D)).
7878

7979
1. Replace “your-dns-server-ip” in main.cmd with the IP address of your own DNS server.
8080

articles/data-factory/connector-office-365.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ This Microsoft 365 (Office 365) connector is supported for the following capabil
2828
|---------| --------|
2929
|[Copy activity](copy-activity-overview.md) (source/-)|① ②|
3030
|[Mapping data flow](concepts-data-flow-overview.md) (source/-)|①|
31+
|[Lookup activity](control-flow-lookup-activity.md) (source/-)|① ②|
3132

3233
<small>*&#9312; Azure integration runtime &#9313; Self-hosted integration runtime*</small>
3334

@@ -176,6 +177,7 @@ If you were setting `dateFilterColumn`, `startTime`, `endTime`, and `userScopeFi
176177

177178
For a full list of sections and properties available for defining activities, see the [Pipelines](concepts-pipelines-activities.md) article. This section provides a list of properties supported by Microsoft 365 (Office 365) source.
178179

180+
179181
### Microsoft 365 (Office 365) as source
180182

181183
To copy data from Microsoft 365 (Office 365), the following properties are supported in the copy activity **source** section:
@@ -360,5 +362,9 @@ To create a mapping data flow using the Microsoft 365 connector as a source, com
360362

361363
6. On the tab **Data preview** click on the **Refresh** button to fetch a sample dataset for validation.
362364

365+
## Lookup activity properties
366+
367+
To learn details about the properties, check [Lookup activity](control-flow-lookup-activity.md).
368+
363369
## Next steps
364370
For a list of data stores supported as sources and sinks by the copy activity, see [supported data stores](copy-activity-overview.md#supported-data-stores-and-formats).

articles/data-factory/connector-troubleshoot-synapse-sql.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Troubleshoot the Azure Synapse Analytics, Azure SQL Database, and SQL Server connectors
2+
title: Troubleshoot the Azure Synapse Analytics, Azure SQL Database, SQL Server, Azure SQL Managed Instance, and Amazon RDS for SQL Server connectors
33
titleSuffix: Azure Data Factory & Azure Synapse
4-
description: Learn how to troubleshoot issues with the Azure Synapse Analytics, Azure SQL Database, and SQL Server connectors in Azure Data Factory and Azure Synapse Analytics.
4+
description: Learn how to troubleshoot issues with the Azure Synapse Analytics, Azure SQL Database, SQL Server connectors, Azure SQL Managed Instance, and Amazon RDS for SQL Server in Azure Data Factory and Azure Synapse Analytics.
55
author: jianleishen
66
ms.author: jianleishen
77
ms.reviewer: joanpo, wiassaf
8-
ms.date: 09/20/2022
8+
ms.date: 10/18/2022
99
ms.service: data-factory
1010
ms.subservice: data-movement
1111
ms.topic: troubleshooting
@@ -14,11 +14,11 @@ ms.custom:
1414
- synapse
1515
---
1616

17-
# Troubleshoot the Azure Synapse Analytics, Azure SQL Database, and SQL Server connectors in Azure Data Factory and Azure Synapse
17+
# Troubleshoot the Azure Synapse Analytics, Azure SQL Database, SQL Server, Azure SQL Managed Instance, and Amazon RDS for SQL Server connectors in Azure Data Factory and Azure Synapse
1818

1919
[!INCLUDE[appliesto-adf-asa-md](includes/appliesto-adf-asa-md.md)]
2020

21-
This article provides suggestions to troubleshoot common problems with the Azure Synapse Analytics, Azure SQL Database, and SQL Server connectors in Azure Data Factory and Azure Synapse.
21+
This article provides suggestions to troubleshoot common problems with the Azure Synapse Analytics, Azure SQL Database, SQL Server, Azure SQL Managed Instance, and Amazon RDS for SQL Server connectors in Azure Data Factory and Azure Synapse.
2222

2323
## Error code: SqlFailedToConnect
2424

@@ -33,7 +33,8 @@ This article provides suggestions to troubleshoot common problems with the Azure
3333
| If the error message contains the string "SqlException", SQL Database the error indicates that some specific operation failed. | For more information, search by SQL error code in [Database engine errors](/sql/relational-databases/errors-events/database-engine-events-and-errors). For further help, contact Azure SQL support. |
3434
| If this is a transient issue (for example, an instable network connection), add retry in the activity policy to mitigate. | For more information, see [Pipelines and activities](./concepts-pipelines-activities.md#activity-policy). |
3535
| If the error message contains the string "Client with IP address '...' is not allowed to access the server", and you're trying to connect to Azure SQL Database, the error is usually caused by an Azure SQL Database firewall issue. | In the Azure SQL Server firewall configuration, enable the **Allow Azure services and resources to access this server** option. For more information, see [Azure SQL Database and Azure Synapse IP firewall rules](/azure/azure-sql/database/firewall-configure). |
36-
36+
|If the error message contains `Login failed for user '<token-identified principal>'`, this error is usually caused by not granting enough permission to your service principal or system-assigned managed identity or user-assigned managed identity (depends on which authentication type you choose) in your database. |Grant enough permission to your service principal or system-assigned managed identity or user-assigned managed identity in your database. <br/><br/> **For Azure SQL Database**:<br/>&nbsp;&nbsp;&nbsp;&nbsp;- If you use service principal authentication, follow [Service principal authentication](connector-azure-sql-database.md#service-principal-authentication).<br/>&nbsp;&nbsp;&nbsp;&nbsp;- If you use system-assigned managed identity authentication, follow [System-assigned managed identity authentication](connector-azure-sql-database.md#managed-identity).<br/>&nbsp;&nbsp;&nbsp;&nbsp;- If you use user-assigned managed identity authentication, follow [User-assigned managed identity authentication](connector-azure-sql-database.md#user-assigned-managed-identity-authentication). <br/>&nbsp;&nbsp;&nbsp;<br/>**For Azure Synapse Analytics**:<br/>&nbsp;&nbsp;&nbsp;&nbsp;- If you use service principal authentication, follow [Service principal authentication](connector-azure-sql-data-warehouse.md#service-principal-authentication).<br/>&nbsp;&nbsp;&nbsp;&nbsp;- If you use system-assigned managed identity authentication, follow [System-assigned managed identities for Azure resources authentication](connector-azure-sql-data-warehouse.md#managed-identity).<br/>&nbsp;&nbsp;&nbsp;&nbsp;- If you use user-assigned managed identity authentication, follow [User-assigned managed identity authentication](connector-azure-sql-data-warehouse.md#user-assigned-managed-identity-authentication).<br/>&nbsp;&nbsp;&nbsp;<br/>**For Azure SQL Managed Instance**: <br/>&nbsp;&nbsp;&nbsp;&nbsp;- If you use service principal authentication, follow [Service principal authentication](connector-azure-sql-managed-instance.md#service-principal-authentication).<br/>&nbsp;&nbsp;&nbsp;- If you use system-assigned managed identity authentication, follow [System-assigned managed identity authentication](connector-azure-sql-managed-instance.md#managed-identity).<br/>&nbsp;&nbsp;&nbsp;- If you use user-assigned managed identity authentication, follow [User-assigned managed identity authentication](connector-azure-sql-managed-instance.md#user-assigned-managed-identity-authentication).|
37+
3738
## Error code: SqlOperationFailed
3839

3940
- **Message**: `A database operation failed. Please search error to get more details.`

0 commit comments

Comments
 (0)