diff --git a/.openpublishing.redirection.windows-deployment.json b/.openpublishing.redirection.windows-deployment.json index 09479f4eca..5d117ed99e 100644 --- a/.openpublishing.redirection.windows-deployment.json +++ b/.openpublishing.redirection.windows-deployment.json @@ -1660,6 +1660,26 @@ "redirect_url": "/previous-versions/windows/it-pro/windows-10/deployment/planning/windows-10-enterprise-faq-itpro", "redirect_document_id": false }, + { + "source_path": "windows/deployment/do/mcc-enterprise-appendix.md", + "redirect_url": "/windows/deployment/do/mcc-ent-early-preview", + "redirect_document_id": false + }, + { + "source_path": "windows/deployment/do/mcc-enterprise-deploy.md", + "redirect_url": "/windows/deployment/do/mcc-ent-early-preview", + "redirect_document_id": false + }, + { + "source_path": "windows/deployment/do/mcc-enterprise-prerequisites.md", + "redirect_url": "/windows/deployment/do/mcc-ent-early-preview", + "redirect_document_id": false + }, + { + "source_path": "windows/deployment/do/mcc-enterprise-update-uninstall.md", + "redirect_url": "/windows/deployment/do/mcc-ent-early-preview", + "redirect_document_id": false + }, { "source_path": "windows/deployment/planning/windows-10-deployment-considerations.md", "redirect_url": "/previous-versions/windows/it-pro/windows-10/deployment/planning/windows-10-deployment-considerations", diff --git a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md index cd2bf997f6..863938353d 100644 --- a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md +++ b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md @@ -37,7 +37,7 @@ If set to 1 then any MDM policy that's set that has an equivalent GP policy will > [!NOTE] -> MDMWinsOverGP only applies to policies in Policy CSP. MDM policies win over Group Policies where applicable; not all Group Policies are available via MDM or CSP. It does not apply to other MDM settings with equivalent GP settings that are defined in other CSPs such as the [Defender CSP](defender-csp.md). Nor does it apply to the [Update Policy CSP](policy-csp-update.md) for managing Windows updates. +> MDMWinsOverGP only applies to policies in Policy CSP. MDM policies win over Group Policies where applicable; not all Group Policies are available via MDM or CSP. It does not apply to other MDM settings with equivalent GP settings that are defined in other CSPs such as the [Defender CSP](defender-csp.md). This policy is used to ensure that MDM policy wins over GP when policy is configured on MDM channel. The default value is 0. The MDM policies in Policy CSP will behave as described if this policy value is set 1. diff --git a/windows/configuration/start/layout.md b/windows/configuration/start/layout.md index 30baa389a1..81f5d11c75 100644 --- a/windows/configuration/start/layout.md +++ b/windows/configuration/start/layout.md @@ -304,10 +304,10 @@ Column="2"/> You can use the `start:SecondaryTile` tag to pin a web link through a Microsoft Edge secondary tile. This method doesn't require more actions compared to the method of using legacy `.url` shortcuts (through the `start:DesktopApplicationTile` tag). -The following example shows how to create a tile of the Web site's URL using the Microsoft Edge secondary tile: +The following example shows how to create a tile of the Web site's URL using the Microsoft Edge secondary tile. Ensure to replace `<--Microsoft Edge AUMID-->` with the AUMID of Microsoft Edge (learn how to [Find the Application User Model ID of an installed app](../store/find-aumid.md)): ```XML - [!TIP] > > The boot images from the [ADK 10.1.26100.1 (May 2024)](/windows-hardware/get-started/adk-install) and later already contain the cumulative update to address the BlackLotus UEFI bootkit vulnerability. -This walkthrough describes how to customize a Windows PE boot image including updating with the latest cumulative update, adding drivers, and adding optional components. Additionally this walkthrough goes over how customizations in boot images affect several different popular products that utilize boot images, such as Microsoft Configuration Manager, Microsoft Deployment Toolkit (MDT), and Windows Deployment Services (WDS). +This walkthrough describes how to customize a Windows PE boot image, including updating with the latest cumulative update, adding drivers, and adding optional components. Additionally this walkthrough goes over how customizations in boot images affect several different popular products that utilize boot images, such as Microsoft Configuration Manager, Microsoft Deployment Toolkit (MDT), and Windows Deployment Services (WDS). ## Prerequisites @@ -332,7 +332,7 @@ The cumulative update installed later in this walkthrough doesn't affect drivers **Example**: ```powershell - Add-WindowsPackage -PackagePath "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\en-us\WinPE-Scripting_en-us.cab" -Path "C:\Mount" -Verbose + Add-WindowsPackage -PackagePath "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\amd64\WinPE_OCs\en-us\WinPE-Scripting_en-us.cab" -Path "C:\Mount" -Verbose ``` These examples assume a 64-bit boot image. If a different architecture is being used, then adjust the paths accordingly. @@ -668,7 +668,7 @@ For more information, see [copy](/windows-server/administration/windows-commands This step doesn't update or change the boot image. However, it makes sure that the latest bootmgr boot files are available to the Windows ADK when creating bootable media via the Windows ADK. When these files are updated in the Windows ADK, products that use the Windows ADK to create bootable media, such as **Microsoft Deployment Toolkit (MDT)**, also have access to the updated bootmgr boot files. -In particular, this step is needed when addressing the BlackLotus UEFI bootkit vulnerability as documented in [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932](https://prod.support.services.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d) and [CVE-2023-24932](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2023-24932). +In particular, this step is needed when addressing the BlackLotus UEFI bootkit vulnerability as documented in [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932](https://support.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d) and [CVE-2023-24932](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2023-24932). > [!TIP] > @@ -839,7 +839,7 @@ For more information, see [Modify a Windows image using DISM: Unmounting an imag --- 1. Once the export has completed: - + 1. Delete the original updated boot image: ### [:::image type="icon" source="images/icons/powershell-18.svg"::: **PowerShell**](#tab/powershell) @@ -1295,4 +1295,4 @@ For more information, see [Windows Server 2012 R2 Lifecycle](/lifecycle/products - [Create bootable Windows PE media: Update the Windows PE add-on for the Windows ADK](/windows-hardware/manufacture/desktop/winpe-create-usb-bootable-drive#update-the-windows-pe-add-on-for-the-windows-adk) - [Update Windows installation media with Dynamic Update: Update WinPE](/windows/deployment/update/media-dynamic-update#update-winpe) -- [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932: Updating bootable media](https://prod.support.services.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d?preview=true#updatebootable5025885) +- [KB5025885: How to manage the Windows Boot Manager revocations for Secure Boot changes associated with CVE-2023-24932: Updating bootable media](https://support.microsoft.com/topic/kb5025885-how-to-manage-the-windows-boot-manager-revocations-for-secure-boot-changes-associated-with-cve-2023-24932-41a975df-beb2-40c1-99a3-b3ff139f832d) diff --git a/windows/deployment/do/TOC.yml b/windows/deployment/do/TOC.yml index 097f3c1c5c..b9d7757f89 100644 --- a/windows/deployment/do/TOC.yml +++ b/windows/deployment/do/TOC.yml @@ -35,16 +35,40 @@ href: waas-microsoft-connected-cache.md - name: Microsoft Connected Cache for Enterprise and Education items: - - name: Connected Cache for Enterprise and Education Overview + - name: Connected Cache for Enterprise and Education overview href: mcc-ent-edu-overview.md - name: Requirements - href: mcc-enterprise-prerequisites.md - - name: Deploy Microsoft Connected Cache - href: mcc-enterprise-deploy.md - - name: Update or uninstall Connected Cache - href: mcc-enterprise-update-uninstall.md - - name: Appendix - href: mcc-enterprise-appendix.md + href: mcc-ent-prerequisites.md + - name: How-to guides + items: + - name: Create and configure Connected Cache resources and cache nodes + href: mcc-ent-create-resource-and-cache.md + - name: Deploy Connected Cache nodes to host machines + items: + - name: Deploy Connected Cache to Linux + href: mcc-ent-deploy-to-linux.md + - name: Deploy Connected Cache to Windows + href: mcc-ent-deploy-to-windows.md + - name: Use Azure CLI to manage Connected Cache + href: mcc-ent-manage-using-cli.md + - name: Verify Connected Cache node functionality + href: mcc-ent-verify-cache-node.md + - name: Monitor Connected Cache nodes + href: mcc-ent-monitoring.md + - name: Update Connected Cache nodes + href: mcc-ent-update-cache-node.md + - name: Uninstall Connected Cache nodes + href: mcc-ent-uninstall-cache-node.md + - name: Resources + items: + - name: Frequent Asked Questions + href: mcc-ent-faq.yml + - name: Troubleshooting + href: mcc-ent-troubleshooting.md + - name: Microsoft Connected Cache for Enterprise and Education early preview + href: mcc-ent-early-preview.md + - name: Release notes + href: mcc-ent-release-notes.md - name: Microsoft Connected Cache for ISPs items: - name: Connected Cache for ISPs Overview @@ -71,5 +95,4 @@ href: mcc-isp.md - name: Endpoints for Microsoft Connected Cache content and services href: delivery-optimization-endpoints.md - diff --git a/windows/deployment/do/images/mcc_ent_publicpreview.png b/windows/deployment/do/images/mcc_ent_publicpreview.png new file mode 100644 index 0000000000..6f6f292d58 Binary files /dev/null and b/windows/deployment/do/images/mcc_ent_publicpreview.png differ diff --git a/windows/deployment/do/index.yml b/windows/deployment/do/index.yml index 42eddd71c7..dc1e99b304 100644 --- a/windows/deployment/do/index.yml +++ b/windows/deployment/do/index.yml @@ -15,7 +15,7 @@ metadata: author: aczechowski ms.author: aaroncz manager: aaroncz - ms.date: 12/22/2023 #Required; mm/dd/yyyy format. + ms.date: 10/30/2024 #Required; mm/dd/yyyy format. ms.localizationpriority: medium # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new @@ -67,10 +67,12 @@ landingContent: linkLists: - linkListType: deploy links: - - text: Connected Cache for Enterprise and Education (early preview) - url: waas-microsoft-connected-cache.md - - text: Sign up - url: https://aka.ms/MSConnectedCacheSignup + - text: Connected Cache for Enterprise and Education overview + url: mcc-ent-edu-overview.md + - text: Connected Cache for Enterprise and Education requirements + url: mcc-ent-prerequisites.md + - text: Create the Microsoft Connected Cache Azure resource and cache nodes + url: mcc-ent-create-resource-and-cache.md # Card - title: Microsoft Connected Cache for Internet Service Providers (ISPs) @@ -79,8 +81,6 @@ landingContent: links: - text: Connected Cache for ISPs (public preview) url: mcc-isp-signup.md - - text: Sign up - url: https://aka.ms/MCCForISPSurvey - text: Connected Cache for ISPs (early preview) url: mcc-isp.md diff --git a/windows/deployment/do/mcc-ent-create-resource-and-cache.md b/windows/deployment/do/mcc-ent-create-resource-and-cache.md new file mode 100644 index 0000000000..bae29c6ffa --- /dev/null +++ b/windows/deployment/do/mcc-ent-create-resource-and-cache.md @@ -0,0 +1,348 @@ +--- +title: Create and configure Microsoft Connected Cache nodes +description: Details on how to create and configure Microsoft Connected Cache for Enterprise and Education cache nodes. +ms.service: windows-client +ms.subservice: itpro-updates +ms.topic: how-to +manager: naengler +ms.author: nidos +author: doshnid +appliesto: +- ✅ Windows 11 +- ✅ Supported Linux distributions +- ✅ Microsoft Connected Cache for Enterprise +ms.date: 10/30/2024 +--- + +# Create Microsoft Connected Cache Azure resource and cache nodes + +This article outlines how to create and configure your Microsoft Connected Cache for Enterprise and Education cache nodes. The creation and configuration of your cache node takes place in Azure. The deployment of your cache node requires downloading and running an OS-specific provisioning package on your host machine. + +## Prerequisites + +1. **Azure Pay-As-You-Go subscription**: Microsoft Connected Cache is a free-of-charge service hosted in Azure. You'll need a pay-as-you-go Azure subscription in order to onboard to our service. To create a subscription, go to [pay-as-you-go subscription page](https://azure.microsoft.com/offers/ms-azr-0003p/). +2. **Hardware to host Connected Cache**: The recommended configuration serves approximately 35,000 managed devices, downloading a 2-GB payload in 24-hour timeframe at a sustained rate of 6.5 Gbps. + +For more information on sizing and OS requirements, see [the prerequisites for using Connected Cache](mcc-ent-prerequisites.md). + + +## Create Connected Cache Azure resource + +# [Azure portal](#tab/portal) + +1. In the [Azure portal](https://portal.azure.com), select **Create a Resource** and search for `Microsoft Connected Cache for Enterprise and Education`. + + +1. Select the Microsoft Connected Cache for Enterprise resource. When prompted, choose the subscription, resource group, and location for the resource. Then enter a name for the resource, then select Review + Create. + +1. After a few moments, you'll see a "Validation successful" message, indicating you can move onto the next step and select Create. + +1. The creation of the resource might take a few minutes. After a successful creation, you'll see a page stating the deployment is complete. Select **Go to resource** to create cache nodes. + + +# [Azure CLI](#tab/cli) + +### Prerequisites + +* An Azure CLI environment: + + * Use the Bash environment in [Azure Cloud Shell](/azure/cloud-shell/get-started/classic). + + * Or, if you prefer to run CLI reference commands locally, [install the Azure CLI](/cli/azure/install-azure-cli) + + * Sign in to the Azure CLI by using the [az login](/cli/azure/reference-index#az-login) command. + + * Run [az version](/cli/azure/reference-index#az-version) to find the version and dependent libraries that are installed. To upgrade to the latest version, run [az upgrade](/cli/azure/reference-index#az-upgrade). + + * Install Azure CLI extension **mcc** by following the instructions [here](/cli/azure/azure-cli-extensions-overview#how-to-install-extensions). + + * Resource group under which a Connected Cache resource can be created. Use the [az group create](/cli/azure/group#az-group-create) command to create a new Resource group if you don't already have one. + +#### Create Connected Cache Azure resource + +Replace the following placeholders with your own information: +* *\*: Name of an existing resource group in your subscription. +* *\*: A name for your Microsoft Connected Cache for Enterprise resource. +* *\*: The Azure region where your Microsoft Connected Cache will be located. + +```azurecli-interactive +az mcc ent resource create --mcc-resource-name --resource-group --location +``` + +--- + +## Create Connected Cache cache node + +# [Azure portal](#tab/portal) + + 1. Open Azure portal and navigate to the Microsoft Connected Cache for Enterprise resource that you created.
+ 1. Under Cache Node Management, select **Cache Nodes** then **Create Cache Node**.
+ + 1. Provide a name for your cache node and select the host OS you plan to deploy the cache node on, then select **Create**. Note, cache node names have to be unique under the Microsoft Connected Cache resource. + + The creation of the cache node might take a few minutes. Select **Refresh** to see your recently created cache node. +Once the cache node state changes to **Not Configured**, you can now configure your cache node.
+For more information about different cache node states, see [Cache node states](#cache-node-states). + + +# [Azure CLI](#tab/cli) + +Use the following command to create a new cache node if you don't already have one. + +Replace the following placeholders with your own information: +* *\*: Name of existing resource group in your subscription. +* *\*: Name of the Microsoft Connected Cache for Enterprise resource. +* *\*: A name for your Microsoft Connected Cache node. +* *\*: The OS on which cache node will be provisioned. + Accepted values: `windows`, `linux` + +```azurecli-interactive +az mcc ent node create --cache-node-name --mcc-resource-name --resource-group --host-os +``` + +
+ +>[!NOTE] +>To ensure cache node has been created successfully, run the following command before continuing with cache node configuration. +>```azurecli-interactive +>az mcc ent node show --cache-node-name --mcc-resource-name --resource-group +>``` +>In the output look for **cacheNodeState**. If ***cacheNodeState = Not Configured***, you can continue with cache node configuration. +>If ***cacheNodeState = Registration in Progress***, then the cache node is still in process of being created. Wait a couple of minutes and run the command again. +>To know more about different cache node state, see [Cache node states](#cache-node-states). + +--- + +## Configure Connected Cache node + +# [Azure portal](#tab/portal) +Enter required values to configure your cache node. For more information about the definitions of each field, review the [Configuration fields](#general-configuration-fields) at the bottom of this article. +Don't forget to select save after adding configuration information. + + +# [Azure CLI](#tab/cli) + +### Configure Linux-hosted Connected Cache node +Use the following command to configure cache node for deployment to a **Linux** host machine. + +Replace the following placeholders with your own information: + +* *\*: Name of the resource group in your subscription. +* *\*: Name of your Microsoft Connected Cache for Enterprise resource. +* *\*: Name for your Microsoft Connected Cache node. +* *\*: The cache drive path. You can add up to nine cache drives. +* *\*: The size of cache drive. Must be at least 50 Gb. +* *\*: If proxy needs to be enabled or not.
+ Accepted values: `enabled`, `disabled`
+ Proxy should be set to enabled if the cache node will need to pass through a network proxy to download content. The provided proxy will also be used during deployment of the Connected Cache cache node to your host machine. +* *\*: The proxy host name or ip address. Required if proxy is set to enabled. +* *\*: Proxy port number. Required if proxy is set to enabled. +* *\*: Update ring the cache node should have.
+ Accepted values: `slow`, `fast`.
+ If update ring is set to slow, you must provide the day of week, time of day and week of month the cache node should be updated. +* *\*: The day of the week cache node should be updated. Week starts from Monday.
+ Accepted values: 1,2,3,4,5,6,7 +* *\*: The time of day cache node should be updated in 24 hour format (hh:mm) +* *\*: The week of month cache node should be updated.
+ Accepted values: 1,2,3,4 + +```azurecli-interactive +az mcc ent node update --cache-node-name --mcc-resource-name --resource-group +--cache-drive "[{physical-path:,size-in-gb:},{,size-in-gb:}...]"> --proxy --proxy-host <"proxy host name"> --proxy-port --auto-update-day --auto-update-time