Skip to content

Commit e2f6d98

Browse files
authored
Merge pull request #187681 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 2fb555c + 1a0c0d6 commit e2f6d98

23 files changed

+188
-290
lines changed

articles/azure-monitor/essentials/resource-logs-schema.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The schema for resource logs varies depending on the resource and log category.
7070
| Azure DDoS Protection | [Logging for Azure DDoS Protection Standard](../../ddos-protection/diagnostic-logging.md#log-schemas) |
7171
| Azure Digital Twins | [Set up Azure Digital Twins diagnostics](../../digital-twins/troubleshoot-diagnostics.md#log-schemas)
7272
| Azure Event Hubs |[Azure Event Hubs logs](../../event-hubs/event-hubs-diagnostic-logs.md) |
73-
| Azure ExpressRoute | Schema not available |
73+
| Azure ExpressRoute | [Monitoring Azure ExpressRoute](../../expressroute/monitor-expressroute.md#collection-and-routing) |
7474
| Azure Firewall | [Logging for Azure Firewall](../../firewall/logs-and-metrics.md#diagnostic-logs) |
7575
| Azure Front Door | [Logging for Azure Front Door](../../frontdoor/front-door-diagnostics.md) |
7676
| Azure IoT Hub | [IoT Hub operations](../../iot-hub/monitor-iot-hub-reference.md#resource-logs) |
@@ -89,7 +89,7 @@ The schema for resource logs varies depending on the resource and log category.
8989
| Azure Stream Analytics |[Job logs](../../stream-analytics/stream-analytics-job-diagnostic-logs.md) |
9090
| Azure Traffic Manager | [Traffic Manager log schema](../../traffic-manager/traffic-manager-diagnostic-logs.md) |
9191
| Azure Virtual Network | Schema not available |
92-
| Virtual network gateways | Schema not available |
92+
| Virtual network gateways | [Logging for Virtual Network Gateways](../../vpn-gateway/troubleshoot-vpn-with-azure-diagnostics.md)|
9393

9494

9595

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Restore VMs by using the Azure portal
33
description: Restore an Azure virtual machine from a recovery point by using the Azure portal, including the Cross Region Restore feature.
44
ms.reviewer: geg
55
ms.topic: conceptual
6-
ms.date: 01/08/2022
6+
ms.date: 02/02/2022
77
author: v-amallick
88
ms.service: backup
99
ms.author: v-amallick
@@ -188,7 +188,7 @@ Currently, secondary region [RPO](azure-backup-glossary.md#rpo-recovery-point-ob
188188

189189
>[!NOTE]
190190
>
191-
>- After the restore is triggered and in the data transfer phase, the restore job can't be cancelled.
191+
>- You can cancel the restore job till the data transfer phase. Once it enters VM creation phase, you can't cancel the restore job.
192192
>- The Cross Region Restore feature restores CMK (customer-managed keys) enabled Azure VMs, which aren't backed-up in a CMK enabled Recovery Services vault, as non-CMK enabled VMs in the secondary region.
193193
>- The Azure roles needed to restore in the secondary region are the same as those in the primary region.
194194
>- While restoring an Azure VM, Azure Backup configures the virtual network settings in the secondary region automatically. If you are [restoring disks](#restore-disks) while deploying the template, ensure to provide the virtual network settings, corresponding to the secondary region.

articles/backup/backup-azure-vm-backup-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ sections:
186186
Yes, you can access the VM once restored due to a VM having a broken relationship with the domain controller. For more information, see this [article](./backup-azure-arm-restore-vms.md#post-restore-steps).
187187
188188
- question: Can I cancel an in-progress restore job?
189-
answer: No, you cannot cancel a restore job that is in-progress.
189+
answer: Yes, you can cancel the restore job till the data transfer phase. Once it enters VM creation phase, you can't cancel the restore job.
190190

191191
- question: Why is my restore operation taking long time to complete?
192192
answer: The total restore time depends on the input/output operations per second (IOPS) speed and the throughput of the storage account. The total restore time can be affected if the target storage account is loaded with other application read and write operations. To improve the speed of restore operation, select a storage account that isn't loaded with other application data.

articles/backup/sql-support-matrix.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure Backup support matrix for SQL Server Backup in Azure VMs
33
description: Provides a summary of support settings and limitations when backing up SQL Server in Azure VMs with the Azure Backup service.
44
ms.topic: conceptual
5-
ms.date: 01/27/2022
5+
ms.date: 02/07/2022
66
ms.custom: references_regions
77
author: v-amallick
88
ms.service: backup
@@ -33,6 +33,7 @@ You can use Azure Backup to back up SQL Server databases in Azure VMs hosted on
3333
|Number of files supported in a database | 1000 |
3434
|Number of full backups supported per day | One scheduled backup. <br><br> Three on-demand backups. <br><br> We recommend not to trigger more than three backups per day. However, to allow user retries in case of failed attempts, hard limit for on-demand backups is set to nine attempts. |
3535
| Log shipping | When you enable [log shipping](/sql/database-engine/log-shipping/about-log-shipping-sql-server?view=sql-server-ver15&preserve-view=true) on the SQL server database that you are backing up, we recommend you to disable log backups in the backup policy. This is because, the log shipping (which automatically sends transaction logs from the primary to secondary database) will interfere with the log backups enabled through Azure Backup. <br><br> Therefore, if you enable log shipping, ensure that your policy only has full and/or differential backups enabled. |
36+
| Retention period for on-demand backups | For Full/ Differential/ Incremental backups, the out-of-box retention is 45 days. <br><br> For Copy-only full backup, you can define a custom retention period. |
3637

3738
_*The database size limit depends on the data transfer rate that we support and the backup time limit configuration. It’s not the hard limit. [Learn more](#backup-throughput-performance) on backup throughput performance._
3839

articles/cosmos-db/sql/sql-api-sdk-java-spark-v3.md

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,23 @@ If you have any feedback or ideas on how to improve your experience create an is
4040

4141
## Documentation links
4242

43-
* [Getting started](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md)
44-
* [Catalog API](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/catalog-api.md)
45-
* [Configuration Parameter Reference](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/configuration-reference.md)
43+
* [Getting started](https://aka.ms/azure-cosmos-spark-3-quickstart)
44+
* [Catalog API](https://aka.ms/azure-cosmos-spark-3-catalog-api)
45+
* [Configuration Parameter Reference](https://aka.ms/azure-cosmos-spark-3-config)
46+
* [End-to-end sample notebook "New York City Taxi data"](https://aka.ms/azure-cosmos-spark-3-sample-nyc-taxi-data)
47+
* [Migration from Spark 2.4 to Spark 3.*](https://aka.ms/azure-cosmos-spark-3-migration)
4648

4749
## Version compatibility
50+
* [Version compatibility for Spark 3.1](https://aka.ms/azure-cosmos-spark-3-1-version-compatibility)
51+
* [Version compatibility for Spark 3.2](https://aka.ms/azure-cosmos-spark-3-2-version-compatibility)
4852

49-
| Connector | Minimum Spark version | Minimum Java version | Supported Scala versions | Supported Databricks runtimes |
50-
| ------------- | --------------------- | -------------------- | ----------------------- | ----------------------------- |
51-
| 4.4.0 | 3.1.1 | 8 | 2.12 | 8.\*, 9.\* |
52-
| 4.3.1 | 3.1.1 | 8 | 2.12 | 8.\*, 9.\* |
53-
| 4.3.0 | 3.1.1 | 8 | 2.12 | 8.\*, 9.\* |
54-
| 4.2.0 | 3.1.1 | 8 | 2.12 | 8.\* |
55-
| 4.1.0 | 3.1.1 | 8 | 2.12 | 8.\* |
56-
| 4.0.0 | 3.1.1 | 8 | 2.12 | 8.\* |
57-
| 4.0.0-beta.3 | 3.1.1 | 8 | 2.12 | 8.\* |
58-
| 4.0.0-beta.2 | 3.1.1 | 8 | 2.12 | 8.\* |
59-
| 4.0.0-beta.1 | 3.1.1 | 8 | 2.12 | 8.\* |
53+
## Release notes
54+
* [Release notes for Spark 3.1](https://aka.ms/azure-cosmos-spark-3-1-changelog)
55+
* [Release notes for Spark 3.2](https://aka.ms/azure-cosmos-spark-3-2-changelog)
6056

6157
## Download
62-
63-
You can use the maven coordinate of the jar to auto install the Spark Connector to your Databricks Runtime 8 from Maven:
64-
`com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.4.0`
65-
66-
You can also integrate against Cosmos DB Spark Connector in your SBT project:
67-
68-
```scala
69-
libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-1_2-12" % "4.4.0"
70-
```
58+
* [Download of Cosmos DB Spark connectro for Spark 3.1](https://aka.ms/azure-cosmos-spark-3-1-changelog)
59+
* [Download of Cosmos DB Spark connectro for Spark 3.2](https://aka.ms/azure-cosmos-spark-3-2-download)
7160

7261
Azure Cosmos DB Spark connector is available on [Maven Central Repo](https://search.maven.org/search?q=g:com.azure.cosmos.spark).
7362

articles/cosmos-db/sql/sql-api-sdk-java-spark.md

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -60,60 +60,7 @@ You can use the connector with [Azure Databricks](https://azure.microsoft.com/se
6060
|**Get started** | [Accelerate big data analytics by using the Apache Spark to Azure Cosmos DB connector](./create-sql-api-spark.md) <br> [Use Apache Spark Structured Streaming with Apache Kafka and Azure Cosmos DB](../../hdinsight/apache-kafka-spark-structured-streaming-cosmosdb.md?toc=/azure/cosmos-db/toc.json&bc=/azure/cosmos-db/breadcrumb/toc.json) |
6161

6262
## Release history
63-
64-
### 3.3.0
65-
#### New features
66-
- Adds a new config option, `changefeedstartfromdatetime`, which can be used to specify the start time for when the changefeed should be processed. For more information, see [Config options](https://github.com/Azure/azure-cosmosdb-spark/wiki/Configuration-references).
67-
68-
### 3.2.0
69-
#### Key bug fixes
70-
- Fixes a regression that caused excessive memory consumption on the executors for large result sets (for example, with millions of rows), ultimately resulting in the error `java.lang.OutOfMemoryError: GC overhead limit exceeded`.
71-
72-
### 3.1.1
73-
#### Key bug fixes
74-
* Fixes a streaming checkpoint edge case in which the `ID` contains the pipe character (|) with the `ChangeFeedMaxPagesPerBatch` config applied.
75-
76-
### 3.1.0
77-
#### New features
78-
* Adds support for bulk updates when nested partition keys are used.
79-
* Adds support for Decimal and Float data types during writes to Azure Cosmos DB.
80-
* Adds support for Timestamp types when they're using Long (Unix epoch) as a value.
81-
82-
### 3.0.8
83-
#### Key bug fixes
84-
* Fixes typecast exception that occurs when the `WriteThroughputBudget` config is used.
85-
86-
### 3.0.7
87-
#### New features
88-
* Adds error information for bulk failures to exception and log.
89-
90-
### 3.0.6
91-
#### Key bug fixes
92-
* Fixes streaming checkpoint issues.
93-
94-
### 3.0.5
95-
#### Key bug fixes
96-
* To reduce noise, fixes log level of a message left unintentionally with level ERROR.
97-
98-
### 3.0.4
99-
#### Key bug fixes
100-
* Fixes a bug in structured streaming during partition splits. The bug could result in some missing change feed records or Null exceptions for checkpoint writes.
101-
102-
### 3.0.3
103-
#### Key bug fixes
104-
* Fixes a bug that causes a custom schema provided for readStream to be ignored.
105-
106-
### 3.0.2
107-
#### Key bug fixes
108-
* Fixes a regression (unshaded JAR includes all shaded dependencies) that increases build time by 50 percent.
109-
110-
### 3.0.1
111-
#### Key bug fixes
112-
* Fixes a dependency problem that causes Direct Transport over TCP to fail with RequestTimeoutException.
113-
114-
### 3.0.0
115-
#### New features
116-
* Improves connection management and connection pooling to reduce the number of metadata calls.
63+
* [Release notes](https://github.com/Azure/azure-cosmosdb-spark/blob/2.4/CHANGELOG.md)]
11764

11865
## FAQ
11966
[!INCLUDE [cosmos-db-sdk-faq](../includes/cosmos-db-sdk-faq.md)]

articles/data-factory/security-and-access-control-troubleshoot-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: data-factory
77
ms.subservice: integration-runtime
88
ms.custom: synapse
99
ms.topic: troubleshooting
10-
ms.date: 12/15/2021
10+
ms.date: 02/07/2022
1111
ms.author: lle
1212
---
1313

@@ -61,7 +61,7 @@ If none of the preceding methods works, contact Microsoft for help.
6161

6262
#### Symptoms
6363

64-
After you disable public network access for the service, the self-hosted integration runtime throws the following error: “The Authentication key is invalid or empty.
64+
After you disable public network access for the service, the self-hosted integration runtime throws following errors: `The Authentication key is invalid or empty.` or `Cannot connect to the data factory. Please check whether the factory has enabled public network access or the machine is hosted in a approved private endpoint Virtual Network.`
6565

6666
#### Cause
6767

Lines changed: 15 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,38 @@
11
---
2-
title: Azure Internet of Things (IoT) solution options
3-
description: Guidance on choosing between a platform services or managed app platform approach to building an IoT solution. The platform service approach uses services such as IoT Hub and Digital Twins as building blocks. The managed app platform approach uses IoT Central to quickly get started.
2+
title: Get started with Azure IoT
3+
description: Guidance on how to get started on your IoT journey. Why you should start with the application platform as a service (aPaaS) model.
44
author: dominicbetts
55
ms.service: iot-fundamentals
66
services: iot-fundamentals
77
ms.topic: overview
8-
ms.date: 02/05/2020
8+
ms.date: 02/03/2022
99
ms.author: dobett
1010
---
1111

12-
# What is the right IoT solution for your business?
12+
# Get started with Azure IoT
1313

14-
To build an IoT solution for your business, you typically choose to use either the *platform services* or the *managed app platform* approach.
14+
IoT solutions require a combination of technologies to connect devices, events, and actions to cloud applications. Microsoft provides open-source [Device SDKs](../iot-develop/about-iot-sdks.md) that you can use to build the apps that run on your devices. However, there are many options for building and deploying your IoT cloud solutions. To simplify onboarding to Azure IoT, the recommended approach aims to accelerate time to value and eliminate key challenges.
1515

16-
Platform services provide the building blocks for customized and flexible IoT applications. You have more options to choose and code when you connect devices, and ingest, store, and analyze your data. Azure IoT platform services include the products Azure IoT Hub and Azure Digital Twins.
16+
## Start as high as you can, with Azure IoT Central
1717

18-
A managed app platform lets you get started building apps more quickly than platform services by reducing the number of decisions needed to achieve results. The managed app platform takes care of most elements of your solution, so you can focus on adding industry knowledge, and scaling and connecting devices. Azure IoT Central is a managed app platform.
18+
You should start your IoT journey with Azure IoT Central, the Azure application platform as a service (aPaaS) offering. Starting as high as possible in the Azure IoT technology stack lets you focus your time on using IoT data to create business value instead of simply getting your IoT data.
1919

20-
To choose between these two approaches, you should consider:
20+
:::image type="content" source="media/iot-solution-options/azure-iot-central.svg" alt-text="Diagram that shows how Azure IoT Central is built on top of PaaS services." border="false":::
2121

22-
- How you want to manage your solution.
23-
- What level of customization and control you want over your solution.
24-
- What pricing structure you want.
22+
IoT Central accelerates assembly and operation by pre-assembling platform as a service (PaaS) components. With an out-of-the box web UI and API surface, you can easily monitor device conditions, create rules, and manage millions of devices and their data remotely throughout their life cycles. Furthermore, you can act on device insights by extending IoT intelligence into line-of-business applications. Azure IoT Central also offers built-in disaster recovery, multitenancy, global availability, and a predictable cost structure.
2523

26-
## Management
24+
## Go as low as you must, with powerful Azure PaaS Services
2725

28-
Where do you want to spend your system management time and resources?
26+
Some scenarios may need a higher degree of control and customization than Azure IoT Central provides. In these cases, Azure also offers individual platform as a service (PaaS) cloud services that you can use to build a custom IoT solution:
2927

30-
- Choose the platform services approach to have full control over the underlying services in your solution. For example, you want to:
31-
32-
- Manage scaling and securing services to meet your needs.
33-
- Make use of in-house or partner expertise to onboard devices and provision services.
34-
35-
- Choose the managed app platform approach to take advantage of a platform that handles scale, security, and management of your IoT applications and devices.
36-
37-
## Control
38-
39-
What elements of your solution do you want to customize?
40-
41-
- Choose the platform services approach for total customization and control over the solution architecture.
42-
43-
- Choose the managed app platform approach to customize branding, dashboards, user roles, devices, and telemetry. However, you don't want to handle the underlying IoT system management overhead.
44-
45-
## Pricing
46-
47-
What pricing structure best fits your needs?
48-
49-
- Choose the platform services approach to fine-tune services and control my overall costs.
50-
51-
- Choose the managed app platform approach for a simple, predictable pricing structure.
52-
53-
## Summary
54-
55-
The platform services approach is appropriate for a business with cloud solution and device expertise that wants to:
56-
57-
- Fine-tune the services in the solution.
58-
- Have a high degree of control over the services in the solution.
59-
- Fully customize the solution.
60-
61-
The managed app platform approach is appropriate for a business that:
62-
63-
- Doesn't want to dedicate extensive resources to system design, development, and management.
64-
- Does want a predictable pricing structure.
65-
- Does want some customization capabilities.
28+
:::image type="content" source="media/iot-solution-options/azure-iot-onboarding.png" alt-text="Diagram that shows key Azure IoT PaaS services that you can use to build a custom solution." border="false":::
6629

6730
## Next steps
6831

32+
For a more comprehensive comparison of the PaaS and aPaaS solution approaches, see [What's the difference between aPaaS and PaaS solution offerings?](iot-solution-apaas-paas.md).
33+
6934
For a more comprehensive explanation of the different services and platforms, and how they're used, see [Azure IoT services and technologies](iot-services-and-technologies.md).
7035

7136
To learn more about the key attributes of successful IoT solutions, see the [8 attributes of successful IoT solutions](https://aka.ms/8attributes) white paper.
7237

73-
For an in-depth discussion of IoT architecture, see the [Microsoft Azure IoT Reference Architecture](/azure/architecture/reference-architectures/iot).
38+
For an in-depth discussion of IoT architecture, see the [Microsoft Azure IoT Reference Architecture](/azure/architecture/reference-architectures/iot).

articles/iot-fundamentals/media/iot-solution-options/azure-iot-central.svg

Lines changed: 1 addition & 0 deletions
Loading
64.1 KB
Loading

0 commit comments

Comments
 (0)