Merge pull request #222068 from w-azure/winona-replace-versions

jborsecnik · web-flow · commit f42e9e85ef6e · 2023-01-05T15:34:28.000-08:00
Changed 1.3 to 1.4, removed 1.2
diff --git a/articles/iot-edge/how-to-configure-api-proxy-module.md b/articles/iot-edge/how-to-configure-api-proxy-module.md
@@ -14,7 +14,7 @@ monikerRange: ">=iotedge-2020-11"
 
 # Configure the API proxy module for your gateway hierarchy scenario (Preview)
 
-[!INCLUDE [iot-edge-version-202011](includes/iot-edge-version-202011.md)]
+[!INCLUDE [iot-edge-version-1.4](includes/iot-edge-version-1.4.md)]
 
 This article walks through the configuration options for the API proxy module, so you can customize the module to support your gateway hierarchy requirements.
 
diff --git a/articles/iot-edge/how-to-configure-proxy-support.md b/articles/iot-edge/how-to-configure-proxy-support.md
@@ -280,11 +280,6 @@ This step takes place once on the IoT Edge device during initial device setup.
 
 2. In the config file, find the `[agent]` section, which contains all the configuration information for the edgeAgent module to use on startup. Check and make sure that the `[agent]`section is uncommented or add it if it is not included in the `config.toml`. The IoT Edge agent definition includes an `[agent.env]` subsection where you can add environment variables.
 
-:::moniker-end
-
-<!-- 1.3 -->
-:::moniker range="=iotedge-2020-11"
-
 3. Add the **https_proxy** parameter to the environment variables section, and set your proxy URL as its value.
 
     ```toml
@@ -293,7 +288,7 @@ This step takes place once on the IoT Edge device during initial device setup.
     type = "docker"
     
     [agent.config]
-    image = "mcr.microsoft.com/azureiotedge-agent:1.3"
+    image = "mcr.microsoft.com/azureiotedge-agent:1.4"
     
     [agent.env]
     # "RuntimeLogLevel" = "debug"
@@ -305,7 +300,7 @@ This step takes place once on the IoT Edge device during initial device setup.
 
     ```toml
     [agent.config]
-    image = "mcr.microsoft.com/azureiotedge-agent:1.3"
+    image = "mcr.microsoft.com/azureiotedge-agent:1.4"
     
     [agent.env]
     # "RuntimeLogLevel" = "debug"
@@ -345,11 +340,6 @@ This step takes place once on the IoT Edge device during initial device setup.
     "UpstreamProtocol" = "AmqpWs"
     "https_proxy" = "<proxy URL>"
     ```
-    
-:::moniker-end
-
-<!-- >= 1.3 -->
-:::moniker range=">=iotedge-2020-11"
 
 5. Save the changes and close the editor. Apply your latest changes.
 
diff --git a/articles/iot-edge/how-to-connect-downstream-iot-edge-device.md b/articles/iot-edge/how-to-connect-downstream-iot-edge-device.md
@@ -14,7 +14,7 @@ monikerRange: ">=iotedge-2020-11"
 
 # Connect Azure IoT Edge devices together to create a hierarchy (nested edge)
 
-[!INCLUDE [iot-edge-version-202011](includes/iot-edge-version-202011.md)]
+[!INCLUDE [iot-edge-version-1.4](includes/iot-edge-version-1.4.md)]
 
 This article provides instructions for establishing a trusted connection between an IoT Edge gateway and a downstream IoT Edge device. This setup is also known as "nested edge".
 
diff --git a/articles/iot-edge/how-to-install-iot-edge-ubuntuvm-bicep.md b/articles/iot-edge/how-to-install-iot-edge-ubuntuvm-bicep.md
@@ -11,7 +11,7 @@ ms.author: pdecarlo
 ---
 # Run Azure IoT Edge on Ubuntu Virtual Machines by using Bicep
 
-[!INCLUDE [iot-edge-version-201806-or-202011](includes/iot-edge-version-201806-or-202011.md)]
+[!INCLUDE [iot-edge-version-1.1-or-1.4](includes/iot-edge-version-1.1-or-1.4.md)]
 
 The Azure IoT Edge runtime is what turns a device into an IoT Edge device. The runtime can be deployed on devices as small as a Raspberry Pi or as large as an industrial server. Once a device is configured with the IoT Edge runtime, you can start deploying business logic to it from the cloud.
 
@@ -23,9 +23,9 @@ This article lists the steps to deploy an Ubuntu 18.04 LTS virtual machine with
 On first boot, the virtual machine [installs the latest version of the Azure IoT Edge runtime via cloud-init](https://github.com/Azure/iotedge-vm-deploy/blob/1.1/cloud-init.txt). It also sets a supplied connection string before the runtime starts, allowing you to easily configure and connect the IoT Edge device without the need to start an SSH or remote desktop session.
 :::moniker-end
 :::moniker range=">=iotedge-2020-11"
-This article lists the steps to deploy an Ubuntu 20.04 LTS virtual machine with the Azure IoT Edge runtime installed and configured using a pre-supplied device connection string. The deployment is accomplished using a [cloud-init](../virtual-machines/linux/using-cloud-init.md) based [Bicep file](../azure-resource-manager/bicep/overview.md) maintained in the [iotedge-vm-deploy](https://github.com/Azure/iotedge-vm-deploy/tree/1.3) project repository.
+This article lists the steps to deploy an Ubuntu 20.04 LTS virtual machine with the Azure IoT Edge runtime installed and configured using a pre-supplied device connection string. The deployment is accomplished using a [cloud-init](../virtual-machines/linux/using-cloud-init.md) based [Bicep file](../azure-resource-manager/bicep/overview.md) maintained in the [iotedge-vm-deploy](https://github.com/Azure/iotedge-vm-deploy/tree/1.4) project repository.
 
-On first boot, the virtual machine [installs the latest version of the Azure IoT Edge runtime via cloud-init](https://github.com/Azure/iotedge-vm-deploy/blob/1.3/cloud-init.txt). It also sets a supplied connection string before the runtime starts, allowing you to easily configure and connect the IoT Edge device without the need to start an SSH or remote desktop session.
+On first boot, the virtual machine [installs the latest version of the Azure IoT Edge runtime via cloud-init](https://github.com/Azure/iotedge-vm-deploy/blob/1.4/cloud-init.txt). It also sets a supplied connection string before the runtime starts, allowing you to easily configure and connect the IoT Edge device without the need to start an SSH or remote desktop session.
 :::moniker-end
 
 ## Deploy from Azure CLI
diff --git a/articles/iot-edge/includes/iot-edge-version-1.1-or-1.4.md b/articles/iot-edge/includes/iot-edge-version-1.1-or-1.4.md
@@ -24,7 +24,7 @@
 <!-- 1.4 -->
 ::: moniker range=">=iotedge-2020-11"
 
-**Applies to:** ![IoT Edge 1.3 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.3 ![IoT Edge 1.4 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.4
+**Applies to:** ![IoT Edge 1.4 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.4
 **Other versions:**  [IoT Edge 1.1](?view=iotedge-2018-06&preserve-view=true)
 
 ::: moniker-end
diff --git a/articles/iot-edge/includes/iot-edge-version-1.4.md b/articles/iot-edge/includes/iot-edge-version-1.4.md
@@ -0,0 +1,12 @@
+---
+ title: IoT Edge one supported version - 1.4 only
+ description: include file
+ services: iot-edge
+ author: PatAltimore
+ ms.service: iot-edge
+ ms.topic: include
+ ms.author: patricka
+ ms.custom: include file
+---
+
+**Applies to:** ![IoT Edge 1.4 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.4
diff --git a/articles/iot-edge/includes/iot-edge-version-201806.md b/articles/iot-edge/includes/iot-edge-version-201806.md
@@ -14,3 +14,4 @@
 
 > [!IMPORTANT]
 > IoT Edge 1.1 [end of support date was December 13, 2022](../support.md#releases). Check the [Microsoft Product Lifecycle](/lifecycle/policies/modern) for information about how this product, service, technology, or API is supported.
+
diff --git a/articles/iot-edge/includes/iot-edge-version-202011.md b/articles/iot-edge/includes/iot-edge-version-202011.md
diff --git a/articles/iot-edge/includes/iot-edge-version-all-supported.md b/articles/iot-edge/includes/iot-edge-version-all-supported.md
@@ -1,5 +1,5 @@
 ---
- title: IoT Edge all versions supported - 1.1 (LTS) and 1.4
+ title: IoT Edge all versions supported
  description: include file
  services: iot-edge
  author: PatAltimore
@@ -10,4 +10,4 @@
  ms.custom: include file
 ---
 
-**Applies to:** ![IoT Edge 1.1 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.1 ![IoT Edge 1.2 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.2 ![IoT Edge 1.3 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.3 ![IoT Edge 1.4 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.4
+**Applies to:** ![IoT Edge 1.1 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.1 ![IoT Edge 1.4 checkmark](./media/iot-edge-version/yes-icon.png) IoT Edge 1.4
diff --git a/articles/iot-edge/iot-edge-for-linux-on-windows-support.md b/articles/iot-edge/iot-edge-for-linux-on-windows-support.md
@@ -77,7 +77,7 @@ The following table lists the components included in each release. Each release
 | Release | IoT Edge | CBL-Mariner | Defender for IoT |
 | ------- | -------- | ----------- | ---------------- |
 | **1.1 LTS** | 1.1 | 2.0 | - |
-| **Continuous Release** | 1.3 | 2.0 | 3.12.3 | 
+| **Continuous Release** | 1.3 | 2.0 | 3.12.3 |
 | **1.4 LTS** | 1.4 | 2.0 | 3.12.3 |
 
 
diff --git a/articles/iot-edge/media/quickstart-linux/iotedge-list-2-version-1.4.png b/articles/iot-edge/media/quickstart-linux/iotedge-list-2-version-1.4.png
diff --git a/articles/iot-edge/quickstart-linux.md b/articles/iot-edge/quickstart-linux.md
@@ -334,12 +334,12 @@ Open the command prompt on your IoT Edge device again, or use the SSH connection
 
 <!-- 1.1 -->
 :::moniker range="iotedge-2018-06"
-   ![View three modules on your device](./media/quickstart-linux/iotedge-list-2-version-201806.png)
+![View three modules on your device](./media/quickstart-linux/iotedge-list-2-version-201806.png)
 :::moniker-end
 
 <!-- iotedge-2020-11 -->
 :::moniker range=">=iotedge-2020-11"
-   ![View three modules on your device](./media/quickstart-linux/iotedge-list-2-version-202011.png)
+![View three modules on your device](./media/quickstart-linux/iotedge-list-2-version-1.4.png)
 :::moniker-end
 
 View the messages being sent from the temperature sensor module:
diff --git a/articles/iot-edge/troubleshoot-iot-edge-for-linux-on-windows-common-errors.md b/articles/iot-edge/troubleshoot-iot-edge-for-linux-on-windows-common-errors.md
@@ -96,14 +96,14 @@ The following section addresses the common errors related to EFLOW networking an
 > [!div class="mx-tdCol2BreakAll"]
 > | Error | Error Description | Solution |
 > | ----- | ----------------- | -------- |
-> | Installation of virtual switch failed <br/> The virtual switch '$switchName' of type '$switchType' was not found | When creating the EFLOW VM, there's a check that the virtual switch provided exists and has the correct type. If using no parameter, the installation uses the default switch provided by the Windows client. | Check that the virtual switch being used is part of the Windows host OS. You can check the virtual switches using the PowerShell cmdlet `Get-VmSwitch`. For more information about networking configurations, see [Azure IoT Edge for Linux on Windows networking](./iot-edge-for-linux-on-windows-networking.md). | 
-> | The virtual switch '$switchName' of type '$switchType' </br> is not supported on current host OS | When using Windows client SKUs, external/default switches are supported. However, when using Windows Server SKUs, external/internal switches are supported. | For more information about networking configurations, see [Azure IoT Edge for Linux on Windows networking](./iot-edge-for-linux-on-windows-networking.md).
-> | Cannot set Static IP on ICS type virtual switch (Default Switch) | The _default switch_ is a virtual switch that's provided in the Windows client SKUs after installing Hyper-V. This switch already has a DHCP server for *IP4Address* assignation and for security reasons doesn't support a static IP. | If using the _default switch_, you can either use the `Get-EflowVmAddr` cmdlet or use the hostname of the EFLOW VM to get the VM *IP4Address*. If using the hostname, try using _Windows-hostname_-EFLOW.mshome.net. For more information about networking configurations, see [Azure IoT Edge for Linux on Windows networking](./iot-edge-for-linux-on-windows-networking.md). | 
-> | $dnsServer is not a valid IP4 address | The *Set-EflowVmDnsServers* cmdlet expects a list of valid *IP4Addresses* | Verify you provided a valid list of addresses. You can check the Windows host OS DNS servers by using the PowerShell cmdlet `ipconfig /all` and then looking for the entry _DNS Servers_. For example, if you wanted to set two DNS servers with IPs 10.0.1.2 and 10.0.1.3, use the `Set-EflowVmDnsServers -dnsServers @("10.0.1.2", "10.0.1.3")` cmdlet. | 
-> | Could not retrieve IP address for virtual machine <br/> Virtual machine name could not be retrieved, failed to get IP/MAC address <br/> Failed to acquire MAC address for virtual machine <br/> Failed to acquire IP address for virtual machine <br/> Unable to obtain host routing. Connectivity test to $computerName failed. <br/> wssdagent does not have the expected vnet resource provisioned. <br/> Missing EFLOW-VM guest interface for ($vnicName) | Caused by connectivity issues with the EFLOW virtual machine. The errors are generally related to an IP address change (if using static IP) or failure to assign an IP if using DHCP server. | Make sure to use the appropriate networking configuration. If there's a valid DHCP server, you can use DHCP assignation. If using static IP, make sure the IP configuration is correct (all three parameters: _ip4Address_, _ip4GatewayAddress_ and _ip4PrefixLength_) and the address isn't being used by another device in the network. For more information about networking configurations, see [Azure IoT Edge for Linux on Windows networking](./iot-edge-for-linux-on-windows-networking.md). | 
-> | No adapters associated with the switch '$vnetName' are found. <br/> No adapters associated with the device ID '$adapterGuid' are found <br/> No adapters associated with the adapter name '$name' are found. <br/> Network '$vswitchName' does not exist | Caused by a network communication error between the Windows host OS and the EFLOW virtual machine. | Ensure you can reach the EFLOW VM and establish an SSH channel. Use the `Connect-EflowVm` PowerShell cmdlet to connect to the virtual machine. If connectivity fails, reboot the EFLOW VM and check again. | 
-> | ip4Address & ip4PrefixLength are required for StaticIP! | During EFLOW VM deployment or when adding multiple NICs, if using static IP, the three static ip parameters are needed: _ip4Address_, _ip4GatewayAddress_, _ip4PrefixLength_. | For more information about `Deploy-EFlow` PowerShell cmdlet, see [PowerShell functions for IoT Edge for Linux on Windows](./reference-iot-edge-for-linux-on-windows-functions.md). | 
-> | Found multiple VMMS switches <br/> with name '$switchName' of type '$switchType' | There are two or more virtual switches with the same name and type. This environment conflicts with the EFLOW VM installation and lifecycle of the VM. | Use `Get-VmSwitch` PowerShell cmdlet to check the virtual switches available in the Windows host and make sure that each {name,type} is unique. | 
+> | Installation of virtual switch failed <br/> The virtual switch '$switchName' of type '$switchType' was not found | When creating the EFLOW VM, there's a check that the virtual switch provided exists and has the correct type. If using no parameter, the installation uses the default switch provided by the Windows client. | Check that the virtual switch being used is part of the Windows host OS. You can check the virtual switches using the PowerShell cmdlet `Get-VmSwitch`. For more information about networking configurations, see [Azure IoT Edge for Linux on Windows networking](./iot-edge-for-linux-on-windows-networking.md). | 
+> | The virtual switch '$switchName' of type '$switchType' </br> is not supported on current host OS | When using Windows client SKUs, external/default switches are supported. However, when using Windows Server SKUs, external/internal switches are supported. | For more information about networking configurations, see [Azure IoT Edge for Linux on Windows networking](./iot-edge-for-linux-on-windows-networking.md).
+> | Cannot set Static IP on ICS type virtual switch (Default Switch) | The _default switch_ is a virtual switch that's provided in the Windows client SKUs after installing Hyper-V. This switch already has a DHCP server for *IP4Address* assignation and for security reasons doesn't support a static IP. | If using the _default switch_, you can either use the `Get-EflowVmAddr` cmdlet or use the hostname of the EFLOW VM to get the VM *IP4Address*. If using the hostname, try using _Windows-hostname_-EFLOW.mshome.net. For more information about networking configurations, see [Azure IoT Edge for Linux on Windows networking](./iot-edge-for-linux-on-windows-networking.md). | 
+> | $dnsServer is not a valid IP4 address | The *Set-EflowVmDnsServers* cmdlet expects a list of valid *IP4Addresses* | Verify you provided a valid list of addresses. You can check the Windows host OS DNS servers by using the PowerShell cmdlet `ipconfig /all` and then looking for the entry _DNS Servers_. For example, if you wanted to set two DNS servers with IPs 10.0.1.2 and 10.0.1.3, use the `Set-EflowVmDnsServers -dnsServers @("10.0.1.2", "10.0.1.3")` cmdlet. | 
+> | Could not retrieve IP address for virtual machine <br/> Virtual machine name could not be retrieved, failed to get IP/MAC address <br/> Failed to acquire MAC address for virtual machine <br/> Failed to acquire IP address for virtual machine <br/> Unable to obtain host routing. Connectivity test to $computerName failed. <br/> wssdagent does not have the expected vnet resource provisioned. <br/> Missing EFLOW-VM guest interface for ($vnicName) | Caused by connectivity issues with the EFLOW virtual machine. The errors are generally related to an IP address change (if using static IP) or failure to assign an IP if using DHCP server. | Make sure to use the appropriate networking configuration. If there's a valid DHCP server, you can use DHCP assignation. If using static IP, make sure the IP configuration is correct (all three parameters: _ip4Address_, _ip4GatewayAddress_ and _ip4PrefixLength_) and the address isn't being used by another device in the network. For more information about networking configurations, see [Azure IoT Edge for Linux on Windows networking](./iot-edge-for-linux-on-windows-networking.md). | 
+> | No adapters associated with the switch '$vnetName' are found. <br/> No adapters associated with the device ID '$adapterGuid' are found <br/> No adapters associated with the adapter name '$name' are found. <br/> Network '$vswitchName' does not exist | Caused by a network communication error between the Windows host OS and the EFLOW virtual machine. | Ensure you can reach the EFLOW VM and establish an SSH channel. Use the `Connect-EflowVm` PowerShell cmdlet to connect to the virtual machine. If connectivity fails, reboot the EFLOW VM and check again. | 
+> | ip4Address & ip4PrefixLength are required for StaticIP! | During EFLOW VM deployment or when adding multiple NICs, if using static IP, the three static ip parameters are needed: _ip4Address_, _ip4GatewayAddress_, _ip4PrefixLength_. | For more information about `Deploy-EFlow` PowerShell cmdlet, see [PowerShell functions for IoT Edge for Linux on Windows](./reference-iot-edge-for-linux-on-windows-functions.md). | 
+> | Found multiple VMMS switches <br/> with name '$switchName' of type '$switchType' | There are two or more virtual switches with the same name and type. This environment conflicts with the EFLOW VM installation and lifecycle of the VM. | Use `Get-VmSwitch` PowerShell cmdlet to check the virtual switches available in the Windows host and make sure that each {name,type} is unique. | 
 
 ## Next steps
 
diff --git a/articles/iot-edge/tutorial-configure-est-server.md b/articles/iot-edge/tutorial-configure-est-server.md
@@ -12,7 +12,7 @@ monikerRange: ">=iotedge-2020-11"
 
 # Tutorial: Configure Enrollment over Secure Transport Server for Azure IoT Edge
 
-[!INCLUDE [iot-edge-version-202011](includes/iot-edge-version-202011.md)]
+[!INCLUDE [iot-edge-version-202011](includes/iot-edge-version-1.4.md)]
 
 With Azure IoT Edge, you can configure your devices to use an Enrollment over Secure Transport (EST) server to manage x509 certificates.
 
diff --git a/articles/iot-edge/tutorial-nested-iot-edge-for-linux-on-windows.md b/articles/iot-edge/tutorial-nested-iot-edge-for-linux-on-windows.md
@@ -12,7 +12,7 @@ monikerRange: ">=iotedge-2020-11"
 
 # Tutorial: Create a hierarchy of IoT Edge devices using IoT Edge for Linux on Windows
 
-[!INCLUDE [iot-edge-version-202011](includes/iot-edge-version-202011.md)]
+[!INCLUDE [iot-edge-version-1.4](includes/iot-edge-version-1.4.md)]
 
 Deploy Azure IoT Edge nodes across networks organized in hierarchical layers. Each layer in a hierarchy is a gateway device that handles messages and requests from devices in the layer beneath it.
 
diff --git a/articles/iot-edge/tutorial-nested-iot-edge.md b/articles/iot-edge/tutorial-nested-iot-edge.md
@@ -13,7 +13,7 @@ monikerRange: ">=iotedge-2020-11"
 
 # Tutorial: Create a hierarchy of IoT Edge devices
 
-[!INCLUDE [iot-edge-version-202011](includes/iot-edge-version-202011.md)]
+[!INCLUDE [iot-edge-version-1.4](includes/iot-edge-version-1.4.md)]
 
 Deploy Azure IoT Edge nodes across networks organized in hierarchical layers. Each layer in a hierarchy is a gateway device that handles messages and requests from devices in the layer beneath it. This setup is also known as "nested edge".
 

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@`
`14`	`14`
`15`	`15`	`> [!IMPORTANT]`
`16`	`16`	`> IoT Edge 1.1 [end of support date was December 13, 2022](../support.md#releases). Check the [Microsoft Product Lifecycle](/lifecycle/policies/modern) for information about how this product, service, technology, or API is supported.`
	`17`	`+`