diff --git a/windows/deployment/do/images/cachenodename.png b/windows/deployment/do/images/mcc-isp-cache-node-name.png similarity index 100% rename from windows/deployment/do/images/cachenodename.png rename to windows/deployment/do/images/mcc-isp-cache-node-name.png diff --git a/windows/deployment/do/images/createcachenode.png b/windows/deployment/do/images/mcc-isp-create-cache-node.png similarity index 100% rename from windows/deployment/do/images/createcachenode.png rename to windows/deployment/do/images/mcc-isp-create-cache-node.png diff --git a/windows/deployment/do/images/numbereddeploymcc.png b/windows/deployment/do/images/mcc-isp-deploy-cache-node-numbered.png similarity index 100% rename from windows/deployment/do/images/numbereddeploymcc.png rename to windows/deployment/do/images/mcc-isp-deploy-cache-node-numbered.png diff --git a/windows/deployment/do/images/verification.png b/windows/deployment/do/images/mcc-isp-operator-verification.png similarity index 100% rename from windows/deployment/do/images/verification.png rename to windows/deployment/do/images/mcc-isp-operator-verification.png diff --git a/windows/deployment/do/images/numberedprovmcc.png b/windows/deployment/do/images/mcc-isp-provision-cache-node-numbered.png similarity index 100% rename from windows/deployment/do/images/numberedprovmcc.png rename to windows/deployment/do/images/mcc-isp-provision-cache-node-numbered.png diff --git a/windows/deployment/do/images/searchmcc.png b/windows/deployment/do/images/mcc-isp-search.png similarity index 100% rename from windows/deployment/do/images/searchmcc.png rename to windows/deployment/do/images/mcc-isp-search.png diff --git a/windows/deployment/do/images/signup1.png b/windows/deployment/do/images/mcc-isp-sign-up.png similarity index 100% rename from windows/deployment/do/images/signup1.png rename to windows/deployment/do/images/mcc-isp-sign-up.png diff --git a/windows/deployment/do/index.yml b/windows/deployment/do/index.yml index 5e3b777e78..eff4b41443 100644 --- a/windows/deployment/do/index.yml +++ b/windows/deployment/do/index.yml @@ -79,7 +79,7 @@ landingContent: linkLists: - linkListType: deploy links: - - text: MCC for ISPs (Private Preview) + - text: MCC for ISPs (Early Preview) url: mcc-isp.md - text: Sign up url: https://aka.ms/MSConnectedCacheSignup diff --git a/windows/deployment/do/mcc-enterprise-appendix.md b/windows/deployment/do/mcc-enterprise-appendix.md index 2ed2ae5b71..161cfa9e27 100644 --- a/windows/deployment/do/mcc-enterprise-appendix.md +++ b/windows/deployment/do/mcc-enterprise-appendix.md @@ -14,7 +14,7 @@ ms.topic: article ## Diagnostics Script -If you're having issues with your MCC, we included a diagnostics script which will collect all your logs and zip them into a single file. You can then send us these logs via email for the MCC team to debug. +If you're having issues with your MCC, we included a diagnostics script. The script collects all your logs and zips them into a single file. You can then send us these logs via email for the MCC team to debug. To run this script: @@ -29,18 +29,18 @@ To run this script: .\collectMccDiagnostics.ps1 ``` -1. The script stores all the debug files into a folder and then creates a tar file. After the script is finished running, it will output the path of the tar file which you can share with us. The location should be **\**\mccdiagnostics\support_bundle_\$timestamp.tar.gz +1. The script stores all the debug files into a folder and then creates a tar file. After the script is finished running, it will output the path of the tar file, which you can share with us. The location should be **\**\mccdiagnostics\support_bundle_\$timestamp.tar.gz 1. [Email the MCC team](mailto:mccforenterprise@microsoft.com?subject=Debugging%20Help%20Needed%20for%20MCC%20for%20Enterprise) and attach this file asking for debugging support. Screenshots of the error along with any other warnings you saw will be helpful during out debugging process. ## Steps to obtain an Azure Subscription ID 1. Sign in to https://portal.azure.com/ and navigate to the Azure services section. -1. Click on **Subscriptions**. If you do not see **Subscriptions**, click on the **More Services** arrow and search for **Subscriptions**. -1. If you already have an Azure Subscription, skip to step 5. If you do not have an Azure Subscription, select **+ Add** on the top left. +1. Select **Subscriptions**. If you don't see **Subscriptions**, select the **More Services** arrow and search for **Subscriptions**. +1. If you already have an Azure Subscription, skip to step 5. If you don't have an Azure Subscription, select **+ Add** on the top left. 1. Select the **Pay-As-You-Go** subscription. You'll be asked to enter credit card information, but you'll not be charged for using the MCC service. -1. On the **Subscriptions** blade, you'll find details about your current subscription. Click on the subscription name. -1. After you select the subscription name, you'll find the subscription ID in the **Overview** tab. Click on the **Copy to clipboard** icon next to your Subscription ID to copy the value. +1. On the **Subscriptions** page, you'll find details about your current subscription. Select the subscription name. +1. After you select the subscription name, you'll find the subscription ID in the **Overview** tab. Select the **Copy to clipboard** icon next to your Subscription ID to copy the value. ## Troubleshooting @@ -60,7 +60,7 @@ communication operations. The runtime performs several functions: - Reports module (Docker containers) health to the cloud for remote monitoring. - Manages communication between an IoT Edge device and the cloud. -For more information on Azure IoT Edge, please see the [Azure IoT Edge documentation](/azure/iot-edge/about-iot-edge). +For more information on Azure IoT Edge, see the [Azure IoT Edge documentation](/azure/iot-edge/about-iot-edge). ## EFLOW @@ -97,7 +97,7 @@ You can either set your MCC IP address or FQDN using: 1. In Windows (release version 1809 and later), you can apply the policy via Group Policy Editor. The policy to apply is **DOCacheHost**. To configure the clients to pull content from the MCC using Group Policy, go to **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Delivery Optimization**. Set the **Cache Server Hostname** to the IP address of your MCC, such as `10.137.187.38`. - :::image type="content" source="./images/ent-mcc-group-policy-hostname.png" alt-text="Screenshot of the Group Policy editor showing the Cache Server Hostname Group Policy setting."::: + :::image type="content" source="./images/ent-mcc-group-policy-hostname.png" alt-text="Screenshot of the Group Policy editor showing the Cache Server Hostname Group Policy setting." lightbox="./images/ent-mcc-group-policy-hostname.png"::: **Verify Content using the DO Client** @@ -113,7 +113,7 @@ To verify that the Delivery Optimization client can download content using MCC, - Using the PowerShell Cmdlet Get-DeliveryOptimizationStatus you should see *BytesFromCacheServer*. - :::image type="content" source="./images/ent-mcc-get-deliveryoptimizationstatus.png" alt-text="Screenshot of the output of Get-DeliveryOptimization | FT from PowerShell."::: + :::image type="content" source="./images/ent-mcc-get-deliveryoptimizationstatus.png" alt-text="Screenshot of the output of Get-DeliveryOptimization | FT from PowerShell." lightbox="./images/ent-mcc-get-deliveryoptimizationstatus.png"::: - Using the Delivery Optimization Activity Monitor diff --git a/windows/deployment/do/mcc-enterprise-deploy.md b/windows/deployment/do/mcc-enterprise-deploy.md index 082884302b..b2d40ab1f0 100644 --- a/windows/deployment/do/mcc-enterprise-deploy.md +++ b/windows/deployment/do/mcc-enterprise-deploy.md @@ -47,7 +47,7 @@ The MCC Azure management portal is used to create and manage MCC nodes. An Azure Once you take the survey above and the MCC team adds your subscription ID to the allowlist, you'll be given a link to the Azure portal where you can create the resource described below. 1. In the Azure portal home page, choose **Create a resource**: - :::image type="content" source="./images/ent-mcc-create-azure-resource.png" alt-text="Screenshot of the Azure portal with the create a resource option outlined in red."::: + :::image type="content" source="./images/ent-mcc-create-azure-resource.png" alt-text="Screenshot of the Azure portal. The create a resource option is outlined in red."::: 1. Type **Microsoft Connected Cache** into the search box, and hit **Enter** to show search results. @@ -87,7 +87,7 @@ Once you take the survey above and the MCC team adds your subscription ID to the ### Create an MCC node in Azure -Creating an MCC node is a multi-step process and the first step is to access the MCC private preview management portal. +Creating an MCC node is a multi-step process and the first step is to access the MCC early preview management portal. 1. After the successful resource creation, select **Go to resource**. 1. Under **Cache Node Management** section on the leftmost panel, select **Cache Nodes**. @@ -250,7 +250,7 @@ Connect to the EFLOW VM and check if MCC is properly running: :::image type="content" source="./images/ent-mcc-connect-eflowvm.png" alt-text="Screenshot of running connect-EflowVm, sudo -s, and iotedge list from PowerShell." lightbox="./images/ent-mcc-connect-eflowvm.png"::: -You should see MCC, edgeAgent, and edgeHub running. If you see edgeAgent or edgeHub but not MCC, please try this command in a few minutes. The MCC container can take a few minutes to deploy. +You should see MCC, edgeAgent, and edgeHub running. If you see edgeAgent or edgeHub but not MCC, try this command in a few minutes. The MCC container can take a few minutes to deploy. #### Verify server side @@ -282,7 +282,7 @@ For an [Intune](/mem/intune/) deployment, create a **Configuration Profile** and #### PowerShell issues -If you're seeing errors similar to this: `The term Get- isn't recognized as the name of a cmdlet, function, script file, or operable program.` +If you're seeing errors similar to this error: `The term Get- isn't recognized as the name of a cmdlet, function, script file, or operable program.` 1. Ensure you're running Windows PowerShell version 5.x. diff --git a/windows/deployment/do/mcc-enterprise-update-uninstall.md b/windows/deployment/do/mcc-enterprise-update-uninstall.md index 4b71e94c9d..60d0df68e3 100644 --- a/windows/deployment/do/mcc-enterprise-update-uninstall.md +++ b/windows/deployment/do/mcc-enterprise-update-uninstall.md @@ -11,36 +11,35 @@ ms.topic: article --- # Update or uninstall Microsoft Connected Cache for Enterprise and Education +Throughout the preview phase, we'll send you security and feature updates for MCC. Follow these steps to perform the update. ## Update MCC -Throughout the preview phase, we'll send you security and feature updates for MCC. Follow these steps to perform the update. - Run the following command with the **arguments** we provided in the email to update your MCC: ```powershell # .\updatemcc.ps1 version="**\**" tenantid="**\**" customerid="**\**" cachenodeid="**\**" customerkey="**\**" ``` + For example: + ```powershell # .\updatemcc.ps1 version="msconnectedcacheprod.azurecr.io/mcc/linux/iot/mcc-ubuntu-iot-amd64:1.2.1.659" tenantid="799a999aa-99a1-99aa-99aa-9a9aa099db99" customerid="99a999aa-99a1-99aa-99aa-9aaa9aaa0saa" cachenodeid=" aa99aaaa-999a-9aas-99aa99daaa99 " customerkey="a99d999a-aaaa-aa99-0999aaaa99a" ``` ## Uninstall MCC -Please contact the MCC Team before uninstalling to let us know if you're facing -issues. +Please contact the MCC Team before uninstalling to let us know if you're facing issues. -This script will remove the following: +This script will remove the following items: -1. EFLOW + Linux VM -1. IoT Edge -1. Edge Agent -1. Edge Hub -1. MCC -1. Moby CLI -1. Moby Engine +1. EFLOW + Linux VM +1. IoT Edge +1. Edge Agent +1. Edge Hub +1. MCC +1. Moby CLI +1. Moby Engine To delete MCC, go to Control Panel \> Uninstall a program \> Select Azure IoT Edge LTS \> Uninstall - \ No newline at end of file diff --git a/windows/deployment/do/mcc-isp-create-provision-deploy.md b/windows/deployment/do/mcc-isp-create-provision-deploy.md index 9183c76dd9..c5bba89b3c 100644 --- a/windows/deployment/do/mcc-isp-create-provision-deploy.md +++ b/windows/deployment/do/mcc-isp-create-provision-deploy.md @@ -31,11 +31,11 @@ This article outlines how to create, provision, and deploy your Microsoft Connec 1. Navigate to **Settings** > **Cache nodes** and select **Create Cache Node**. - :::image type="content" source="images/createcachenode.png" alt-text="Screenshot of the create cache node page in the Azure portal"::: + :::image type="content" source="images/mcc-isp-create-cache-node.png" alt-text="Screenshot of the cache node page in the Azure portal"::: 1. Provide a name for your cache node and select **Create** to create your cache node. - :::image type="content" source="images/cachenodename.png" alt-text="Screenshot of the create cache node page in the Azure portal, with the cache node name input field."::: + :::image type="content" source="images/mcc-isp-cache-node-name.png" alt-text="Screenshot of the create cache node page in the Azure portal, with the cache node name input field."::: ## Provision cache node @@ -61,7 +61,7 @@ BGP (Border Gateway Protocol) routing is another method offered for client routi 1. Navigate to **Settings** > **Cache nodes**. Select the cache node you wish to provision. - :::image type="content" source="images/numberedprovmcc.png" alt-text="Screenshot of the Azure portal depicting the cache node configuration page of a cache node. This screenshot shows all of the fields you can choose to configure the cache node."::: + :::image type="content" source="images/mcc-isp-provision-cache-node-numbered.png" alt-text="Screenshot of the Azure portal depicting the cache node configuration page of a cache node. This screenshot shows all of the fields you can choose to configure the cache node."::: 1. Enter the max allowable egress that your hardware can support. @@ -98,14 +98,14 @@ IoT Edge performs several functions important to manage MCC on your edge device: There are five IDs that the device provisioning script takes as input in order to successfully provision and install your cache server. The provisioning script will automatically include these keys, with no input necessary from the user. | ID | Description | -| -- | --- | +|---|---| | Customer ID | The Azure subscription ID that the cache node is created in. | | Cache node ID | The unique alphanumeric ID of the cache node being provisioned. | | Customer Key | | | Cache node name | The name of the cache node. | | Tenant ID | The unique ID associated with the Azure account. | -:::image type="content" source="images/numbereddeploymcc.png" alt-text="Screenshot of the server provisioning tab within cache node configuration in Azure portal."::: +:::image type="content" source="images/mcc-isp-deploy-cache-node-numbered.png" alt-text="Screenshot of the server provisioning tab within cache node configuration in Azure portal."::: 1. After completing cache node provisioning, navigate to the **Server provisioning** tab. Select **Download provisioning package** to download the installation package to your server. @@ -120,7 +120,7 @@ There are five IDs that the device provisioning script takes as input in order t ## General configuration fields | Field Name | Expected Value| Description | -| -- | --- | --- | +|---|---|---| | **Cache node name** | Alphanumeric string that contains no spaces | The name of the cache node. You may choose names based on location like Seattle-1. This name must be unique and can't be changed later. | | **Server IP address** | IPv4 address | IP address of your MCC server. This address is used to route end-user devices in your network to the server for Microsoft content downloads. The IP address must be publicly accessible. | | **Max allowable egress (Mbps)** | Integer in Mbps | The maximum egress (Mbps) of your MCC based on the specifications of your hardware. For example, 10,000 Mbps.| @@ -129,14 +129,14 @@ There are five IDs that the device provisioning script takes as input in order t ### Storage fields | Field Name | Expected Value| Description | -| -- | --- | --- | +|---|---|---| | **Cache drive** | File path string | Up to 9 drives can be configured for each cache node to configure cache storage. Enter the file path to each drive. For example: /dev/folder/ | | **Cache drive size in gigabytes** | Integer in GB | Set the size of each drive configured for the cache node. | ### Client routing fields | Field Name | Expected Value| Description | -| -- | --- | --- | +|---|---|---| | **Manual routing - Address range/CIDR blocks** | IPv4 CIDR notation | The IP address range (CIDR blocks) that should be routed to the MCC server as a comma separated list. For example: 2.21.234.0/24, 3.22.235.0/24, 4.23.236.0/24 | | **BGP - Neighbor ASN** | ASN | When configuring BGP, enter the ASN(s) of your neighbors that you want to establish. | | **BGP - Neighbor IP address** | IPv4 address | When configuring BGP, enter the IP address(es) of neighbors that you want to establish. | diff --git a/windows/deployment/do/mcc-isp-signup.md b/windows/deployment/do/mcc-isp-signup.md index a61d206e84..8350df7459 100644 --- a/windows/deployment/do/mcc-isp-signup.md +++ b/windows/deployment/do/mcc-isp-signup.md @@ -26,7 +26,7 @@ This article details the process of signing up for Microsoft Connected Cache for 1. Navigate to the [Azure portal](https://www.portal.azure.com). In the top search bar, search for **Microsoft Connected Cache**. -:::image type="content" source="./images/searchmcc.png" alt-text="Screenshot of the Azure portal that shows the Microsoft Connected Cache resource in Azure marketplace."::: +:::image type="content" source="./images/mcc-isp-search.png" alt-text="Screenshot of the Azure portal that shows the Microsoft Connected Cache resource in Azure marketplace."::: 1. Select **Create** to create a **Microsoft Connected Cache**. When prompted, enter a name for your cache resource. @@ -35,14 +35,14 @@ This article details the process of signing up for Microsoft Connected Cache for 1. Navigate to **Settings** > **Sign up**. Enter your organization ASN. Indicate whether you're a transit provider. If so, additionally, include any ASN(s) for downstream network operators that you may transit traffic for. - :::image type="content" source="./images/signup1.png" alt-text="Screenshot of the sign up page in the Microsoft Connected Cache resource page in Azure portal."::: + :::image type="content" source="./images/mcc-isp-sign-up.png" alt-text="Screenshot of the sign up page in the Microsoft Connected Cache resource page in Azure portal."::: 1. Once we verify the information entered, a verification code will be sent to the NOC email address provided on [Peering DB](https://www.peeringdb.com/). Once you receive the email, navigate to your Azure portal > **Microsoft Connected Cache** > **Settings** > **Verify operator**, and enter the verification code sent to the NOC email address. > [!NOTE] > Verification codes expire in 24 hours. You will need to generate a new code if it expires. - :::image type="content" source="images/verification.png" alt-text="Screenshot of the sign up verification page on Azure portal for Microsoft Connected Cache."::: + :::image type="content" source="images/mcc-isp-operator-verification.png" alt-text="Screenshot of the sign up verification page on Azure portal for Microsoft Connected Cache."::: 1. Once verified, follow the instructions in [Create, provision, and deploy cache node](mcc-isp-create-provision-deploy.md) to create your cache node. diff --git a/windows/deployment/do/waas-microsoft-connected-cache.md b/windows/deployment/do/waas-microsoft-connected-cache.md index 9e17f4b740..c6dc879a40 100644 --- a/windows/deployment/do/waas-microsoft-connected-cache.md +++ b/windows/deployment/do/waas-microsoft-connected-cache.md @@ -22,13 +22,13 @@ ms.custom: seo-marvel-apr2020 - Windows 11 > [!IMPORTANT] -> Microsoft Connected Cache is currently a private preview feature. During this phase we invite customers to take part in early access for testing purposes. This phase does not include formal support, and should not be used for production workloads. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). +> Microsoft Connected Cache is currently an early preview feature. During this phase we invite customers to take part in early access for testing purposes. This phase does not include formal support, and should not be used for production workloads. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Microsoft Connected Cache (MCC) preview is a software-only caching solution that delivers Microsoft content within Enterprise networks. MCC can be deployed to as many bare-metal servers or VMs as needed, and is managed from a cloud portal. Cache nodes are created in the cloud portal and are configured by applying the client policy using management tools such as Intune. -MCC is a hybrid (mix of on-prem and cloud resources) SaaS solution built as an Azure IoT Edge module and Docker compatible Linux container deployed to your Windows devices. The Delivery Optimization team chose IoT Edge for Linux on Windows (EFLOW) as a secure, reliable container management infrastructure. EFLOW is a Linux virtual machine, based on Microsoft's first party CBL-Mariner operating system. It’s built with the IoT Edge runtime and validated as a tier 1 supported environment for IoT Edge workloads. MCC will be a Linux IoT Edge module running on the Windows Host OS. +MCC is a hybrid (mix of on-premises and cloud resources) SaaS solution built as an Azure IoT Edge module and Docker compatible Linux container deployed to your Windows devices. The Delivery Optimization team chose IoT Edge for Linux on Windows (EFLOW) as a secure, reliable container management infrastructure. EFLOW is a Linux virtual machine, based on Microsoft's first party CBL-Mariner operating system. It’s built with the IoT Edge runtime and validated as a tier 1 supported environment for IoT Edge workloads. MCC will be a Linux IoT Edge module running on the Windows Host OS. -Even though your MCC scenario is not related to IoT, Azure IoT Edge is used as a more generic Linux container deployment and management infrastructure. The Azure IoT Edge runtime sits on your designated MCC device and performs management and communication operations. The runtime performs several functions important to manage MCC on your edge device: +Even though your MCC scenario isn't related to IoT, Azure IoT Edge is used as a more generic Linux container deployment and management infrastructure. The Azure IoT Edge runtime sits on your designated MCC device and performs management and communication operations. The runtime performs several functions important to manage MCC on your edge device: 1. Installs and updates MCC on your edge device. 1. Maintains Azure IoT Edge security standards on your edge device. @@ -37,7 +37,7 @@ Even though your MCC scenario is not related to IoT, Azure IoT Edge is used as a To deploy a functional MCC to your device, you must obtain the necessary keys to provision the Connected Cache instance that communicates with Delivery Optimization services, and enable the device to cache and deliver content. The architecture of MCC is described below. -For more details information on Azure IoT Edge, please see the Azure IoT Edge [documentation](/azure/iot-edge/about-iot-edge). +For more information on Azure IoT Edge, see the Azure IoT Edge [documentation](/azure/iot-edge/about-iot-edge). ## How MCC Works @@ -51,12 +51,11 @@ For more details information on Azure IoT Edge, please see the Azure IoT Edge [d The following diagram displays and overview of how MCC functions: -![MCC Overview](images/waas-mcc-diag-overview.png#lightbox) +:::image type="content" source="./images/waas-mcc-diag-overview.png" alt-text="Diagram displaying the components of MCC." lightbox="./images/waas-mcc-diag-overview.png"::: + + + +## Next steps -For more information about MCC, see the following articles: - [Microsoft Connected Cache for Enterprise and Education](mcc-enterprise-overview.md) - [Microsoft Connected Cache for ISPs](mcc-isp.md) - -## Also see - -[Introducing Microsoft Connected Cache](https://techcommunity.microsoft.com/t5/windows-it-pro-blog/introducing-microsoft-connected-cache-microsoft-s-cloud-managed/ba-p/963898)