pull base content,head:MicrosoftDocs:main,into:wwlpublishsync

Author: wwlpublish

learn-pr/azure-databases/postgresql/basic-sql-aggregate-functions-grouping/includes/2-sample-database-overview.md

@@ -19,22 +19,22 @@ quiz:
     choices:
     - content: "The Azure Monitor Agent."
       isCorrect: false
-      explanation: "Incorrect. The Azure Monitor Agent isn't required when using Azure Arc, although it's recommended because it allows you to implement a range of Azure hybrid services, such as Azure Monitor or Microsoft Sentinel."
+      explanation: "Incorrect. The Azure Monitor Agent isn't required when using Azure Arc."
     - content: "The Microsoft Dependency agent."
       isCorrect: false
-      explanation: "Incorrect. The Microsoft Dependency agent isn't required when using Azure Arc, although it's recommended because it facilitates identifying internal and external dependencies of server workloads."
+      explanation: "Incorrect. The Microsoft Dependency agent isn't required when using Azure Arc."
     - content: "The Connected Machine agent."
       isCorrect: true
       explanation: "Correct. In each of the Azure Arc-enabled scenarios, Azure Arc uses the locally installed Connected Machine agents to establish a logical connection between the local resource and Azure."
-  - content: "Which of the following operating systems aren't supported by Azure Arc-enabled servers?"
+  - content: "Which of these do you need in order to onboard an on-premises machine to Azure Arc?"
     choices:
-    - content: "Windows Server 2012 R2"
+    - content: "Azure Automation Update Management configured to manage the on-premises machine."
       isCorrect: false
-      explanation: "Incorrect. The Azure Connected Machine agent supports all versions of Windows Server operating system that haven't reached their end of support stage."
-    - content: "Red Hat Enterprise Linux 7 (x64)."
+      explanation: "Incorrect. While you can enable automatic onboarding of machines managed through Automation Update Management, there are other ways to onboard a machine that don't require this."
+    - content: "An Azure virtual machine that uses the same operating system as the on-premises machine."
       isCorrect: false
-      explanation: "Incorrect. The Azure Connected Machine agent supports Red Hat Enterprise Linux 7 (x64)."
-    - content: "macOS 10.15."
+      explanation: "Incorrect. The on-premises machine will be represented as a new resource in Azure. No previous resources are required."
+    - content: "An Azure subscription."
       isCorrect: true
-      explanation: "Correct. The Azure Connected Machine agent supports only Windows Server and major Linux distributions."
+      explanation: "Correct. You must have an Azure subscription in order to connect a machine to Azure Arc."
 

learn-pr/azure-databases/postgresql/basic-sql-join-tables/includes/2-sample-database-overview.md

@@ -9,32 +9,32 @@ metadata:
   ms.author: jenhayes
   ms.topic: unit
   ms.custom: e2e-hybrid
-durationInMinutes: 10
+durationInMinutes: 8
 content: |
   [!include[](includes/3-capabilities-azure-arc-enabled-servers.md)]
 quiz:
   title: Check your knowledge
   questions:
-  - content: "Which VM extension can the administrator add to Azure Arc-enabled servers to start monitoring it with Azure services?"
+  - content: "Which VM extension can the administrator add to Azure Arc-enabled servers to log activity?"
     choices:
-    - content: "Qualys extension. This VM extension implements integration with Azure Defender for servers vulnerability assessment scanning."
+    - content: "Azure Automation Hybrid Runbook Worker extension"
       isCorrect: false
-      explanation: "That's incorrect. This VM extension allows the administrator to reset local Administrator's credentials on a Windows Server running in an Azure VM, but it is not supported on Azure Arc-enabled servers."
+      explanation: "Incorrect. This VM extension lets a server run Azure Automation runbooks."
     - content: "Azure Key Vault extension."
       isCorrect: false
-      explanation: "That's incorrect. This VM extension provides integration with Azure Key Vault."
+      explanation: "Incorrect. This VM extension provides integration with Azure Key Vault."
     - content: "Azure Monitor Agent."
       isCorrect: true
-      explanation: "That's correct. This VM extension implements integration with Azure Monitor."
-  - content: "What can the administrator do in order to audit changes the state of operating system of Azure Arc-enabled servers?"
+      explanation: "Correct. This VM extension implements integration with Azure Monitor, so that activity can be tracked in a Log Analytics workspace."
+  - content: "How can the administrator ensure that all Arc-enabled servers receive a specific Azure tag?"
     choices:
-    - content: "Review Azure Advisor."
+    - content: "Deploy the Custom Script Extension."
       isCorrect: false
-      explanation: "That's incorrect. Azure Advisor is limited to cloud resources only."
-    - content: "Search through the activity logs in the Azure portal."
+      explanation: "Incorrect. This VM extension is used to download and run scripts on a server."
+    - content: "Use Azure Update Manager."
       isCorrect: false
-      explanation: "That's incorrect. The activity log records events affecting the Azure resources only."
-    - content: "Apply Azure Guest Configuration-based policy."
+      explanation: "Incorrect.  Azure Update Manager manages and governs software updates for hybrid machines."
+    - content: "Assign a policy that adds the tag when the servers are onboarded to Azure Arc."
       isCorrect: true
-      explanation: "That's correct. Guest Configuration policies allow the administrator to audit settings within the target operating system and evaluate their compliance."
+      explanation: "Correct. An Azure Policy definition can be created and assigned to the subscription where the servers will be onboarded."
 

learn-pr/azure-databases/postgresql/basic-sql-limit-offset-order-by/includes/2-sample-database-overview.md

@@ -9,7 +9,7 @@ metadata:
   ms.author: jenhayes
   ms.topic: unit
   ms.custom: e2e-hybrid
-durationInMinutes: 10
+durationInMinutes: 6
 content: |
   [!include[](includes/4-simplify-management-maintenance-azure-arc-servers.md)]
 quiz:
@@ -23,18 +23,18 @@ quiz:
     - content: "Use Windows Admin Center to connect to each server."
       isCorrect: false
       explanation: "Incorrect. While it's possible to identify the required information, this would require extra administrative effort."
-    - content: "Use the Azure Arc-enabled servers blade in the Azure portal."
+    - content: "Use the Azure Arc-enabled servers pane in the Azure portal."
       isCorrect: true
-      explanation: "Correct. The blade allows the administrator to readily identify the OS build and OS version. The blade also includes server name, manufacturer, model, serial number, the number of CPU cores, and the amount of memory."
-  - content: "What is the primary Azure Monitor-related benefit of Azure Arc-enabled servers compared with non Azure Arc-enabled servers?"
+      explanation: "Correct. This pane lets you easily identify a server's operating system and version."
+  - content: "Which of these can be used to automatically respond to security incidents for your Arc-enabled servers?"
     choices:
-    - content: "The ability to capture diagnostic logs."
+    - content: "Microsoft Sentinel."
       isCorrect: false
-      explanation: "Incorrect. This functionality is available for both Azure Arc-enabled servers and machines that aren't Azure Arc-enabled."
-    - content: "The ability to generate alerts."
+      explanation: "Correct. Microsoft Sentinel can respond to incidents with built-in orchestration and automation of common tasks."
+    - content: "Azure Monitor."
       isCorrect: false
-      explanation: "Incorrect. This functionality is available for both Azure Arc-enabled servers and machines that aren't Azure Arc-enabled."
-    - content: "The ability to deploy and configure the Azure Monitor Agent via VM extensions."
+      explanation: "Incorrect. Azure Monitor is a solution for collecting, analyzing, and responding to telemetry data."
+    - content: "Log Analytics workspace."
       isCorrect: true
-      explanation: "Correct. VM extensions are not available for non-Azure machines that aren't Azure Arc-enabled."
+      explanation: "Incorrect. A Log Analytics workspace is a data store for data you collect."
 

learn-pr/azure-databases/postgresql/basic-sql-simple-select/includes/2-sample-database-overview.md

@@ -1,8 +1,10 @@
-Azure Arc promises to bridge the gap between on-premises and cloud environments by providing consistent security, observability, and governance of the Azure platform and its services. In this module, you'll learn how you can benefit from these capabilities. 
+Azure Arc helps the gap between on-premises and cloud environments by providing consistent security, observability, and governance of the Azure platform and its services. In this module, you'll learn how you can benefit from these capabilities. 
 
-Let's consider a hypothetical customer scenario. Contoso is a medium-sized financial services company with its headquarters in London, England, and offices all around the world. It's currently operating almost entirely on-premises, with the compute environment consisting of a mix of physical and virtual servers running a range of Windows Server versions and Linux distributions. That diversity, along with the corresponding siloed operational model and lack of tools that would facilitate a consistent, unified management is the primary challenge that Contoso's IT team is currently facing. In addition, Contoso's IT team is exploring the option of migrating to the cloud some of its on-premises server workloads running on legacy infrastructure, which is reaching end of life. Contoso is considering several different cloud providers with the possibility of the multicloud strategy. The primary concern of the Contoso's Chief Information Officer (CIO) is that such strategy might further exacerbate operational complexity and management overhead that Contoso's IT is trying to minimize.
+Let's consider a hypothetical customer scenario. Contoso is a medium-sized financial services company with its headquarters in London, England, and offices all around the world. It's currently operating almost entirely on-premises, with the compute environment consisting of a mix of physical and virtual servers running a range of Windows Server versions and Linux distributions. That diversity, along with the corresponding siloed operational model and lack of tools that would facilitate a consistent, unified management, is the primary challenge that Contoso's IT team is currently facing.
 
-Contoso's CIO wants to identify technologies that promise to bridge the gap between the administrative model of on-premises and multicloud services regardless of the server operating system and the hardware or virtualization platform. While attending the most recent Ignite event, the CIO learned about the hybrid capabilities of Azure Arc and tasked you, the IT Engineering team lead, with evaluating the extent to which Azure Arc-enabled servers can help with building a consistent, unified management model.
+In addition, Contoso's IT team has some on-premises server workloads running on legacy infrastructure, which is reaching end of life. Contoso wants to explore migrating these workloads to the cloud, and is considering several different cloud providers. However, Contoso's Chief Information Officer (CIO) is that a multicloud strategy might further exacerbate operational complexity and management overhead that Contoso's IT is trying to minimize.
+
+Contoso's CIO wants to identify technologies that promise to bridge the gap between the administrative model of on-premises and multicloud services, regardless of the server operating system and the hardware or virtualization platform. While attending a recent conference, the CIO learned about the hybrid capabilities of Azure Arc and asked you, the IT Engineering team lead, to evaluate the extent to which Azure Arc-enabled servers can help with building a consistent, unified management model.
 
 ## Learning objectives