Skip to content

Commit 8d76c83

Browse files
authored
Merge pull request #225099 from MicrosoftDocs/release-iotedge-moniker-retirement
Retire IoT Edge 1.1 content
2 parents 6fa3576 + 5c559ff commit 8d76c83

File tree

224 files changed

+208
-7670
lines changed

Some content is hidden

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

224 files changed

+208
-7670
lines changed

articles/industrial-iot/TOC.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,6 @@
7373
href: ../iot-edge/how-to-create-virtual-switch.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
7474
- name: Configure GPU acceleration
7575
href: ../iot-edge/gpu-acceleration.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
76-
- name: Windows containers on Windows hosts
77-
items:
78-
- name: Provision a single device
79-
items:
80-
- name: Symmetric key attestation
81-
href: ../iot-edge/how-to-provision-single-device-windows-symmetric.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
82-
- name: X.509 certificate attestation
83-
href: ../iot-edge/how-to-provision-single-device-windows-x509.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
84-
- name: Provision devices at scale
85-
items:
86-
- name: Symmetric key attestation
87-
href: ../iot-edge/how-to-provision-devices-at-scale-windows-symmetric.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
88-
- name: X.509 certificate attestation
89-
href: ../iot-edge/how-to-provision-devices-at-scale-windows-x509.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
90-
- name: TPM attestation
91-
href: ../iot-edge/how-to-provision-devices-at-scale-windows-tpm.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
9276
- name: Update IoT Edge
9377
href: ../iot-edge/how-to-update-iot-edge.md?toc=/azure/industrial-iot/toc.json&bc=/azure/industrial-iot/breadcrumb/toc.json
9478
- name: Manage device certificates

articles/iot-dps/how-to-troubleshoot-dps.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Use this table to understand and resolve common errors.
6363
| 400 | The body of the request is not valid; for example, it cannot be parsed, or the object cannot be validated.| 400 Bad format |
6464
| 401 | The authorization token cannot be validated; for example, it is expired or does not apply to the request's URI. This error code is also returned to devices as part of the TPM attestation flow. | 401 Unauthorized|
6565
| 404 | The Device Provisioning Service instance, or a resource (e.g. an enrollment) does not exist. | 404 Not Found|
66-
| 405 | The client service knows the request method, but the target service doesn't recognize this method; for example, a rest operations is missing the enrollment or registration Id parameters | 405 Method Not Allowed |
66+
| 405 | The client service knows the request method, but the target service doesn't recognize this method; for example, a rest operation is missing the enrollment or registration ID parameters | 405 Method Not Allowed |
6767
| 409 | The request could not be completed due to a conflict with the current state of the target Device Provisioning Service instance; for example, the customer has already created the data point and is attempting to recreate the same datapoint again. | 409 Conflict |
6868
| 412 | The ETag in the request does not match the ETag of the existing resource, as per RFC7232. | 412 Precondition failed |
6969
| 415 | The server refuses to accept the request because the payload format is in an unsupported format. For supported formats, see [Iot Hub Device Provisioning Service REST API](/rest/api/iot-dps/) | 415 Unsupported Media Type |
@@ -72,18 +72,18 @@ Use this table to understand and resolve common errors.
7272

7373
### Suggested actions
7474

75-
* If an IoT Edge device fails to start with error message `failed to provision with IoT Hub, and no valid device backup was found dps client error`, see [DPS Client error](../iot-edge/troubleshoot-common-errors.md?preserve-view=true&view=iotedge-2018-06#dps-client-error) in the IoT Edge (1.1) documentation.
75+
* If an IoT Edge device fails to start with error message `failed to provision with IoT Hub, and no valid device backup was found dps client error`, see [DPS Client error](/previous-versions/azure/iot-edge/troubleshoot-common-errors#dps-client-error) in the IoT Edge (1.1) documentation.
7676

7777
* For 401 Unauthorized, 403 Forbidden, or 404 Not Found errors perform a full re-registration by calling the [DPS registration API](/rest/api/iot-dps/device/runtime-registration/register-device).
7878

7979
* For a 429 error, follow the retry pattern of IoT Hub that has exponential backoff with a random jitter. You can follow the retry-after header provided by the SDK.
8080

81-
* For 500-series server errors, retry your [connection](./concepts-deploy-at-scale.md#iot-hub-connectivity-considerations) using cached credentials or a [Device Registration Status Lookup API](/rest/api/iot-dps/device/runtime-registration/device-registration-status-lookup#deviceregistrationresult) call.
81+
* For 500-series server errors, retry your [connection](/azure/iot-dps/concepts-deploy-at-scale#iot-hub-connectivity-considerations) using cached credentials or a [Device Registration Status Lookup API](/rest/api/iot-dps/device/runtime-registration/device-registration-status-lookup#deviceregistrationresult) call.
8282

83-
For related best practices, such as retrying operations, see [Best practices for large-scale IoT device deployments](./concepts-deploy-at-scale.md).
83+
For related best practices, such as retrying operations, see [Best practices for large-scale IoT device deployments](/azure/iot-dps/concepts-deploy-at-scale).
8484

8585
## Next Steps
8686

8787
- To learn more about using Azure Monitor with DPS, see [Monitor Device Provisioning Service](monitor-iot-dps.md).
8888

89-
- To learn about metrics, logs, and schemas emitted for DPS in Azure Monitor, see [Monitoring Device Provisioning Service data reference](monitor-iot-dps-reference.md).
89+
- To learn about metrics, logs, and schemas emitted for DPS in Azure Monitor, see [Monitoring Device Provisioning Service data reference](monitor-iot-dps-reference.md).

articles/iot-edge/.openpublishing.redirection.iot-edge.json

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,86 @@
234234
"source_path_from_root": "/articles/iot-edge/how-to-publish-subscribe.md",
235235
"redirect_url": "/azure/iot-edge/",
236236
"redirect_document_id": false
237+
},
238+
{
239+
"source_path_from_root": "/articles/iot-edge/tutorial-machine-learning-edge-01-intro.md",
240+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-machine-learning-edge-01-intro",
241+
"redirect_document_id": false
242+
},
243+
{
244+
"source_path_from_root": "/articles/iot-edge/tutorial-machine-learning-edge-02-prepare-environment.md",
245+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-machine-learning-edge-02-prepare-environment",
246+
"redirect_document_id": false
247+
},
248+
{
249+
"source_path_from_root": "/articles/iot-edge/tutorial-machine-learning-edge-03-generate-data.md",
250+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-machine-learning-edge-03-generate-data",
251+
"redirect_document_id": false
252+
},
253+
{
254+
"source_path_from_root": "/articles/iot-edge/tutorial-machine-learning-edge-04-train-model.md",
255+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-machine-learning-edge-04-train-model",
256+
"redirect_document_id": false
257+
},
258+
{
259+
"source_path_from_root": "/articles/iot-edge/tutorial-machine-learning-edge-05-configure-edge-device.md",
260+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-machine-learning-edge-05-configure-edge-device",
261+
"redirect_document_id": false
262+
},
263+
{
264+
"source_path_from_root": "/articles/iot-edge/tutorial-machine-learning-edge-06-custom-modules.md",
265+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-machine-learning-edge-06-custom-modules",
266+
"redirect_document_id": false
267+
},
268+
{
269+
"source_path_from_root": "/articles/iot-edge/tutorial-machine-learning-edge-07-send-data-to-hub.md",
270+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-machine-learning-edge-07-send-data-to-hub",
271+
"redirect_document_id": false
272+
},
273+
{
274+
"source_path_from_root": "/articles/iot-edge/tutorial-develop-for-windows.md",
275+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-develop-for-windows",
276+
"redirect_document_id": false
277+
},
278+
{
279+
"source_path_from_root": "/articles/iot-edge/tutorial-c-module-windows.md",
280+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-c-module-windows",
281+
"redirect_document_id": false
282+
},
283+
{
284+
"source_path_from_root": "/articles/iot-edge/tutorial-csharp-module-windows.md",
285+
"redirect_url": "/previous-versions/azure/iot-edge/tutorial-csharp-module-windows",
286+
"redirect_document_id": false
287+
},
288+
{
289+
"source_path_from_root": "/articles/iot-edge/how-to-provision-single-device-windows-x509.md",
290+
"redirect_url": "/previous-versions/azure/iot-edge/how-to-provision-single-device-windows-x509",
291+
"redirect_document_id": false
292+
},
293+
{
294+
"source_path_from_root": "/articles/iot-edge/how-to-provision-single-device-windows-symmetric.md",
295+
"redirect_url": "/previous-versions/azure/iot-edge/how-to-provision-single-device-windows-symmetric",
296+
"redirect_document_id": false
297+
},
298+
{
299+
"source_path_from_root": "/articles/iot-edge/how-to-provision-devices-at-scale-windows-x509.md",
300+
"redirect_url": "/previous-versions/azure/iot-edge/how-to-provision-devices-at-scale-windows-x509",
301+
"redirect_document_id": false
302+
},
303+
{
304+
"source_path_from_root": "/articles/iot-edge/how-to-provision-devices-at-scale-windows-tpm.md",
305+
"redirect_url": "/previous-versions/azure/iot-edge/how-to-provision-devices-at-scale-windows-tpm",
306+
"redirect_document_id": false
307+
},
308+
{
309+
"source_path_from_root": "/articles/iot-edge/how-to-provision-devices-at-scale-windows-symmetric.md",
310+
"redirect_url": "/previous-versions/azure/iot-edge/how-to-provision-devices-at-scale-windows-symmetric",
311+
"redirect_document_id": false
312+
},
313+
{
314+
"source_path_from_root": "/articles/iot-edge/reference-windows-scripts.md",
315+
"redirect_url": "/previous-versions/azure/iot-edge/reference-windows-scripts",
316+
"redirect_document_id": false
237317
}
238318
]
239319
}

articles/iot-edge/TOC.yml

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@
1616
href: quickstart-linux.md
1717
- name: Tutorials
1818
items:
19-
- name: Set up development environment
20-
items:
21-
- name: Develop with Linux containers
22-
href: tutorial-develop-for-linux.md
23-
- name: Develop with Windows containers
24-
href: tutorial-develop-for-windows.md
19+
- name: Develop with Linux containers
20+
href: tutorial-develop-for-linux.md
2521
- name: Develop custom code modules
2622
items:
2723
- name: C
@@ -34,12 +30,6 @@
3430
href: tutorial-node-module.md
3531
- name: Python
3632
href: tutorial-python-module.md
37-
- name: Use Windows containers
38-
items:
39-
- name: C
40-
href: tutorial-c-module-windows.md
41-
- name: C#
42-
href: tutorial-csharp-module-windows.md
4333
- name: Deploy Azure services as modules
4434
items:
4535
- name: Filter data with Azure Functions
@@ -54,22 +44,6 @@
5444
items:
5545
- name: Create hierarchies of IoT Edge devices
5646
href: tutorial-nested-iot-edge.md
57-
- name: Machine learning at the edge
58-
items:
59-
- name: Introduction
60-
href: tutorial-machine-learning-edge-01-intro.md
61-
- name: Set up development machine and Azure services
62-
href: tutorial-machine-learning-edge-02-prepare-environment.md
63-
- name: Generate simulated device data
64-
href: tutorial-machine-learning-edge-03-generate-data.md
65-
- name: Train and deploy an Azure Machine Learning model
66-
href: tutorial-machine-learning-edge-04-train-model.md
67-
- name: Configure a transparent gateway
68-
href: tutorial-machine-learning-edge-05-configure-edge-device.md
69-
- name: Create and deploy IoT Edge modules
70-
href: tutorial-machine-learning-edge-06-custom-modules.md
71-
- name: Send data to IoT Hub via transparent gateway
72-
href: tutorial-machine-learning-edge-07-send-data-to-hub.md
7347
- name: Monitor devices and modules
7448
href: tutorial-monitor-with-workbooks.md
7549
- name: Configure EST server
@@ -138,22 +112,6 @@
138112
href: how-to-provision-devices-at-scale-linux-tpm.md
139113
- name: Symmetric key attestation
140114
href: how-to-provision-devices-at-scale-linux-symmetric.md
141-
- name: Windows containers on Windows hosts
142-
items:
143-
- name: Provision a single device
144-
items:
145-
- name: Symmetric key attestation
146-
href: how-to-provision-single-device-windows-symmetric.md
147-
- name: X.509 certificate attestation
148-
href: how-to-provision-single-device-windows-x509.md
149-
- name: Provision devices at scale
150-
items:
151-
- name: Symmetric key attestation
152-
href: how-to-provision-devices-at-scale-windows-symmetric.md
153-
- name: X.509 certificate attestation
154-
href: how-to-provision-devices-at-scale-windows-x509.md
155-
- name: TPM attestation
156-
href: how-to-provision-devices-at-scale-windows-tpm.md
157115
- name: Update IoT Edge
158116
href: how-to-update-iot-edge.md
159117
- name: Manage device certificates
@@ -348,10 +306,6 @@
348306
items:
349307
- name: Runtime modules environment variables
350308
href: https://github.com/Azure/iotedge/blob/release/1.4/doc/EnvironmentVariables.md
351-
- name: PowerShell functions
352-
items:
353-
- name: IoT Edge for Windows
354-
href: reference-windows-scripts.md
355309
- name: Create test certificates
356310
href: how-to-create-test-certificates.md
357311
- name: Azure CLI

articles/iot-edge/about-iot-edge.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
title: What is Azure IoT Edge | Microsoft Docs
33
description: Overview of the Azure IoT Edge service
44
author: PatAltimore
5-
6-
# this is the PM responsible
7-
ms.reviewer: chipalost
85
ms.service: iot-edge
96
services: iot-edge
107
ms.topic: overview

articles/iot-edge/configure-connect-verify-gpu.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ services: iot-edge
1212

1313
# Tutorial: Configure, connect, and verify an IoT Edge module for a GPU
1414

15+
[!INCLUDE [iot-edge-version-1.4](includes/iot-edge-version-1.4.md)]
16+
1517
This tutorial shows you how to build a GPU-enabled virtual machine (VM). From the VM, you'll see how to run an IoT Edge device that allocates work from one of its modules to your GPU.
1618

1719
We'll use the Azure portal, the Azure Cloud Shell, and your VM's command line to:

articles/iot-edge/gpu-acceleration.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
title: GPU acceleration for Azure IoT Edge for Linux on Windows | Microsoft Docs
33
description: Learn about how to configure your Azure IoT Edge for Linux on Windows virtual machines to use host device GPUs.
44
author: PatAltimore
5-
manager: kgremban
65
ms.author: patricka
76
ms.date: 6/7/2022
87
ms.topic: conceptual
@@ -12,7 +11,7 @@ services: iot-edge
1211

1312
# GPU acceleration for Azure IoT Edge for Linux on Windows
1413

15-
[!INCLUDE [iot-edge-version-1.1-or-1.4](includes/iot-edge-version-1.1-or-1.4.md)]
14+
[!INCLUDE [iot-edge-version-1.4](includes/iot-edge-version-1.4.md)]
1615

1716
GPUs are a popular choice for artificial intelligence computations, because they offer parallel processing capabilities and can often execute vision-based inferencing faster than CPUs. To better support artificial intelligence and machine learning applications, Azure IoT Edge for Linux on Windows (EFLOW) can expose a GPU to the virtual machine's Linux module.
1817

@@ -84,7 +83,7 @@ For example, the following commands create a GPU-enabled virtual machine with ei
8483
Deploy-Eflow -gpuPassthroughType DirectDeviceAssignment -gpuCount 1 -gpuName "NVIDIA A2"
8584
8685
#Deploys EFLOW with Intel(R) Iris(R) Xe Graphics assigned to the EFLOW VM
87-
Deploy-Eflow -gpuPassthroughType ParaVirtualization -gpuCount 1 -gpuName Intel(R) Iris(R) Xe Graphics
86+
Deploy-Eflow -gpuPassthroughType ParaVirtualization -gpuCount 1 -gpuName "Intel(R) Iris(R) Xe Graphics"
8887
```
8988

9089
To find the name of your GPU, you can run the following command or look for Display adapters in Device Manager.

articles/iot-edge/how-to-access-dtpm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services: iot-edge
1212

1313
# dTPM access for Azure IoT Edge for Linux on Windows
1414

15-
[!INCLUDE [iot-edge-version-1.1-or-1.4](includes/iot-edge-version-1.1-or-1.4.md)]
15+
[!INCLUDE [iot-edge-version-1.4](includes/iot-edge-version-1.4.md)]
1616

1717
A Trusted platform module (TPM) chip is a secure crypto-processor that is designed to carry out cryptographic operations. This technology is designed to provide hardware-based, security-related functions. The Azure IoT Edge for Linux on Windows (EFLOW) virtual machine doesn't have a virtual TPMs attached to the VM. However, the user can enable or disable the TPM passthrough feature, that allows the EFLOW virtual machine to use the Windows host OS TPM. The TPM passthrough feature enables two main scenarios:
1818

0 commit comments

Comments
 (0)