Skip to content

Commit 6ac872d

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-docsfresh01
2 parents bea4a1f + 423e431 commit 6ac872d

File tree

62 files changed

+376
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+376
-311
lines changed

.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17054,6 +17054,31 @@
1705417054
"redirect_url": "/azure/sql-data-warehouse/maintenance-scheduling#change-a-maintenance-schedule",
1705517055
"redirect_document_id": false
1705617056
},
17057+
{
17058+
"source_path": "articles/sql-data-warehouse/backup-and-restore.md",
17059+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/backup-and-restore",
17060+
"redirect_document_id": true
17061+
},
17062+
{
17063+
"source_path": "articles/sql-data-warehouse/cheat-sheet.md",
17064+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/cheat-sheet",
17065+
"redirect_document_id": true
17066+
},
17067+
{
17068+
"source_path": "articles/sql-data-warehouse/column-level-security.md",
17069+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/column-level-security",
17070+
"redirect_document_id": true
17071+
},
17072+
{
17073+
"source_path": "articles/sql-data-warehouse/create-data-warehouse-portal.md",
17074+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/create-data-warehouse-portal",
17075+
"redirect_document_id": true
17076+
},
17077+
{
17078+
"source_path": "articles/sql-data-warehouse/create-data-warehouse-powershell.md",
17079+
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/create-data-warehouse-powershell",
17080+
"redirect_document_id": true
17081+
},
1705717082
{
1705817083
"source_path": "articles/sql-data-warehouse/viewing-maintenance-schedule.md",
1705917084
"redirect_url": "/azure/sql-data-warehouse/maintenance-scheduling#view-a-maintenance-schedule",

articles/azure-databricks/databricks-extract-load-sql-data-warehouse.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If you don’t have an Azure subscription, create a [free account](https://azure
4141

4242
Complete these tasks before you begin this tutorial:
4343

44-
* Create an Azure SQL data warehouse, create a server-level firewall rule, and connect to the server as a server admin. See [Quickstart: Create and query an Azure SQL data warehouse in the Azure portal](../sql-data-warehouse/create-data-warehouse-portal.md).
44+
* Create an Azure SQL data warehouse, create a server-level firewall rule, and connect to the server as a server admin. See [Quickstart: Create and query an Azure SQL data warehouse in the Azure portal](../synapse-analytics/sql-data-warehouse/create-data-warehouse-portal.md).
4545

4646
* Create a master key for the Azure SQL data warehouse. See [Create a database master key](https://docs.microsoft.com/sql/relational-databases/security/encryption/create-a-database-master-key).
4747

articles/azure-monitor/app/asp-net-core.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The [Application Insights SDK for ASP.NET Core](https://nuget.org/packages/Micro
5858

5959
```xml
6060
<ItemGroup>
61-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.12.0" />
61+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.13.1" />
6262
</ItemGroup>
6363
```
6464

@@ -197,6 +197,12 @@ Full List of settings in `ApplicationInsightsServiceOptions`
197197

198198
|Setting | Description | Default
199199
|---------------|-------|-------
200+
|EnablePerformanceCounterCollectionModule | Enable/Disable `PerformanceCounterCollectionModule` | true
201+
|EnableRequestTrackingTelemetryModule | Enable/Disable `RequestTrackingTelemetryModule` | true
202+
|EnableEventCounterCollectionModule | Enable/Disable `EventCounterCollectionModule` | true
203+
|EnableDependencyTrackingTelemetryModule | Enable/Disable `DependencyTrackingTelemetryModule` | true
204+
|EnableAppServicesHeartbeatTelemetryModule | Enable/Disable `AppServicesHeartbeatTelemetryModule` | true
205+
|EnableAzureInstanceMetadataTelemetryModule | Enable/Disable `AzureInstanceMetadataTelemetryModule` | true
200206
|EnableQuickPulseMetricStream | Enable/Disable LiveMetrics feature | true
201207
|EnableAdaptiveSampling | Enable/Disable Adaptive Sampling | true
202208
|EnableHeartbeat | Enable/Disable Heartbeats feature, which periodically (15-min default) sends a custom metric named 'HeartBeatState' with information about the runtime like .NET Version, Azure Environment information, if applicable, etc. | true
@@ -313,6 +319,9 @@ public void ConfigureServices(IServiceCollection services)
313319
}
314320
```
315321

322+
Starting with 2.12.2 version, [`ApplicationInsightsServiceOptions`](#using-applicationinsightsserviceoptions) contains easy
323+
option to disable any of the default modules.
324+
316325
### Configuring a telemetry channel
317326

318327
The default channel is `ServerTelemetryChannel`. You can override it as the following example shows.

articles/azure-monitor/app/ilogger.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ To learn more, see [Logging in ASP.NET Core](https://docs.microsoft.com/aspnet/c
1414

1515
## ASP.NET Core applications
1616

17-
ApplicationInsightsLoggerProvider is enabled by default in [Microsoft.ApplicationInsights.AspNet SDK](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) version 2.7.1 (and later) when you turn on regular Application Insights monitoring through either of the standard methods:
17+
ApplicationInsightsLoggerProvider is enabled by default in [Microsoft.ApplicationInsights.AspNet SDK](https://www.nuget.org/packages/Microsoft.ApplicationInsights.AspNetCore) version 2.7.1 (and later) when you turn on regular Application Insights monitoring through either of the methods:
1818

19-
- By calling the **UseApplicationInsights** extension method on IWebHostBuilder
19+
- By calling the **UseApplicationInsights** extension method on IWebHostBuilder (Now obsolete)
2020
- By calling the **AddApplicationInsightsTelemetry** extension method on IServiceCollection
2121

2222
ILogger logs that ApplicationInsightsLoggerProvider captures are subject to the same configuration as any other telemetry that's collected. They have the same set of TelemetryInitializers and TelemetryProcessors, use the same TelemetryChannel, and are correlated and sampled in the same way as other telemetry. If you use version 2.7.1 or later, no action is required to capture ILogger logs.

articles/azure-monitor/app/worker-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ A valid Application Insights instrumentation key. This key is required to send a
2727

2828
```xml
2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.12.0" />
30+
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.13.1" />
3131
</ItemGroup>
3232
```
3333

articles/cosmos-db/concepts-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ You can [provision and manage your Azure Cosmos account](how-to-manage-database-
6565
> [!NOTE]
6666
> Regional failovers only apply to single region writes accounts. Multi-region write accounts do not require or have any limits on changing the write region.
6767
68-
Cosmos DB automatically takes backups of your data at regular intervals. For details on backup retention intervals and windows, see [Online backup and on-demand data restore in Azure Cosmos DB](online-backup-and-restore.md).
68+
Cosmos DB automatically takes backups of your data at regular intervals. For details on backup retention intervals and windows, see [Online backup and on-demand data restore in Azure Cosmos DB](../synapse-analytics/sql-data-warehouse/backup-and-restore.md).
6969

7070
## Per-account limits
7171

articles/cosmos-db/database-security.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ Let's dig into each one in detail.
6161
|Global replication|Azure Cosmos DB offers turnkey global distribution, which enables you to replicate your data to any one of Azure's world-wide datacenters with the click of a button. Global replication lets you scale globally and provide low-latency access to your data around the world.<br><br>In the context of security, global replication ensures data protection against regional failures.<br><br>Learn more in [Distribute data globally](distribute-data-globally.md).|
6262
|Regional failovers|If you have replicated your data in more than one data center, Azure Cosmos DB automatically rolls over your operations should a regional data center go offline. You can create a prioritized list of failover regions using the regions in which your data is replicated. <br><br>Learn more in [Regional Failovers in Azure Cosmos DB](high-availability.md).|
6363
|Local replication|Even within a single data center, Azure Cosmos DB automatically replicates data for high availability giving you the choice of [consistency levels](consistency-levels.md). This replication guarantees a 99.99% [availability SLA](https://azure.microsoft.com/support/legal/sla/cosmos-db) for all single region accounts and all multi-region accounts with relaxed consistency, and 99.999% read availability on all multi-region database accounts.|
64-
|Automated online backups|Azure Cosmos databases are backed up regularly and stored in a geo redundant store. <br><br>Learn more in [Automatic online backup and restore with Azure Cosmos DB](online-backup-and-restore.md).|
65-
|Restore deleted data|The automated online backups can be used to recover data you may have accidentally deleted up to ~30 days after the event. <br><br>Learn more in [Automatic online backup and restore with Azure Cosmos DB](online-backup-and-restore.md)|
64+
|Automated online backups|Azure Cosmos databases are backed up regularly and stored in a geo redundant store. <br><br>Learn more in [Automatic online backup and restore with Azure Cosmos DB](../synapse-analytics/sql-data-warehouse/backup-and-restore.md).|
65+
|Restore deleted data|The automated online backups can be used to recover data you may have accidentally deleted up to ~30 days after the event. <br><br>Learn more in [Automatic online backup and restore with Azure Cosmos DB](../synapse-analytics/sql-data-warehouse/backup-and-restore.md)|
6666
|Protect and isolate sensitive data|All data in the regions listed in What's new? is now encrypted at rest.<br><br>Personal data and other confidential data can be isolated to specific container and read-write, or read-only access can be limited to specific users.|
6767
|Monitor for attacks|By using [audit logging and activity logs](logging.md), you can monitor your account for normal and abnormal activity. You can view what operations were performed on your resources, who initiated the operation, when the operation occurred, the status of the operation, and much more as shown in the screenshot following this table.|
6868
|Respond to attacks|Once you have contacted Azure support to report a potential attack, a 5-step incident response process is kicked off. The goal of the 5-step process is to restore normal service security and operations as quickly as possible after an issue is detected and an investigation is started.<br><br>Learn more in [Microsoft Azure Security Response in the Cloud](https://aka.ms/securityresponsepaper).|

articles/cosmos-db/etcd-api-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ As the Kubernetes cluster grows, the etcd API account in Azure Cosmos DB elastic
4646

4747
### Security & enterprise readiness
4848

49-
When etcd data is stored in Azure Cosmos DB, Kubernetes developers automatically get the [built-in encryption at rest](database-encryption-at-rest.md), [certifications and compliance](compliance.md), and [backup and restore capabilities](online-backup-and-restore.md) supported by Azure Cosmos DB.
49+
When etcd data is stored in Azure Cosmos DB, Kubernetes developers automatically get the [built-in encryption at rest](database-encryption-at-rest.md), [certifications and compliance](compliance.md), and [backup and restore capabilities](../synapse-analytics/sql-data-warehouse/backup-and-restore.md) supported by Azure Cosmos DB.
5050

5151
## Next steps
5252

articles/cosmos-db/faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ You can add as many regions as you want for the account and control where it can
398398

399399
### Is the Table API enabled for backups?
400400

401-
Yes, the Table API leverages the platform of Azure Cosmos DB for backups. Backups are made automatically. For more information, see [Online backup and restore with Azure Cosmos DB](online-backup-and-restore.md).
401+
Yes, the Table API leverages the platform of Azure Cosmos DB for backups. Backups are made automatically. For more information, see [Online backup and restore with Azure Cosmos DB](../synapse-analytics/sql-data-warehouse/backup-and-restore.md).
402402

403403
### Does the Table API index all attributes of an entity by default?
404404

@@ -756,7 +756,7 @@ At present Azure Cosmos DB has an optimized experience for cloud environment wit
756756
### Does Cassandra API provide full backups?
757757

758758
Azure Cosmos DB provides two free full backups taken at four hours interval today across all APIs. This ensures you don't need to set up a backup schedule and other things.
759-
If you want to modify retention and frequency, send an email to [[email protected]](mailto:[email protected]) or raise a support case. Information about backup capability is provided in the [Automatic online backup and restore with Azure Cosmos DB](online-backup-and-restore.md) article.
759+
If you want to modify retention and frequency, send an email to [[email protected]](mailto:[email protected]) or raise a support case. Information about backup capability is provided in the [Automatic online backup and restore with Azure Cosmos DB](../synapse-analytics/sql-data-warehouse/backup-and-restore.md) article.
760760

761761
### How does the Cassandra API account handle failover if a region goes down?
762762

articles/cosmos-db/how-to-setup-cmk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ Not currently, but container-level keys are being considered.
228228

229229
### How do customer-managed keys affect a backup?
230230

231-
Azure Cosmos DB takes [regular and automatic backups](./online-backup-and-restore.md) of the data stored in your account. This operation backs up the encrypted data. To use the restored backup, the encryption key that you used at the time of the backup is required. This means that no revocation was made and the version of the key that was used at the time of the backup will still be enabled.
231+
Azure Cosmos DB takes [regular and automatic backups](../synapse-analytics/sql-data-warehouse/backup-and-restore.md) of the data stored in your account. This operation backs up the encrypted data. To use the restored backup, the encryption key that you used at the time of the backup is required. This means that no revocation was made and the version of the key that was used at the time of the backup will still be enabled.
232232

233233
### How do I revoke an encryption key?
234234

0 commit comments

Comments
 (0)