Skip to content

Commit 315cbf6

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into docUpdates
2 parents cf14669 + af74a17 commit 315cbf6

7 files changed

+49
-24
lines changed

articles/search/cognitive-search-common-errors-warnings.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,4 +209,20 @@ In the example LanguageDetectionSkill below, the `'text'` input field may trigge
209209
If you want to ensure that all text is analyzed, consider using the [Split skill](cognitive-search-skill-textsplit.md).
210210

211211
### Web API skill response contains warnings
212-
Indexer was able to run a skill in the skillset, but the response from the Web API request indicated there were warnings during execution. Review the warnings to understand how your data is impacted and whether or not action is required.
212+
Indexer was able to run a skill in the skillset, but the response from the Web API request indicated there were warnings during execution. Review the warnings to understand how your data is impacted and whether or not action is required.
213+
214+
### The current indexer configuration does not support incremental progress
215+
This warning only occurs for Cosmos DB data sources.
216+
217+
Incremental progress during indexing ensures that if indexer execution is interrupted by transient failures or execution time limit, the indexer can pick up where it left off next time it runs, instead of having to re-index the entire collection from scratch. This is especially important when indexing large collections.
218+
219+
The ability to resume an unfinished indexing job is predicated on having documents ordered by the `_ts` column. The indexer uses the timestamp to determine which document to pick up next. If the `_ts` column is missing or if the indexer can't determine if a custom query is ordered by it, the indexer starts at beginning and you'll see this warning.
220+
221+
It is possible to override this behavior, enabling incremental progress and suppressing this warning by using the `assumeOrderByHighWatermarkColumn` configuration property.
222+
223+
[More information about Cosmos DB incremental progress and custom queries.](https://go.microsoft.com/fwlink/?linkid=2099593)
224+
225+
### Could not map output field 'X' to search index
226+
Output field mappings that reference non-existent/null data will produce warnings for each document and result in an empty index field. To workaround this issue, double-check your output field mapping source paths for possible typos, or set a default value using the [Conditional skill](cognitive-search-skill-conditional.md#sample-skill-definition-2-set-a-default-value-for-a-value-that-doesnt-exist).
227+
228+
Indexer was able to run a skill in the skillset, but the response from the Web API request indicated there were warnings during execution. Review the warnings to understand how your data is impacted and whether or not action is required.

articles/storage/blobs/storage-blob-immutable-storage.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Immutable storage is available only for General Purpose v2 and Blob Storage Acco
104104

105105
The most recent releases of the [Azure portal](https://portal.azure.com), [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest), and [Azure PowerShell](https://github.com/Azure/azure-powershell/releases) support immutable storage for Azure Blob storage. [Client library support](#client-libraries) is also provided.
106106

107-
### Azure portal
107+
### [Portal](#tab/azure-portal)
108108

109109
1. Create a new container or select an existing container to store the blobs that need to be kept in the immutable state.
110110
The container must be in a GPv2 or blob storage account.
@@ -140,12 +140,12 @@ The most recent releases of the [Azure portal](https://portal.azure.com), [Azure
140140

141141
9. To clear a legal hold, simply remove the applied legal hold identifier tag.
142142

143-
### Azure CLI
143+
### [Azure CLI](#tab/azure-cli)
144144

145145
The feature is included in the following command groups:
146146
`az storage container immutability-policy` and `az storage container legal-hold`. Run `-h` on them to see the commands.
147147

148-
### PowerShell
148+
### [PowerShell](#tab/azure-powershell)
149149

150150
The Az.Storage module supports immutable storage. To enable the feature, follow these steps:
151151

@@ -155,6 +155,8 @@ The Az.Storage module supports immutable storage. To enable the feature, follow
155155

156156
The [Sample PowerShell code](#sample-powershell-code) section later in this article illustrates the feature usage.
157157

158+
---
159+
158160
## Client libraries
159161

160162
The following client libraries support immutable storage for Azure Blob storage:

articles/storage/blobs/storage-blob-static-website-how-to.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This article shows you how to enable static website hosting by using the Azure p
1717

1818
<a id="portal" />
1919

20-
## Use the Azure portal
20+
## [Portal](#tab/azure-portal)
2121

2222
For a step-by-step tutorial, see [Tutorial: Host a static website on Blob Storage](https://docs.microsoft.com/azure/storage/blobs/storage-blob-static-website-host).
2323

@@ -33,7 +33,7 @@ In the pane that appears beside the account overview page of your storage accoun
3333

3434
<a id="cli" />
3535

36-
## Use the Azure CLI
36+
## [Azure CLI](#tab/azure-cli)
3737

3838
You can enable static website hosting by using the [Azure Command-Line Interface (CLI)](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest).
3939

@@ -97,7 +97,7 @@ az storage account show -n <storage-account-name> -g <resource-group-name> --que
9797

9898
<a id="powershell" />
9999

100-
## Use PowerShell
100+
## [PowerShell](#tab/azure-powershell)
101101

102102
You can enable static website hosting by using the Azure PowerShell module.
103103

@@ -180,6 +180,8 @@ Write-Output $storageAccount.PrimaryEndpoints.Web
180180

181181
<a id="metrics" />
182182

183+
---
184+
183185
## Enable metrics on static website pages
184186

185187
Once you've enabled metrics, traffic statistics on files in the **$web** container are reported in the metrics dashboard.

articles/storage/common/storage-account-upgrade.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Upgrading to a General-purpose v2 storage account from your General-purpose v1 o
1919
> [!IMPORTANT]
2020
> Upgrading a General-purpose v1 or Blob storage account to General-purpose v2 is permanent and cannot be undone.
2121
22-
## Upgrade using the Azure portal
22+
# [Portal](#tab/azure-portal)
2323

2424
1. Sign in to the [Azure portal](https://portal.azure.com).
2525
2. Navigate to your storage account.
@@ -30,7 +30,7 @@ Upgrading to a General-purpose v2 storage account from your General-purpose v1 o
3030

3131
![Upgrade Account Kind](../blobs/media/storage-blob-account-upgrade/upgrade-to-gpv2-account.png)
3232

33-
## Upgrade with PowerShell
33+
# [PowerShell](#tab/azure-powershell)
3434

3535
[!INCLUDE [updated-for-az](../../../includes/updated-for-az.md)]
3636

@@ -41,8 +41,7 @@ Next, call the following command to upgrade the account, substituting the name o
4141
```powershell
4242
Set-AzStorageAccount -ResourceGroupName <resource-group> -AccountName <storage-account> -UpgradeToStorageV2
4343
```
44-
45-
## Upgrade with Azure CLI
44+
# [Azure CLI](#tab/azure-cli)
4645

4746
To upgrade a General-purpose v1 account to a General-purpose v2 account using Azure CLI, first install the latest version of Azure CLI. See [Install the Azure CLI 2.0](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) for information about installing the CLI.
4847

@@ -52,6 +51,8 @@ Next, call the following command to upgrade the account, substituting the name o
5251
az storage account update -g <resource-group> -n <storage-account> --set kind=StorageV2
5352
```
5453

54+
---
55+
5556
## Specify an access tier for blob data
5657

5758
General-purpose v2 accounts support all Azure storage services and data objects, but access tiers are available only for block blobs in Blob storage. When you upgrade to a General-purpose v2 storage account, you can specify an access tier for your blob data.

articles/storage/common/storage-advanced-threat-protection.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Advanced threat protection for Azure Storage ingests diagnostic logs of read, wr
2626

2727
Advanced threat protection is enabled for your storage account by default. You can configure advanced threat protection in any of several ways, described in the following sections.
2828

29-
### Use the Azure portal
29+
### [Portal](#tab/azure-portal)
3030

3131
1. Launch the [Azure portal](https://portal.azure.com/).
3232
1. Navigate to your Azure Storage account. Under **Settings**, select **Advanced security**.
@@ -36,7 +36,7 @@ Advanced threat protection is enabled for your storage account by default. You c
3636

3737
![Turn on Azure Storage advanced threat protection](./media/storage-advanced-threat-protection/storage-advanced-threat-protection-turn-on.png)
3838

39-
### Using Azure Security Center
39+
### [Azure Security Center](#tab/azure-security-center)
4040

4141
When you subscribe to the Standard tier in Azure Security Center, advanced threat protection is automatically set up on all of your storage accounts. You can enable or disable advanced threat protection for your storage accounts under a specific subscription as follows:
4242

@@ -52,12 +52,12 @@ When you subscribe to the Standard tier in Azure Security Center, advanced threa
5252
![Enable ATP in Security Center](./media/storage-advanced-threat-protection/storage-advanced-threat-protection-pricing2.png)
5353
1. Click **Save**.
5454

55-
### Using Azure Resource Manager templates
55+
### [Template](#tab/template)
5656

5757
Use an Azure Resource Manager template to deploy an Azure Storage account with advanced threat protection enabled. For more information, see
5858
[Storage account with advanced threat protection](https://azure.microsoft.com/resources/templates/201-storage-advanced-threat-protection-create/).
5959

60-
### Using an Azure Policy
60+
### [Azure Policy](#tab/azure-policy)
6161

6262
Use an Azure Policy to enable advanced threat protection across storage accounts under a specific subscription or resource group.
6363

@@ -75,21 +75,23 @@ Use an Azure Policy to enable advanced threat protection across storage accounts
7575

7676
![Policy Definitions Page](./media/storage-advanced-threat-protection/storage-atp-policy1.png)
7777

78-
### Using the REST API
78+
### [REST API](#tab/rest-api)
7979

8080
Use Rest API commands to create, update, or get the advanced threat protection setting for a specific storage account.
8181

8282
* [Advanced threat protection - Create](https://docs.microsoft.com/rest/api/securitycenter/advancedthreatprotection/create)
8383
* [Advanced threat protection - Get](https://docs.microsoft.com/rest/api/securitycenter/advancedthreatprotection/get)
8484

85-
### Using Azure PowerShell
85+
### [PowerShell](#tab/azure-powershell)
8686

8787
Use the following PowerShell cmdlets:
8888

8989
* [Enable advanced threat protection](https://docs.microsoft.com/powershell/module/az.security/enable-azsecurityadvancedthreatprotection)
9090
* [Get advanced threat protection](https://docs.microsoft.com/powershell/module/az.security/get-azsecurityadvancedthreatprotection)
9191
* [Disable advanced threat protection](https://docs.microsoft.com/powershell/module/az.security/disable-azsecurityadvancedthreatprotection)
9292

93+
---
94+
9395
## Explore security anomalies
9496

9597
When storage activity anomalies occur, you receive an email notification with information about the suspicious security event. Details of the event include:

articles/storage/common/storage-initiate-account-failover.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ After the failover, your storage account type is automatically converted to loca
4040

4141
After you re-enable GRS for your storage account, Microsoft begins replicating the data in your account to the new secondary region. Replication time is dependent on the amount of data being replicated.
4242

43-
## Azure portal
43+
## [Portal](#tab/azure-portal)
4444

4545
To initiate an account failover from the Azure portal, follow these steps:
4646

@@ -56,7 +56,7 @@ To initiate an account failover from the Azure portal, follow these steps:
5656

5757
![Screenshot showing confirmation dialog for an account failover](media/storage-initiate-account-failover/portal-failover-confirm.png)
5858

59-
## PowerShell
59+
## [PowerShell](#tab/azure-powershell)
6060

6161
To use PowerShell to initiate an account failover, you must first install the 6.0.1 preview module. Follow these steps to install the module:
6262

@@ -93,7 +93,7 @@ To initiate an account failover from PowerShell, execute the following command:
9393
Invoke-AzStorageAccountFailover -ResourceGroupName <resource-group-name> -Name <account-name>
9494
```
9595

96-
## Azure CLI
96+
## [Azure CLI](#tab/azure-cli)
9797

9898
To use Azure CLI to initiate an account failover, execute the following commands:
9999

@@ -102,6 +102,8 @@ az storage account show \ --name accountName \ --expand geoReplicationStats
102102
az storage account failover \ --name accountName
103103
```
104104

105+
---
106+
105107
## Next steps
106108

107109
- [Disaster recovery and account failover (preview) in Azure Storage](storage-disaster-recovery-guidance.md)

includes/data-factory-v2-connector-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ ms.author: jingwang
88

99
| Category | Data store | [Copy activity](../articles/data-factory/copy-activity-overview.md) (source/sink) | [Mapping Data Flow](../articles/data-factory/concepts-data-flow-overview.md) | [Lookup Activity](../articles/data-factory/control-flow-lookup-activity.md) | [Get Metadata Activity](../articles/data-factory/control-flow-get-metadata-activity.md) | [Delete Activity](../articles/data-factory/delete-activity.md) |
1010
| :-------------------- | :----------------------------------------------------------- | :----------------------------------------------------------- | :----------------------------------------------------------- | :----------------------------------------------------------- | ------------------------------------------------------------ | :----------------------------------------------------------- |
11-
| **Azure** | [Azure Blob Storage](../articles/data-factory/connector-azure-blob-storage.md) | ✓/✓ | ✓ <br> <small>Supported Formats: Delimited Text, Parquet, JSON</small> ||||
12-
| &nbsp; | [Azure Cosmos DB (SQL API)](../articles/data-factory/connector-azure-cosmos-db.md) | ✓/✓ | || | |
11+
| **Azure** | [Azure Blob Storage](../articles/data-factory/connector-azure-blob-storage.md) | ✓/✓ |/✓ <br> <small>Supported Formats: Delimited Text, Parquet, JSON, Avro</small> ||||
12+
| &nbsp; | [Azure Cosmos DB (SQL API)](../articles/data-factory/connector-azure-cosmos-db.md) | ✓/✓ | ✓/✓ || | |
1313
| &nbsp; | [Azure Cosmos DB's API for MongoDB](../articles/data-factory/connector-azure-cosmos-db-mongodb-api.md) | ✓/✓ | | | | |
1414
| &nbsp; | [Azure Data Explorer](../articles/data-factory/connector-azure-data-explorer.md) | ✓/✓ | || | |
15-
| &nbsp; | [Azure Data Lake Storage Gen1](../articles/data-factory/connector-azure-data-lake-store.md) | ✓/✓ | ✓ <br> <small>Supported Formats: Delimited Text, Parquet, JSON</small> ||||
16-
| &nbsp; | [Azure Data Lake Storage Gen2](../articles/data-factory/connector-azure-data-lake-storage.md) | ✓/✓ | ✓ <br> <small>Supported Formats: Delimited Text, Parquet, JSON</small> ||||
15+
| &nbsp; | [Azure Data Lake Storage Gen1](../articles/data-factory/connector-azure-data-lake-store.md) | ✓/✓ |/✓ <br> <small>Supported Formats: Delimited Text, Parquet, JSON, Avro</small> ||||
16+
| &nbsp; | [Azure Data Lake Storage Gen2](../articles/data-factory/connector-azure-data-lake-storage.md) | ✓/✓ |/✓ <br> <small>Supported Formats: Delimited Text, Parquet, JSON, Avro</small> ||||
1717
| &nbsp; | [Azure Database for MariaDB](../articles/data-factory/connector-azure-database-for-mariadb.md) | ✓/− | || | |
1818
| &nbsp; | [Azure Database for MySQL](../articles/data-factory/connector-azure-database-for-mysql.md) | ✓/✓ | || | |
1919
| &nbsp; | [Azure Database for PostgreSQL](../articles/data-factory/connector-azure-database-for-postgresql.md) | ✓/✓ | || | |

0 commit comments

Comments
 (0)