Merge branch 'main' into Anna_2

v-lianna · v-lianna · commit 858121a09efa · 2021-06-02T10:05:41.000+08:00
diff --git a/support/azure/general/api-return-blank-response.md b/support/azure/general/api-return-blank-response.md
@@ -1,7 +1,7 @@
 ---
 title: Azure API Management Troubleshooting Scenario 1 - API returning blank response
 description: Provides troubleshooting steps to an issue in which Azure API is returning blank response.
-ms.date: 08/14/2020
+ms.date: 03/04/2021
 ms.prod-support-area-path: 
 ms.service: api-management
 ms.author: genli
@@ -38,15 +38,15 @@ Expected output of **GetHeaders**  API should be something like below:
 }
 ```
 
-## Troubleshooting steps
+## Troubleshooting Steps
 
-To debug this kind of issues, the best approach is collect [APIM inspector trace](https://docs.microsoft.com/azure/api-management/api-management-howto-api-inspector) to inspect request processing inside APIM pipeline.
+To debug this kind of issues, the best approach is collect [APIM inspector trace](/azure/api-management/api-management-howto-api-inspector) to inspect request processing inside APIM pipeline.
 
 - If you look into the trace, you would notice that forward-request policy is missing.
-- The forward-request policy forwards the incoming request to the backend service specified in the request [context](https://docs.microsoft.com/azure/api-management/api-management-policy-expressions#ContextVariables).
+- The forward-request policy forwards the incoming request to the backend service specified in the request [context](/azure/api-management/api-management-policy-expressions#ContextVariables).
 - Removing this policy results in the request not being forwarded to the backend service and the policies in the outbound section are evaluated immediately upon the successful completion of the policies in the inbound section.
 - Hence if you check the \<backend> section of the **GetHeaders** operation under **Blank-API** you would notice that forward-request policy is removed.
 - Add the forward-request policy in the backend section or add **\<base />** element so that it inherits forward-request policy from the parent level (i.e. from the API level), which should resolve the problem.
 
-Read about the [forward-request](https://docs.microsoft.com/azure/api-management/api-management-advanced-policies#ForwardRequest) policy to know more about it.
+Read about the [forward-request](/azure/api-management/api-management-advanced-policies#ForwardRequest) policy to know more about it.
 
diff --git a/support/azure/general/synapse-analytics-apache-spark-pools-diagnostic-logs.md b/support/azure/general/synapse-analytics-apache-spark-pools-diagnostic-logs.md
@@ -0,0 +1,23 @@
+---
+title: Azure Synapse Analytics Apache Spark pools diagnostic logs
+description: Lists the Apache Spark diagnostic logs that's collected during troubleshooting by Microsoft Support.
+ms.date: 05/27/2021
+author: genlin
+ms.author: genli
+ms.service: synapse-analytics
+ms.prod-support-area-path: 
+ms.reviewer: 
+---
+# Apache Spark diagnostic logs in Azure Synapse Analytics
+
+To troubleshoot issues that are related to Apache Spark pools in the Azure Synapse Analytics workspace, Microsoft Support and the Azure Synapse Analytics engineering team can view and download diagnostic logs that are associated with your Apache Spark pools. Microsoft may access or make temporary copies of the log data to help resolve your support incident.
+
+## Logs collected for troubleshooting
+
+The following tables list the log data that will be collected to troubleshoot your support incident. Additionally, you may be asked to provide the same types of data from your Apache Spark pools by using Synapse Studio.
+
+|  Type |  Description |
+|---|---|
+| Apache Spark Driver Logs  |The Spark driver program is a critical process that's used to negotiate resources with cluster manager and to schedule the job execution. Driver logs contain details about how the job was run and the resources that were used. This information is critical for troubleshooting the Spark application.   |
+|  Apache Spark Executor Logs |Spark Executors are worker nodes-related processes that are in charge of running individual tasks in a given Spark job. They are started at the beginning of a Spark application, and typically run for the entire lifetime of an application. After Spark Executors run the task, they send the results to the driver application. Executor logs contain details about how the individual tasks of your application performed, and whether any of them failed.   |
+|  Apache Spark Event Logs | Spark Event logs contain execution-related and performance-related metrics of all the executors. They also contain the list of scheduler stages and tasks, and the execution environment information. |
diff --git a/support/azure/general/toc.yml b/support/azure/general/toc.yml
@@ -138,6 +138,8 @@
 
 - name:  Support Diagnostic Packages
   items:
+  - name: Diagnostic logs for Apache Spark pools
+    href: synapse-analytics-apache-spark-pools-diagnostic-logs.md
   - name: Diagnostic logs for SQL Server 
     href: sql-vm-logs.md
   - name: SQL database data collector
diff --git a/support/azure/virtual-machines/reset-local-password-without-agent.md b/support/azure/virtual-machines/reset-local-password-without-agent.md
@@ -56,7 +56,7 @@ Always try to reset a password using the [Azure portal or Azure PowerShell](rese
      
      :::image type="content" source="./media/reset-local-password-without-agent/create-gpt-ini.png" alt-text="Screenshot that shows the updates made to the gpt.ini file.":::
 
-4. Create `scripts.ini` in `\Windows\System32\GroupPolicy\Machine\Scripts\`. Make sure hidden folders are shown. If needed, create the `Machine` or `Scripts` folders. 
+4. Create `scripts.ini` in `\Windows\System32\GroupPolicy\Machine\Scripts\`. Make sure hidden folders and file name extensions are shown. If needed, create the `Machine` or `Scripts` folders. 
    
    * Add the following lines the `scripts.ini` file you created:
      
@@ -160,7 +160,7 @@ Always try to reset a password using the [Azure portal or Azure PowerShell](/pre
      
      :::image type="content" source="./media/reset-local-password-without-agent/create-gpt-ini-classic.png" alt-text="Create gpt.ini - Classic":::
 
-5. Create `scripts.ini` in `\Windows\System32\GroupPolicy\Machine\Scripts\`. Make sure hidden folders are shown. If needed, create the `Machine` or `Scripts` folders.
+5. Create `scripts.ini` in `\Windows\System32\GroupPolicy\Machine\Scripts\`. Make sure hidden folders and file name extensions are shown. If needed, create the `Machine` or `Scripts` folders.
    
    * Add the following lines the `scripts.ini` file you created:
 
diff --git a/support/azure/virtual-machines/troubleshoot-performance-bottlenecks-linux.md b/support/azure/virtual-machines/troubleshoot-performance-bottlenecks-linux.md
@@ -1,6 +1,6 @@
 ---
 title: Troubleshoot performance and isolate bottlenecks in Linux
-description: Troubleshoot performance and isolate bottlenecks in Linux
+description: Troubleshoot CPU, memory, and disk input and output performance, and isolate bottlenecks in Linux virtual machines
 ms.date: 05/27/2021
 ms.prod-support-area-path: 
 ms.reviewer: 
@@ -149,7 +149,7 @@ Latency is the measurement of the average amount of time each operation takes to
 
 `iostat` is a simple command to run, as the basic syntax is:
 
-``iostat <parameters> <time to refresh in seconds> <times to iterate> <block devices>``
+`iostat <parameters> <time to refresh in seconds> <times to iterate> <block devices>`
 
 The options dictate what information `iostat` provides. Without any parameter, `iostat` displays some data which might be helpful:
 
@@ -170,7 +170,7 @@ By default, `iostat` displays data for all block devices present. Additionally,
 
 Run `iostat` with triggers:
 
-``sudo iostat -dxctm 1``
+`sudo iostat -dxctm 1`
 
 To further expand the `iostat` results, use these variables:
 
@@ -180,7 +180,7 @@ To further expand the `iostat` results, use these variables:
 - `-t`: Print the time for each report displayed. Useful for long runs.
 - `-m`: Display statistics in megabytes per second. A more human readable form.
 
-The number **1** in the command tells `iostat` to refresh every second. Select **Ctrl + C** to stop the refresh.
+The number **1** in the command tells `iostat` to refresh every second. Select Ctrl+C to stop the refresh.
 
 With the extra parameters, the output looks like this:
 
@@ -236,7 +236,7 @@ PING 1.1.1.1 (1.1.1.1) 56(84) bytes of data.
 rtt min/avg/max/mdev = 5.240/5.291/5.339/0.035 ms
 ```
 
-To stop the ping, select **Ctrl + C**.
+To stop the ping, select Ctrl+C.
 
 ## Memory
 
@@ -253,7 +253,7 @@ In Linux systems, it's common to see 99% memory usage. In the `free` output, the
 
 In the `free` output, the *available* column indicates how much memory is available for processes to consume. This amount is calculated by adding buff/cache and free memory.
 
-The `top` command can be configured to sort processes by memory utilization. By default, `top` sorts by CPU percentage (%). To sort by memory utilization (%), select **Shift + M** when running `top`.
+The `top` command can be configured to sort processes by memory utilization. By default, `top` sorts by CPU percentage (%). To sort by memory utilization (%), select Shift+M when running `top`.
 
 ```output
 [root@rhel78 ~]# top
@@ -285,7 +285,7 @@ Memory usage can increase more than expected in scenarios where the application
 
 Here is another command used to view the top memory consuming processes:
 
-``ps -eo pid,comm,user,args,%cpu,%mem --sort=-%mem | head``
+`ps -eo pid,comm,user,args,%cpu,%mem --sort=-%mem | head`
 
 The following is an output example:
 
@@ -394,13 +394,13 @@ When PerfInsights is [installed through the Azure portal](/azure/virtual-machine
 
 ##### Azure portal Option 1
 
-Browse the VM blade and select the *Performance diagnostics* option. You'll be asked to install the option (uses extensions) on the VM that you selected it for.
+Browse the VM blade and select the **Performance diagnostics** option. You'll be asked to install the option (uses extensions) on the VM that you selected it for.
 
 :::image type="content" source="./media/troubleshoot-performance-bottlenecks-linux/perf-diagnostics-reports-screen-install.png" alt-text="This image shows the Performance Diagnostics reports screen, and asks the user to install Performance diagnostics.":::
 
 #### Azure portal Option 2
 
-Browse to the *Diagnose and Solve Problems* tab in the VM blade, and look for look for the Troubleshoot link under *VM Performance Issues*.
+Browse to the **Diagnose and Solve Problems** tab in the VM blade, and look for look for the **Troubleshoot** link under **VM Performance Issues**.
 
 :::image type="content" source="./media/troubleshoot-performance-bottlenecks-linux/look-for-troublshoot-link-vm-perfissues.png" alt-text="This image asks the user to browse to the Diagnose and Solve Problems tab in the VM blade, and look for the Troubleshoot link under VM Performance Issues":::
 
diff --git a/support/docfx.json b/support/docfx.json
@@ -50,7 +50,8 @@
       "extendBreadcrumb": true,
       "feedback_system": "None", 
       "feedback_github_repo": "MicrosoftDocs/SupportArticles-docs", 
-      "searchScope": ["Troubleshoot"]
+      "searchScope": ["Troubleshoot"],
+      "recommendations": true
     },
 
     "fileMetadata": {
diff --git a/support/sql/docfx.json b/support/sql/docfx.json
@@ -0,0 +1,9 @@
+{
+"fileMetadata": { 
+  "recommendations": { 
+    "*/**.md": true,
+    "admin/**.md": true,
+    "analysis-services/**.md": false  
+  }
+ }
+}
diff --git a/support/system-center/dpm/media/upgrade-dpm-vmware-vm-protection/dpm-protection-manager-setup.png b/support/system-center/dpm/media/upgrade-dpm-vmware-vm-protection/dpm-protection-manager-setup.png
diff --git a/support/system-center/dpm/upgrade-dpm-vmware-vm-protection.md b/support/system-center/dpm/upgrade-dpm-vmware-vm-protection.md
@@ -7,7 +7,13 @@ ms.reviewer: digan; jarrettr; cbutch
 ---
 # How to upgrade DPM 2012 R2 to DPM 2016 if DPM 2012 R2 is used to protect VMware VMs
 
-If you use Microsoft System Center 2012 R2 Data Protection Manager (DPM) to protect VMware virtual machines (VMs), you can't upgrade to System Center 2016 Data Protection Manager even after you stop the protection. To fix this issue, follow the upgrade procedure in this article.
+If you use Microsoft System Center 2012 R2 Data Protection Manager (DPM) to protect VMware virtual machines (VMs), you can't upgrade to System Center 2016 Data Protection Manager even after you stop the protection. In this situation, you receive the following error:
+
+> 34517 - DPM 2016 does not support VMware VM Backup yet.
+
+![Select start job at step](./media/upgrade-dpm-vmware-vm-protection/dpm-protection-manager-setup.png)
+
+To fix this issue, follow the upgrade procedure in this article.
 
 _Original product version:_ &nbsp; System Center 2012 R2 Data Protection Manager  
 _Original KB number:_ &nbsp; 4039285
diff --git a/support/windows-client/deployment/analyze-sfc-program-log-file-entries.md b/support/windows-client/deployment/analyze-sfc-program-log-file-entries.md
@@ -1,7 +1,7 @@
 ---
 title: Analyze log file entries that SFC.exe generates
 description: Describes how to use the SFC.exe program to help diagnose problems that are caused by missing or damaged operating system files.
-ms.date: 09/24/2020
+ms.date: 05/31/2021
 author: Deland-Han
 ms.author: delhan
 manager: dscontentpm
@@ -13,33 +13,30 @@ ms.reviewer: kaushika
 ms.prod-support-area-path: Servicing
 ms.technology: windows-client-deployment
 ---
-# Analyze the log file entries that SFC.exe generates in Windows Vista
+# Analyze the log file entries that *SFC.exe* generates in Windows
 
-This article describes how to analyze the log files that the Microsoft Windows Resource Checker (SFC.exe) program generates in Windows Vista.
+This article describes how to analyze the log files that the Microsoft Windows Resource Checker (*SFC.exe*) program generates in Windows.
 
-_Applies to:_ &nbsp; Windows Vista  
+_Applies to:_ &nbsp; Windows Vista and later versions  
 _Original KB number:_ &nbsp; 928228
 
-> [!NOTE]
-> Support for Windows Vista without any service packs installed ended on April 13, 2010. To continue receiving security updates for Windows, make sure you're running Windows Vista with Service Pack 2 (SP2). For more information, see [Support is ending for some versions of Windows](https://support.microsoft.com/help/14223/windows-xp-end-of-support).
-
 ## Overview
 
-You can use the SFC.exe program to help you troubleshoot crashes that occur in the user mode part of Windows Vista. These crashes may be related to missing or damaged operating system files.
+You can use the *SFC.exe* program to help you troubleshoot crashes that occur in the user mode part of Windows. These crashes may be related to missing or damaged operating system files.
 
-The SFC.exe program performs the following operations:
+The *SFC.exe* program performs the following operations:
 
-- It verifies that non-configurable Windows Vista system files have not changed. Also, it verifies that these files match the operating system's definition of which files are expected to be installed on the computer.
-- It repairs non-configurable Windows Vista system files, when it is possible.
+- It verifies that non-configurable Windows system files have not changed. Also, it verifies that these files match the operating system's definition of which files are expected to be installed on the computer.
+- It repairs non-configurable Windows system files, when it is possible.
 
 ## View the log file
 
-The SFC.exe program writes the details of each verification operation and of each repair operation to the CBS.log file. Each SFC.exe program entry in this file has an **[SR]** tag. The CBS.log file is located in the `%windir%\Logs\CBS` folder.
+The *SFC.exe* program writes the details of each verification operation and of each repair operation to the *CBS.log* file. Each *SFC.exe* program entry in this file has an **\[SR\]** tag. The *CBS.log* file is located in the *%windir%\Logs\CBS* folder.
 
 > [!NOTE]
 > The Windows Modules Installer service also writes to this log file. (The Windows Modules Installer service installs optional features, updates, and service packs.)
 
-You can search for **[SR]** tags to help locate SFC.exe program entries. To perform this kind of search and to redirect the results to a text file, follow these steps:
+You can search for **\[SR\]** tags to help locate *SFC.exe* program entries. To perform this kind of search and to redirect the results to a text file, follow these steps:
 
 1. Click **Start**, type *cmd* in the **Start Search** box, right-click **cmd** in the **Programs** list, and then click **Run as administrator**.
     If you are prompted for an administrator password or for a confirmation, type your password, or click **Continue**.
@@ -49,15 +46,15 @@ You can search for **[SR]** tags to help locate SFC.exe program entries. To perf
     findstr /c:"[SR]" %windir%\logs\cbs\cbs.log >sfcdetails.txt
     ```
 
-The Sfcdetails.txt file includes the entries that are logged every time that the SFC.exe program runs on the computer.
+The Sfcdetails.txt file includes the entries that are logged every time that the *SFC.exe* program runs on the computer.
 
 ## Interpret the log file entries
 
-The SFC.exe program verifies files in groups of 100. Therefore, there will be many groups of SFC.exe program entries. Each entry has the following format:
+The *SFC.exe* program verifies files in groups of 100. Therefore, there will be many groups of *SFC.exe* program entries. Each entry has the following format:
 
 **date** **time** **entry_type details**
 
-The following sample excerpt from a CBS.log file shows that the SFC.exe program did not identify any problems with the Windows Vista system files:
+The following sample excerpt from a *CBS.log* file shows that the *SFC.exe* program did not identify any problems with the Windows system files:
 
 ```output
 <date> <time>, Info CSI 00000006 [SR] Verifying 100 (0x00000064) components  
@@ -74,7 +71,7 @@ The following sample excerpt from a CBS.log file shows that the SFC.exe program
 <date> <time>, Info CSI 00000011 [SR] Verify complete
 ```
 
-The following sample excerpt from a CBS.log file shows that the SFC.exe program has identified problems with the Windows Vista system files:
+The following sample excerpt from a *CBS.log* file shows that the *SFC.exe* program has identified problems with the Windows system files:
 
 ```output
 <date> <time>, Info CSI 00000006 [SR] Verifying 100 (0x00000064) components  
@@ -86,30 +83,30 @@ The following sample excerpt from a CBS.log file shows that the SFC.exe program
 ```
 
 > [!NOTE]
-> Although the log file entry states that the SFC.exe program is repairing the changed file, no actual repair operation occurs when a file is verified.
+> Although the log file entry states that the *SFC.exe* program is repairing the changed file, no actual repair operation occurs when a file is verified.
 
-The following list describes other messages that may be logged in the SFC.exe program entries of the CBS.log file after verification is completed.
+The following list describes other messages that may be logged in the *SFC.exe* program entries of the *CBS.log* file after verification is completed.
 
 - Entry 1: Cannot repair member file **file details**. For example:
 
   ```output
   Cannot repair member file [l:14{7}]"url.dll" of Microsoft-Windows-IE-WinsockAutodialStub, Version = 6.0.5752.0, pA = PROCESSOR_ARCHITECTURE_INTEL (0), Culture neutral, VersionScope = 1 nonSxS, PublicKeyToken = {l:8 b:31bf3856ad364e35}, Type neutral, TypeN
   ```
 
-    This entry indicates that the file content does not match the operating system definition for the file. In this situation, the SFC.exe program cannot repair the file.
+  This entry indicates that the file content does not match the operating system definition for the file. In this situation, the *SFC.exe* program cannot repair the file.
 
 - Entry 2: Repaired file **file details** by copying from backup. For example:
 
   ```output
   Repaired file \SystemRoot\WinSxS\Manifests\[ml:24{12},l:18{9}]"netnb.inf" by copying from backup
   ```
 
-    This entry indicates that a problem exists with a file. The SFC.exe program can repair this file by copying a version from a private system store backup.
+  This entry indicates that a problem exists with a file. The *SFC.exe* program can repair this file by copying a version from a private system store backup.
 
 - Entry 3: Repairing corrupted file **file details** from store. For example:
 
   ```output
   Repairing corrupted file [ml:520{260},l:36{18}]"??\C:\Windows\inf"[l:18{9}]"netnb.inf" from store
   ```
 
-    This entry indicates that a problem exists with a file. The SFC.exe program can repair this file by copying a version from the system store.
+  This entry indicates that a problem exists with a file. The *SFC.exe* program can repair this file by copying a version from the system store.
