Merge pull request #271486 from PatAltimore/patricka-marketplace

Remove add marketplace module

Author: American-Dipper

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

@@ -5,7 +5,7 @@ author: PatAltimore
 ms.service: iot-edge
 services: iot-edge
 ms.topic: overview
-ms.date: 06/05/2024
+ms.date: 06/12/2024
 ms.author: patricka
 ms.custom: mvc
 ---
@@ -18,7 +18,7 @@ Azure IoT Edge is a device-focused runtime that enables you to deploy, run, and
 
 Analytics drives business value in IoT solutions, but not all analytics need to be in the cloud. Azure IoT Edge helps you bring the analytical power of the cloud closer to your devices to drive better business insights and enable offline decision making. For example, you can run anomaly detection workloads at the edge to respond as quickly as possible to emergencies happening on a production line. If you want to reduce bandwidth costs and avoid transferring terabytes of raw data, you can clean and aggregate the data locally then only send the insights to the cloud for analysis.
 
-Azure IoT Edge is a feature of [Azure IoT Hub](../iot-hub/iot-concepts-and-iot-hub.md) and enables you to scale out and manage an IoT solution from the cloud. By packaging your business logic into standard containers and using optional pre-built [IoT Edge modules from the Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/category/internet-of-things?page=1&subcategories=iot-edge-modules) you can easily compose, deploy, and maintain your solution.
+Azure IoT Edge is a feature of [Azure IoT Hub](../iot-hub/iot-concepts-and-iot-hub.md) and enables you to scale out and manage an IoT solution from the cloud. By packaging your business logic into standard containers and using optional pre-built IoT Edge module images from partners or the [Microsoft Artifact Registry](https://mcr.microsoft.com/catalog?cat=IoT%20Edge%20Modules&alphaSort=asc&alphaSortKey=Name), you can easily compose, deploy, and maintain your solution.
 
 Azure IoT Edge is made up of three components:
 
@@ -35,7 +35,7 @@ IoT Edge modules are units of execution, implemented as Docker-compatible contai
 
 ### Artificial intelligence at the edge
 
-Azure IoT Edge allows you to deploy complex event processing, machine learning, image recognition, and other high value AI without writing it in-house. Azure services like Azure Stream Analytics and Azure Machine Learning can all be run on-premises via Azure IoT Edge. You're not limited to Azure services, though. Anyone is able to create AI modules for your own use or optionally make them available to the community through the Azure Marketplace.
+Azure IoT Edge allows you to deploy complex event processing, machine learning, image recognition, and other high value AI without writing it in-house. Azure services like Azure Stream Analytics and Azure Machine Learning can all be run on-premises via Azure IoT Edge. You're not limited to Azure services, though. Anyone is able to create AI modules for your own use.
 
 ### Bring your own code
 

articles/iot-edge/how-to-collect-and-transport-metrics.md

@@ -58,9 +58,7 @@ To configure monitoring on your IoT Edge device, follow the [Tutorial: Monitor I
 
 A Microsoft-supplied metrics-collector module can be added to an IoT Edge deployment to collect module metrics and send them to Azure Monitor. The module code is open-source and available in the [IoT Edge GitHub repo](https://github.com/Azure/iotedge/tree/main/edge-modules/metrics-collector).
 
-The metrics-collector module is provided as a multi-arch Docker container image that supports Linux X64, ARM32, ARM64, and Windows X64 (version 1809). It's publicly available at **[`mcr.microsoft.com/azureiotedge-metrics-collector`](https://aka.ms/edgemon-metrics-collector)**.
-
-It also available in the [IoT Edge Module Marketplace](https://aka.ms/edgemon-module-marketplace).
+The metrics-collector module is provided as a multi-arch Docker container image that supports Linux X64, ARM32, ARM64, and Windows X64 (version 1809). It's publicly available at [`mcr.microsoft.com/azureiotedge-metrics-collector`](https://mcr.microsoft.com/product/azureiotedge-metrics-collector/tags).
 
 ## Metrics collector configuration
 

articles/iot-edge/how-to-configure-api-proxy-module.md

@@ -5,7 +5,7 @@ description: Learn how to customize the API proxy module for IoT Edge gateway hi
 author: PatAltimore
 
 ms.author: patricka
-ms.date: 07/06/2023
+ms.date: 06/12/2024
 ms.topic: conceptual
 ms.service: iot-edge
 services: iot-edge
@@ -29,9 +29,7 @@ Without the API proxy, each service module would have to bind to a separate port
 
 ## Deploy the proxy module
 
-The API proxy module is available from the Microsoft Container Registry (MCR): `mcr.microsoft.com/azureiotedge-api-proxy:1.1`.
-
-You can also deploy the API proxy module directly from the Azure Marketplace: [IoT Edge API Proxy](https://azuremarketplace.microsoft.com/marketplace/apps/azure-iot.azureiotedge-api-proxy?tab=Overview).
+The API proxy module is available from the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azureiotedge-api-proxy/tags) and the image URI is `mcr.microsoft.com/azureiotedge-api-proxy:latest`. You can deploy the module using the [Azure portal](how-to-deploy-modules-portal.md) or [Azure CLI](how-to-deploy-modules-cli.md).
 
 ## Understand the proxy module
 

articles/iot-edge/how-to-connect-downstream-iot-edge-device.md

@@ -607,10 +607,19 @@ The API proxy module was designed to be customized to handle most common gateway
 1. Select **Devices** under the **Device management** menu.
 1. Select the top layer IoT Edge device that you're configuring from the list.
 1. Select **Set modules**.
-1. In the **IoT Edge modules** section, select **Add** then choose **Marketplace module**.
-1. Search for and select the **IoT Edge API Proxy** module.
-1. Select the name of the API proxy module from the list of deployed modules and update the following module settings:
-   1. In the **Environment variables** tab, update the value of **NGINX_DEFAULT_PORT** to `443`.
+1. In the **IoT Edge modules** section, select **Add** then choose **IoT Edge Module**.
+1. Update the following module settings:
+
+    | Setting            | Value                                             |
+    |--------------------|---------------------------------------------------|
+    | IoT Module name    | `IoTEdgeAPIProxy`                                 |
+    | Image URI          | `mcr.microsoft.com/azureiotedge-api-proxy:latest` |
+    | Restart policy     | always                                            |
+    | Desired status     | running                                           |
+
+    If you want to use a different version or architecture of the API proxy module, find the available images in the [Microsoft Artifact Registry](https://mcr.microsoft.com/product/azureiotedge-api-proxy).
+
+   1. In the **Environment variables** tab, add a variable named  `NGINX_DEFAULT_PORT` of type *Text* with a value of `443`.
    1. In the **Container create options** tab, update the port bindings to reference port 443.
 
       ```json
@@ -628,8 +637,8 @@ The API proxy module was designed to be customized to handle most common gateway
       ```
 
    These changes configure the API proxy module to listen on port 443. To prevent port binding collisions, you need to configure the edgeHub module to not listen on port 443. Instead, the API proxy module will route any edgeHub traffic on port 443.
-
-1. Select **Runtime Settings** and find the edgeHub module create options. Delete the port binding for port 443, leaving the bindings for ports 5671 and 8883.
+1. Select **Add** to add the module to the deployment.
+1. Select **Runtime Settings** and find the edgeHub module *Container Create Options*. Delete the port binding for port 443, leaving the bindings for ports 5671 and 8883.
 
    ```json
    {
@@ -650,34 +659,39 @@ The API proxy module was designed to be customized to handle most common gateway
    }
    ```
 
-1. Select **Save** to save your changes to the runtime settings.
-1. Select **Add** again, then choose **IoT Edge module**.
-1. Provide the following values to add the Docker registry module to your deployment:
-   1. **IoT Edge module name**: `registry`
-   1. On the **Module settings** tab, **Image URI**: `registry:latest`
-   1. On the **Environment variables** tab, add the following environment variables:
+1. Select **Apply** to save your changes to the runtime settings.
+1. Provide the following values to add the Docker registry module to your deployment. 
 
-      * **Name**: `REGISTRY_PROXY_REMOTEURL` **Value**: The URL for the container registry you want this registry module to map to. For example, `https://myregistry.azurecr`.
+    1. In the **IoT Edge modules** section, select **Add** then choose **IoT Edge Module**.
 
-        The registry module can only map to one container registry, so we recommend having all container images in a single private container registry.
+        | Setting            | Value                                             |
+        |--------------------|---------------------------------------------------|
+        | IoT Module name    | `registry`                                        |
+        | Image URI          | `registry:latest`                                 |
+        | Restart policy     | `always`                                          |
+        | Desired status     | `running`                                         |
 
-      * **Name**: `REGISTRY_PROXY_USERNAME` **Value**: Username to authenticate to the container registry.
+    1. In the **Environment variables** tab, add the following variables:
 
-      * **Name**: `REGISTRY_PROXY_PASSWORD` **Value**: Password to authenticate to the container registry.
+        | Name                   | Type  | Value                                                   |
+        |------------------------|-------|---------------------------------------------------------|
+        | `REGISTRY_PROXY_REMOTEURL` | Text  | The URL for the container registry you want this registry module to map to. For example, `https://myregistry.azurecr`. The registry module can only map to one container registry, so we recommend having all container images in a single private container registry.|
+        | `REGISTRY_PROXY_USERNAME`  | Text  | Username to authenticate to the container registry. |
+        | `REGISTRY_PROXY_PASSWORD`  | Text  | Password to authenticate to the container registry. |
 
-   1. On the **Container create options** tab, paste:
+    1. In the **Container create options** tab, update the port bindings to reference port 5000.
 
       ```json
       {
-          "HostConfig": {
-              "PortBindings": {
-                  "5000/tcp": [
-                      {
-                          "HostPort": "5000"
-                      }
-                  ]
+        "HostConfig": {
+          "PortBindings": {
+            "5000/tcp": [
+              {
+                "HostPort": "5000"
               }
+            ]
           }
+        }
       }
       ```
 
@@ -839,11 +853,19 @@ The API proxy module was designed to be customized to handle most common gateway
 1. Select **Devices** under the **Device management** menu.
 1. Select the lower layer IoT Edge device that you're configuring from the list.
 1. Select **Set modules**.
-1. In the **IoT Edge modules** section, select **Add** then choose **Marketplace module**.
-1. Search for and select the **IoT Edge API Proxy** module.
-1. Select the name of the API proxy module from the list of deployed modules and update the following module settings:
-   1. In the **Module settings** tab, update the value of **Image URI**. Replace `mcr.microsoft.com` with `$upstream:443`.
-   1. In the **Environment variables** tab, update the value of **NGINX_DEFAULT_PORT** to `443`.
+1. In the **IoT Edge modules** section, select **Add** then choose **IoT Edge Module**.
+1. Update the following module settings:
+
+    | Setting            | Value                                             |
+    |--------------------|---------------------------------------------------|
+    | IoT Module name    | `IoTEdgeAPIProxy`                                 |
+    | Image URI          | `mcr.microsoft.com/azureiotedge-api-proxy:latest` |
+    | Restart policy     | `always`                                          |
+    | Desired status     | `running`                                         |
+
+    If you want to use a different version or architecture of the API proxy module, find the available images in the [Microsoft Artifact Registry](https://mcr.microsoft.com/product/azureiotedge-api-proxy).
+
+   1. In the **Environment variables** tab, add a variable named  `NGINX_DEFAULT_PORT` of type *Text* with a value of `443`.
    1. In the **Container create options** tab, update the port bindings to reference port 443.
 
       ```json
@@ -890,7 +912,7 @@ The API proxy module was designed to be customized to handle most common gateway
 1. Update the edgeAgent module settings:
    1. In the **Image** field, replace `mcr.microsoft.com` with `$upstream:443`.
 
-1. Select **Save** to save your changes to the runtime settings.
+1. Select **Apply** to save your changes to the runtime settings.
 1. Select **Next: Routes** to go to the next step.
 1. To enable device-to-cloud messages from downstream devices to reach IoT Hub, include a route that passes all messages to `$upstream`. The upstream parameter points to the parent device in the case of lower layer devices. For example:
     1. **Name**: `Route`

articles/iot-edge/how-to-deploy-at-scale.md

@@ -3,7 +3,7 @@ title: Deploy modules at scale in Azure portal - Azure IoT Edge
 description: Use the Azure portal to create automatic deployments for groups of IoT Edge devices
 author: PatAltimore
 ms.author: patricka
-ms.date: 06/03/2024
+ms.date: 06/12/2024
 ms.topic: conceptual
 ms.service: iot-edge
 services: iot-edge
@@ -68,10 +68,9 @@ To add custom code as a module, or to manually add an Azure service module, foll
 
 1. In the **Container Registry Settings** section of the page, provide the credentials to access any private container registries that contain your module images.
 1. In the **IoT Edge Modules** section of the page, select **Add**.
-1. Choose one of the three types of modules from the drop-down menu:
+1. Choose one of the types of modules from the drop-down menu:
 
-   * **IoT Edge Module** - You provide the module name and container image URI. For example, the image URI for the sample SimulatedTemperatureSensor module is `mcr.microsoft.com/azureiotedge-simulated-temperature-sensor:1.0`. If the module image is stored in a private container registry, add the credentials on this page to access the image.
-   * **Marketplace Module** - Modules hosted in the Azure Marketplace. Some marketplace modules require additional configuration, so review the module details in the [Azure Marketplace IoT Edge Modules](https://azuremarketplace.microsoft.com/marketplace/apps/category/internet-of-things?page=1&subcategories=iot-edge-modules) list.
+   * **IoT Edge Module** - You provide the module name and container image URI. For example, the image URI for the sample SimulatedTemperatureSensor module is `mcr.microsoft.com/azureiotedge-simulated-temperature-sensor:1.0`. For a list of Microsoft IoT Edge module images, see the [Microsoft Artifact Registry](https://mcr.microsoft.com/catalog?cat=IoT%20Edge%20Modules&alphaSort=asc&alphaSortKey=Name).
    * **Azure Stream Analytics Module** - Modules generated from an Azure Stream Analytics workload.
 
 1. If needed, repeat steps 2 and 3 to add additional modules to your deployment.

articles/iot-edge/how-to-deploy-blob.md

@@ -48,8 +48,6 @@ A deployment manifest is a JSON document that describes which modules to deploy,
 
 2. On the **Settings** tab, provide a name for the module and then specify the container image URI:
 
-   Examples:
-  
    - **IoT Edge Module Name**: `azureblobstorageoniotedge`
    - **Image URI**: `mcr.microsoft.com/azure-blob-storage:latest`
 
@@ -58,7 +56,7 @@ A deployment manifest is a JSON document that describes which modules to deploy,
    Don't select **Add** until you've specified values on the **Module Settings**, **Container Create Options**, and  **Module Twin Settings** tabs as described in this procedure.
 
    > [!IMPORTANT]
-   > Azure IoT Edge is case-sensitive when you make calls to modules, and the Storage SDK also defaults to lowercase. Although the name of the module in the [Azure Marketplace](how-to-deploy-modules-portal.md#deploy-modules-from-azure-marketplace) is **AzureBlobStorageonIoTEdge**, changing the name to lowercase helps to ensure that your connections to the Azure Blob Storage on IoT Edge module aren't interrupted.
+   > Azure IoT Edge is case-sensitive when you make calls to modules, and the Storage SDK also defaults to lowercase. Changing the name to lowercase helps to ensure that your connections to the Azure Blob Storage on IoT Edge module aren't interrupted.
 
 3. Open the **Container Create Options** tab.