diff --git a/Diagnostics/ExchangeLogCollector/ExchangeLogCollector.ps1 b/Diagnostics/ExchangeLogCollector/ExchangeLogCollector.ps1 index 5e0349dde0..5c56f58133 100644 --- a/Diagnostics/ExchangeLogCollector/ExchangeLogCollector.ps1 +++ b/Diagnostics/ExchangeLogCollector/ExchangeLogCollector.ps1 @@ -44,6 +44,7 @@ param ( [switch]$PowerShellLogs, [switch]$QueueInformation, [switch]$ReceiveConnectors, + [switch]$RESTLogs, [switch]$RPCLogs, [switch]$SearchLogs, [switch]$SendConnectors, diff --git a/Diagnostics/ExchangeLogCollector/Helpers/Get-ArgumentList.ps1 b/Diagnostics/ExchangeLogCollector/Helpers/Get-ArgumentList.ps1 index db99f9b533..d7ec536177 100644 --- a/Diagnostics/ExchangeLogCollector/Helpers/Get-ArgumentList.ps1 +++ b/Diagnostics/ExchangeLogCollector/Helpers/Get-ArgumentList.ps1 @@ -71,6 +71,7 @@ function Get-ArgumentList { PopLogs = $PopLogs PowerShellLogs = $PowerShellLogs QueueInformation = $QueueInformation + RESTLogs = $RESTLogs RootFilePath = $Script:RootFilePath RPCLogs = $RPCLogs SearchLogs = $SearchLogs diff --git a/Diagnostics/ExchangeLogCollector/Helpers/Test-NoSwitchesProvided.ps1 b/Diagnostics/ExchangeLogCollector/Helpers/Test-NoSwitchesProvided.ps1 index 30cab4d71d..138af7460a 100644 --- a/Diagnostics/ExchangeLogCollector/Helpers/Test-NoSwitchesProvided.ps1 +++ b/Diagnostics/ExchangeLogCollector/Helpers/Test-NoSwitchesProvided.ps1 @@ -29,6 +29,7 @@ function Test-NoSwitchesProvided { $ImapLogs -or $OABLogs -or $PowerShellLogs -or + $RESTLogs -or $WindowsSecurityLogs -or $MailboxAssistantsLogs -or $ExchangeServerInformation -or diff --git a/Diagnostics/ExchangeLogCollector/Helpers/Test-PossibleCommonScenarios.ps1 b/Diagnostics/ExchangeLogCollector/Helpers/Test-PossibleCommonScenarios.ps1 index 5567123865..8b3cd8488d 100644 --- a/Diagnostics/ExchangeLogCollector/Helpers/Test-PossibleCommonScenarios.ps1 +++ b/Diagnostics/ExchangeLogCollector/Helpers/Test-PossibleCommonScenarios.ps1 @@ -29,6 +29,7 @@ function Test-PossibleCommonScenarios { $Script:ExPerfWiz = $true $Script:OABLogs = $true $Script:PowerShellLogs = $true + $Script:RESTLogs = $true $Script:WindowsSecurityLogs = $true $Script:CollectFailoverMetrics = $true $Script:TransportConnectivityLogs = $true diff --git a/Diagnostics/ExchangeLogCollector/RemoteScriptBlock/Invoke-RemoteMain.ps1 b/Diagnostics/ExchangeLogCollector/RemoteScriptBlock/Invoke-RemoteMain.ps1 index e7b5d9efdd..279bc517cc 100644 --- a/Diagnostics/ExchangeLogCollector/RemoteScriptBlock/Invoke-RemoteMain.ps1 +++ b/Diagnostics/ExchangeLogCollector/RemoteScriptBlock/Invoke-RemoteMain.ps1 @@ -175,6 +175,17 @@ function Invoke-RemoteMain { Add-LogCopyFullTaskAction "$Script:localExInstall`Logging\CmdletInfra" "CmdletInfra_Logs" } + if ($PassedInfo.RESTLogs) { + + if ($Script:localServerObject.Mailbox) { + Add-DefaultLogCopyTaskAction "$Script:localExInstall`Logging\Rest" "REST_BE_Logs" + } + + if ($Script:localServerObject.CAS) { + Add-DefaultLogCopyTaskAction "$Script:localExInstall`Logging\HttpProxy\Rest" "REST_Proxy_Logs" + } + } + if ($Script:localServerObject.DAGMember -and $PassedInfo.DAGInformation) { Add-TaskAction "Save-FailoverClusterInformation" diff --git a/docs/Diagnostics/ExchangeLogCollector.md b/docs/Diagnostics/ExchangeLogCollector.md index 4d5022d1af..d295e189ce 100644 --- a/docs/Diagnostics/ExchangeLogCollector.md +++ b/docs/Diagnostics/ExchangeLogCollector.md @@ -98,6 +98,7 @@ PopLogs | Enable to collect POP logging. Location: `(Get-PopSettings -Server $se PowerShellLogs | Enable to collect the PowerShell Logs. Location: `V15\Logging\HttpProxy\PowerShell` QueueInformation | Enable to collect the historical queue information. Location: `(Get-TransportService $server).QueueLogPath` ReceiveConnectors | Enable to collect the Receive Connector information from the server. +RESTLogs | Enable to collect REST API Logs. Location: `V15\Logging\Rest` and `V15\Logging\HttpProxy\Rest` RPCLogs | Enable to collect RPC Logs. Location: `V15\Logging\RPC Client Access`, `V15\Logging\HttpProxy\RpcHttp`, and `V15\Logging\RpcHttp` SearchLogs | Enable to collect Search Logs. Location: `V15\Bin\Search\Ceres\Diagnostics\Logs`, `V15\Bin\Search\Ceres\Diagnostics\ETLTraces`, `V15\Logging\Search`. On 2019 only we also include `V15\Logging\BigFunnelMetricsCollectionAssistant`, `V15\Logging\BigFunnelQueryParityAssistant`, and `V15\Logging\BigFunnelRetryFeederTimeBasedAssistant` SendConnectors | Enable to collect the send connector information from the environment.