From 0ed832318928d4dd9bed9205c0340cd35ff53d6a Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Wed, 8 Feb 2017 11:12:17 -0800 Subject: [PATCH] merge conflict --- ...windows-upgrades-with-upgrade-analytics.md | 26 +++++-------------- .../deploy/upgrade-analytics-architecture.md | 16 +++++------- .../deploy/upgrade-analytics-get-started.md | 11 +++----- .../deploy/upgrade-analytics-requirements.md | 20 +++++--------- 4 files changed, 23 insertions(+), 50 deletions(-) diff --git a/windows/deploy/manage-windows-upgrades-with-upgrade-analytics.md b/windows/deploy/manage-windows-upgrades-with-upgrade-analytics.md index 8beecfd1dc..a7d55fda76 100644 --- a/windows/deploy/manage-windows-upgrades-with-upgrade-analytics.md +++ b/windows/deploy/manage-windows-upgrades-with-upgrade-analytics.md @@ -18,17 +18,11 @@ With Windows telemetry enabled, Upgrade Analytics collects system, application, Use Upgrade Analytics to get: - A visual workflow that guides you from pilot to production - - Detailed computer and application inventory - - Powerful computer level search and drill-downs - - Guidance and insights into application and driver compatibility issues, with suggested fixes - - Data driven application rationalization tools - - Application usage information, allowing targeted validation; workflow to track validation progress and decisions - - Data export to commonly used software deployment tools, including System Center Configuration Manager The Upgrade Analytics workflow steps you through the discovery and rationalization process until you have a list of computers that are ready to be upgraded. @@ -36,22 +30,14 @@ The Upgrade Analytics workflow steps you through the discovery and rationalizati **Important** For system, application, and driver data to be shared with Microsoft, you must configure user computers to send data. For information about what telemetry data Microsoft collects and how that data is used and protected by Microsoft, see: - [Configure Windows telemetry in your organization](https://technet.microsoft.com/itpro/windows/manage/configure-windows-telemetry-in-your-organization) - - [Manage connections from Windows operating system components to Microsoft services](https://technet.microsoft.com/itpro/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services) - - [Windows 7, Windows 8, and Windows 8.1 appraiser telemetry events and fields](https://go.microsoft.com/fwlink/?LinkID=822965) ##**Related topics** -[Upgrade Analytics architecture](upgrade-analytics-architecture.md) - -[Upgrade Analytics requirements](upgrade-analytics-requirements.md) - -[Upgrade Analytics release notes](upgrade-analytics-release-notes.md) - -[Get started with Upgrade Analytics](upgrade-analytics-get-started.md) - -[Use Upgrade Analytics to manage Windows upgrades](use-upgrade-analytics-to-manage-windows-upgrades.md) - -[Troubleshoot Upgrade Analytics](troubleshoot-upgrade-analytics.md) - +[Upgrade Analytics architecture](upgrade-analytics-architecture.md)
+[Upgrade Analytics requirements](upgrade-analytics-requirements.md)
+[Upgrade Analytics release notes](upgrade-analytics-release-notes.md)
+[Get started with Upgrade Analytics](upgrade-analytics-get-started.md)
+[Use Upgrade Analytics to manage Windows upgrades](use-upgrade-analytics-to-manage-windows-upgrades.md)
+[Troubleshoot Upgrade Analytics](troubleshoot-upgrade-analytics.md)
diff --git a/windows/deploy/upgrade-analytics-architecture.md b/windows/deploy/upgrade-analytics-architecture.md index 0d427122b7..e7e639105a 100644 --- a/windows/deploy/upgrade-analytics-architecture.md +++ b/windows/deploy/upgrade-analytics-architecture.md @@ -19,16 +19,12 @@ After you enable Windows telemetry on user computers and install the compatibili For more information about what telemetry data Microsoft collects and how that data is used and protected by Microsoft, see: -[Configure Windows telemetry in your organization](https://technet.microsoft.com/itpro/windows/manage/configure-windows-telemetry-in-your-organization) - -[Manage connections from Windows operating system components to Microsoft services](https://technet.microsoft.com/itpro/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services) - -[Windows 7, Windows 8, and Windows 8.1 appraiser telemetry events and fields](https://go.microsoft.com/fwlink/?LinkID=822965) +[Configure Windows telemetry in your organization](https://technet.microsoft.com/itpro/windows/manage/configure-windows-telemetry-in-your-organization)
+[Manage connections from Windows operating system components to Microsoft services](https://technet.microsoft.com/itpro/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services)
+[Windows 7, Windows 8, and Windows 8.1 appraiser telemetry events and fields](https://go.microsoft.com/fwlink/?LinkID=822965)
##**Related topics** -[Upgrade Analytics requirements](upgrade-analytics-requirements.md) - -[Upgrade Analytics release notes](upgrade-analytics-release-notes.md) - -[Get started with Upgrade Analytics](upgrade-analytics-get-started.md) +[Upgrade Analytics requirements](upgrade-analytics-requirements.md)
+[Upgrade Analytics release notes](upgrade-analytics-release-notes.md)
+[Get started with Upgrade Analytics](upgrade-analytics-get-started.md)
diff --git a/windows/deploy/upgrade-analytics-get-started.md b/windows/deploy/upgrade-analytics-get-started.md index adf62f7f45..58a6877174 100644 --- a/windows/deploy/upgrade-analytics-get-started.md +++ b/windows/deploy/upgrade-analytics-get-started.md @@ -45,11 +45,8 @@ If you are already using OMS, you’ll find Upgrade Analytics in the Solutions G If you are not using OMS: 1. Go to the [Upgrade Analytics page on Microsoft.com](https://go.microsoft.com/fwlink/?LinkID=799190&clcid=0x409) and click **Sign up** to kick off the onboarding process. - 2. Sign in to Operations Management Suite (OMS). You can use either a Microsoft Account or a Work or School account to create a workspace. If your company is already using Azure Active Directory (Azure AD), use a Work or School account when you sign in to OMS. Using a Work or School account allows you to use identities from your Azure AD to manage permissions in OMS. - 3. Create a new OMS workspace. Enter a name for the workspace, select the workspace region, and provide the email address that you want associated with this workspace. Select **Create**. - 4. If your organization already has an Azure subscription, you can link it to your workspace. Note that you may need to request access from your organization’s Azure administrator. > If your organization does not have an Azure subscription, create a new one or select the default OMS Azure subscription from the list. Your workspace opens. @@ -86,7 +83,7 @@ Note: The compatibility update KB runs under the computer’s system account. If | **Endpoint** | **Function** | |---------------------------------------------------------|-----------| -| `https://v10.vortex-win.data.microsoft.com/collect/v1`

`https://Vortex-win.data.microsoft.com/health/keepalive` | Connected User Experience and Telemetry component endpoint. User computers send data to Microsoft through this endpoint. | +| `https://v10.vortex-win.data.microsoft.com/collect/v1`
`https://Vortex-win.data.microsoft.com/health/keepalive` | Connected User Experience and Telemetry component endpoint. User computers send data to Microsoft through this endpoint. | | `https://settings.data.microsoft.com/qos` | Enables the compatibility update KB to send data to Microsoft. | | `https://go.microsoft.com/fwlink/?LinkID=544713`
`https://compatexchange1.trafficmanager.net/CompatibilityExchangeService.svc` | This service provides driver information about whether there will be a driver available post-upgrade for the hardware on the system. | @@ -124,9 +121,9 @@ When you have completed a pilot deployment, you are ready to automate data colle To ensure that user computers are receiving the most up to date data from Microsoft, we recommend that you establish the following data sharing and analysis processes. -- Enable automatic updates for the compatibility update and related KBs. These KBs are updated frequently to include the latest application and driver issue information as we discover it during testing. -- Schedule the Upgrade Analytics deployment script to automatically run so that you don’t have to manually initiate an inventory scan each time the compatibility update KBs are updated. Computers are re-scanned only when the compatibility KBs are updated, so if your inventory changes significantly between KB releases you won’t see the changes in Upgrade Analytics until you run the script again. -- Schedule monthly user computer scans to view monthly active computer and usage information. +- Enable automatic updates for the compatibility update and related KBs. These KBs are updated frequently to include the latest application and driver issue information as we discover it during testing. +- Schedule the Upgrade Analytics deployment script to automatically run so that you don’t have to manually initiate an inventory scan each time the compatibility update KBs are updated. Computers are re-scanned only when the compatibility KBs are updated, so if your inventory changes significantly between KB releases you won’t see the changes in Upgrade Analytics until you run the script again. +- Schedule monthly user computer scans to view monthly active computer and usage information. ### Distribute the deployment script at scale diff --git a/windows/deploy/upgrade-analytics-requirements.md b/windows/deploy/upgrade-analytics-requirements.md index f03bbff89a..3875acc090 100644 --- a/windows/deploy/upgrade-analytics-requirements.md +++ b/windows/deploy/upgrade-analytics-requirements.md @@ -45,19 +45,13 @@ See [Windows 7, Windows 8, and Windows 8.1 appraiser telemetry events and fields **Whitelist telemetry endpoints.** To enable telemetry data to be sent to Microsoft, you’ll need to whitelist the following Microsoft telemetry endpoints on your proxy server or firewall. You may need to get approval from your security group to do this. -`https://v10.vortex-win.data.microsoft.com/collect/v1` - -`https://vortex-win.data.microsoft.com/health/keepalive` - -`https://settings-win.data.microsoft.com/settings` - -`https://vortex.data.microsoft.com/health/keepalive` - -`https://settings.data.microsoft.com/qos` - -`https://go.microsoft.com/fwlink/?LinkID=544713` - -`https://compatexchange1.trafficmanager.net/CompatibilityExchangeService.svc/extended` +`https://v10.vortex-win.data.microsoft.com/collect/v1`
+`https://vortex-win.data.microsoft.com/health/keepalive`
+`https://settings-win.data.microsoft.com/settings`
+`https://vortex.data.microsoft.com/health/keepalive`
+`https://settings.data.microsoft.com/qos`
+`https://go.microsoft.com/fwlink/?LinkID=544713`
+`https://compatexchange1.trafficmanager.net/CompatibilityExchangeService.svc/extended`
>**Note** The compatibility update KB runs under the computer’s system account and does not support user authentication in this release.