Skip to content

Commit b8540a7

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into cmkGA
2 parents 8404fb5 + 80946d4 commit b8540a7

File tree

3 files changed

+44
-26
lines changed

3 files changed

+44
-26
lines changed

articles/automation/automation-update-management-query-logs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Query Azure Update Management logs
33
description: This article describes how to query the logs for Update Management in your Log Analytics workspace.
44
services: automation
55
ms.subservice: update-management
6-
ms.date: 01/10/2020
6+
ms.date: 03/11/2020
77
ms.topic: conceptual
88
---
99
# Query update records for Update Management in Azure Monitor Logs
@@ -138,8 +138,8 @@ A record with a type of `UpdateSummary` is created that provides update summary
138138
| CriticalUpdatesMissing | Number of critical updates missing that are applicable. |
139139
| ManagementGroupName | Name of the Operations Manager management group or Log Analytics workspace. |
140140
| NETRuntimeVersion | Version of .NET Framework installed on the Windows computer. |
141-
| OldestMissingSecurityUpdateBucket | |
142-
| OldestMissingSecurityUpdateInDays | |
141+
| OldestMissingSecurityUpdateBucket | Values are:<br> *Recent*<br> *30 days ago*<br> *60 days ago*<br> *Older* |
142+
| OldestMissingSecurityUpdateInDays | Total number of days for the oldest update detected as applicable that has not been installed. |
143143
| OsVersion | The version of the operating system. |
144144
| OtherUpdatesMissing | Count of detected updates missing. |
145145
| Resource | Name of the resource. |

articles/data-explorer/delete-data.md

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,51 @@
11
---
22
title: Delete data from Azure Data Explorer
3-
description: This article describes bulk delete scenarios in Azure Data Explore, including purge and retention based deletes.
3+
description: This article describes delete scenarios in Azure Data Explorer, including purge, dropping extents and retention based deletes.
44
author: orspod
55
ms.author: orspodek
6-
ms.reviewer: mblythe
6+
ms.reviewer: avneraa
77
ms.service: data-explorer
88
ms.topic: conceptual
9-
ms.date: 09/24/2018
9+
ms.date: 03/12/2020
1010
---
1111

1212
# Delete data from Azure Data Explorer
1313

14-
Azure Data Explorer supports several bulk delete approaches, which we cover in this article. It doesn't support per-record deletion in real time, because it's optimized for fast read access.
14+
Azure Data Explorer supports various delete scenarios described in this article.
1515

16-
* If one or more tables is no longer needed, delete them using the drop table or drop tables command.
16+
## Delete data using the retention policy
1717

18-
```Kusto
19-
.drop table <TableName>
18+
Azure Data Explorer automatically deletes data based on the [retention policy](/azure/kusto/management/retentionpolicy). This method is the most efficient and hassle-free way of deleting data. Set the retention policy at the database or table level.
2019

21-
.drop tables (<TableName1>, <TableName2>,...)
22-
```
20+
Consider a database or table that is set for 90 days of retention. If only 60 days of data are needed, delete the older data as follows:
21+
22+
```kusto
23+
.alter-merge database <DatabaseName> policy retention softdelete = 60d
24+
25+
.alter-merge table <TableName> policy retention softdelete = 60d
26+
```
27+
28+
## Delete data by dropping extents
29+
30+
[Extent (data shard)](/azure/kusto/management/extents-overview) is the internal structure where data is stored. Each extent can hold up to millions of records. Extents can be deleted individually or as a group using [drop extent(s) commands](/azure/kusto/management/extents-commands#drop-extents).
2331

24-
* If old data is no longer needed, delete it by changing the retention period at the database or table level.
32+
### Examples
2533

26-
Consider a database or table that is set for 90 days of retention. Business needs change, so now only 60 days of data is needed. In this case, delete the older data in one of the following ways.
34+
You can delete all rows in a table or just a specific extent.
2735

28-
```Kusto
29-
.alter-merge database <DatabaseName> policy retention softdelete = 60d
36+
* Delete all rows in a table:
3037

31-
.alter-merge table <TableName> policy retention softdelete = 60d
38+
```kusto
39+
.drop extents from TestTable
3240
```
3341
34-
For more information, see [Retention policy](https://docs.microsoft.com/azure/kusto/concepts/retentionpolicy).
42+
* Delete a specific extent:
43+
44+
```kusto
45+
.drop extent e9fac0d2-b6d5-4ce3-bdb4-dea052d13b42
46+
```
47+
48+
## Delete individual rows using purge
49+
50+
[Data purge](/azure/kusto/management/data-purge) can be used for deleting individuals rows. Deletion isn't immediate and requires significant system resources. As such, it's only advised for compliance scenarios.
3551
36-
If you need assistance with data deletion issues, please open a support request in the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview).

articles/iot-hub/iot-hub-bulk-identity-mgmt.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Import export of Azure IoT Hub device identities | Microsoft Docs
3-
description: How to use the Azure IoT service SDK to perform bulk operations against the identity registry to import and export device identities. Import operations enable you to create, update, and delete device identities in bulk.
2+
title: Import/Export of Azure IoT Hub device identities | Microsoft Docs
3+
description: How to use the Azure IoT service SDK to run bulk operations against the identity registry to import and export device identities. Import operations enable you to create, update, and delete device identities in bulk.
44
author: robinsh
55
manager: philmea
66
ms.service: iot-hub
@@ -14,13 +14,16 @@ ms.author: robinsh
1414

1515
Each IoT hub has an identity registry you can use to create per-device resources in the service. The identity registry also enables you to control access to the device-facing endpoints. This article describes how to import and export device identities in bulk to and from an identity registry. To see a working sample in C# and learn how you can use this capability when cloning a hub to a different region, see [How to Clone an IoT Hub](iot-hub-how-to-clone.md).
1616

17-
[!INCLUDE [iot-hub-basic](../../includes/iot-hub-basic-whole.md)]
17+
> [!NOTE]
18+
> IoT Hub has recently added virtual network support in a limited number of regions. This feature secures import and export operations and eliminates the need to pass keys for authentication. Initially, virtual network support is available only in these regions: *WestUS2*, *EastUS*, and *SouthCentralUS*. To learn more about virtual network support and the API calls to implement it, see [IoT Hub Support for VNETs](https://go.microsoft.com/fwlink/p/?linkid=2122101).
1819
1920
Import and export operations take place in the context of *Jobs* that enable you to execute bulk service operations against an IoT hub.
2021

2122
The **RegistryManager** class includes the **ExportDevicesAsync** and **ImportDevicesAsync** methods that use the **Job** framework. These methods enable you to export, import, and synchronize the entirety of an IoT hub identity registry.
2223

23-
This topic discusses using the **RegistryManager** class and **Job** system to perform bulk imports and exports of devices to and from an IoT hub’s identity registry. You can also use the Azure IoT Hub Device Provisioning Service to enable zero-touch, just-in-time provisioning to one or more IoT hubs without requiring human intervention. To learn more, see the [provisioning service documentation](/azure/iot-dps).
24+
This topic discusses using the **RegistryManager** class and **Job** system to perform bulk imports and exports of devices to and from an IoT hub's identity registry. You can also use the Azure IoT Hub Device Provisioning Service to enable zero-touch, just-in-time provisioning to one or more IoT hubs without requiring human intervention. To learn more, see the [provisioning service documentation](/azure/iot-dps).
25+
26+
[!INCLUDE [iot-hub-basic](../../includes/iot-hub-basic-whole.md)]
2427

2528

2629
## What are jobs?
@@ -254,11 +257,11 @@ Use the optional **importMode** property in the import serialization data for ea
254257

255258
| importMode | Description |
256259
| --- | --- |
257-
| **createOrUpdate** |If a device does not exist with the specified **ID**, it is newly registered. <br/>If the device already exists, existing information is overwritten with the provided input data without regard to the **ETag** value. <br> The user can optionally specify twin data along with the device data. The twins etag, if specified, is processed independently from the devices etag. If there is a mismatch with the existing twins etag, an error is written to the log file. |
258-
| **create** |If a device does not exist with the specified **ID**, it is newly registered. <br/>If the device already exists, an error is written to the log file. <br> The user can optionally specify twin data along with the device data. The twins etag, if specified, is processed independently from the devices etag. If there is a mismatch with the existing twins etag, an error is written to the log file. |
260+
| **createOrUpdate** |If a device does not exist with the specified **ID**, it is newly registered. <br/>If the device already exists, existing information is overwritten with the provided input data without regard to the **ETag** value. <br> The user can optionally specify twin data along with the device data. The twin's etag, if specified, is processed independently from the device's etag. If there is a mismatch with the existing twin's etag, an error is written to the log file. |
261+
| **create** |If a device does not exist with the specified **ID**, it is newly registered. <br/>If the device already exists, an error is written to the log file. <br> The user can optionally specify twin data along with the device data. The twin's etag, if specified, is processed independently from the device's etag. If there is a mismatch with the existing twin's etag, an error is written to the log file. |
259262
| **update** |If a device already exists with the specified **ID**, existing information is overwritten with the provided input data without regard to the **ETag** value. <br/>If the device does not exist, an error is written to the log file. |
260263
| **updateIfMatchETag** |If a device already exists with the specified **ID**, existing information is overwritten with the provided input data only if there is an **ETag** match. <br/>If the device does not exist, an error is written to the log file. <br/>If there is an **ETag** mismatch, an error is written to the log file. |
261-
| **createOrUpdateIfMatchETag** |If a device does not exist with the specified **ID**, it is newly registered. <br/>If the device already exists, existing information is overwritten with the provided input data only if there is an **ETag** match. <br/>If there is an **ETag** mismatch, an error is written to the log file. <br> The user can optionally specify twin data along with the device data. The twins etag, if specified, is processed independently from the devices etag. If there is a mismatch with the existing twins etag, an error is written to the log file. |
264+
| **createOrUpdateIfMatchETag** |If a device does not exist with the specified **ID**, it is newly registered. <br/>If the device already exists, existing information is overwritten with the provided input data only if there is an **ETag** match. <br/>If there is an **ETag** mismatch, an error is written to the log file. <br> The user can optionally specify twin data along with the device data. The twin's etag, if specified, is processed independently from the device's etag. If there is a mismatch with the existing twin's etag, an error is written to the log file. |
262265
| **delete** |If a device already exists with the specified **ID**, it is deleted without regard to the **ETag** value. <br/>If the device does not exist, an error is written to the log file. |
263266
| **deleteIfMatchETag** |If a device already exists with the specified **ID**, it is deleted only if there is an **ETag** match. If the device does not exist, an error is written to the log file. <br/>If there is an ETag mismatch, an error is written to the log file. |
264267

0 commit comments

Comments
 (0)