Merge pull request #1861 from microsoft/main

Release 10-23-23
microsoft · Oct 23, 2023 · 08b07c0 · 08b07c0
2 parents 423e007 + 0046de4
commit 08b07c0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/Calendar/Get-RBASummary.ps1 b/Calendar/Get-RBASummary.ps1
@@ -574,7 +574,7 @@ function ValidateRoomListSettings {
     Write-Host -ForegroundColor White "`tLearn more at " -NoNewline
     Write-Host -ForegroundColor Yellow "https://learn.microsoft.com/en-us/outlook/troubleshoot/calendaring/configure-room-finder-rooms-workspaces`n";
 
-    if ([string]::IsNullOrEmpty($places.Localities)) {
+    if ([string]::IsNullOrEmpty($Place.Localities)) {
         ## validate Localities
         Write-Host -ForegroundColor Yellow "`tWarning: Resource [$Identity] is not part of any Room Lists."
         Write-Host -ForegroundColor Yellow "`tWarning: Adding this resource to a Room Lists can take 24 hours to be fully propagated."
@@ -610,13 +610,15 @@ function ValidateRoomListSettings {
     `t Building Info
     `t Building:            $($script:Place.Building)
     `t Floor:               $($script:Place.Floor)
-    `t Tags describing features and equipment in the Room
+    `t --Tags describing features and equipment in the Room
     `t Tags:                $($script:Place.Tags)
+    `t --This room belongs to the following Room Lists (Localities).
+    `t Localities:          $($Place.Localities)
 
-    `tTo update any of the above information, run 'Set-Place $Identity -<Property> <Value>'.
-    `tFor more information on this command, see
+    `t To update any of the above information, run 'Set-Place $Identity -<Property> <Value>'.
+    `t For more information on this command, see
 "@
-    Write-Host -ForegroundColor Yellow "`thttps://learn.microsoft.com/en-us/powershell/module/exchange/set-place?view=exchange-ps";
+    Write-Host -ForegroundColor Yellow "`t https://learn.microsoft.com/en-us/powershell/module/exchange/set-place?view=exchange-ps";
     Write-Host
 }
 

diff --git a/Diagnostics/ExTRA/ExTRA.ps1 b/Diagnostics/ExTRA/ExTRA.ps1
@@ -8,7 +8,11 @@ param(
 . $PSScriptRoot\GetTagsFromFileContent.ps1
 
 function ShowCommandToHost {
-    Write-Host "The trace can be created, started, and stopped from the command line or PowerShell"
+    Write-Host "The trace can be created, deleted, started, and stopped from the command line or PowerShell"
+    Write-Host
+    Write-Host "To delete a previously created data collector set:"
+    Write-Host
+    Write-Host "logman delete ExchangeDebugTraces" -ForegroundColor Green
     Write-Host
     Write-Host "To create a data collector which is non-circular and stops at 1 GB:"
     Write-Host

diff --git a/Diagnostics/ExTRA/ui.html b/Diagnostics/ExTRA/ui.html
@@ -89,7 +89,11 @@ <h5>Tags</h5>
 
         </div>
         <div class="row hidden" id="syntaxDiv">
-            <p>The trace can be created, started, and stopped from the command line or PowerShell.</p>
+            <p>The trace can be created, deleted, started, and stopped from the command line or PowerShell.</p>
+            <p>To delete a previously existing data collector set:</p>
+            <p class="black green-text code">
+                <code>logman delete ExchangeDebugTraces</code>
+            </p>
             <p>To create a data collector which is non-circular and stops at 1 GB:</p>
             <p class="black green-text code">
                 <code>logman create trace ExchangeDebugTraces -p "{79bb49e6-2a2c-46e4-9167-fa122525d540}" -o c:\tracing\trace.etl -ow -f bin -max 1024 -mode globalsequence</code>
@@ -371,4 +375,4 @@ <h5>Tags</h5>
     </div>
 </body>
 
-</html>
+</html>
diff --git a/Diagnostics/ExchangeLogCollector/Helpers/Test-DiskSpace.ps1 b/Diagnostics/ExchangeLogCollector/Helpers/Test-DiskSpace.ps1
@@ -87,7 +87,7 @@ function Test-DiskSpace {
         foreach ($svr in $passedServers) {
             Write-Host $svr
         }
-        Enter-YesNoLoopAction -Question "Are yu sure you want to continue?" -YesAction {} -NoAction { exit }
+        Enter-YesNoLoopAction -Question "Collect data only from servers that passed the disk space check?" -YesAction {} -NoAction { exit }
     }
     Write-Verbose("Function Exit: Test-DiskSpace")
     return $passedServers

diff --git a/...tics/HealthChecker/DataCollection/OrganizationInformation/Get-OrganizationInformation.ps1 b/...tics/HealthChecker/DataCollection/OrganizationInformation/Get-OrganizationInformation.ps1
@@ -7,6 +7,8 @@
 . $PSScriptRoot\Get-SecurityCve-2021-34470.ps1
 . $PSScriptRoot\Get-SecurityCve-2022-21978.ps1
 . $PSScriptRoot\..\..\..\..\Shared\ActiveDirectoryFunctions\Get-ExchangeADSplitPermissionsEnabled.ps1
+. $PSScriptRoot\..\..\..\..\Shared\ErrorMonitorFunctions.ps1
+. $PSScriptRoot\..\..\..\..\Shared\Invoke-CatchActionErrorLoop.ps1
 function Get-OrganizationInformation {
     [CmdletBinding()]
     param(
@@ -74,7 +76,10 @@ function Get-OrganizationInformation {
             }
 
             try {
+                # It was reported that this isn't getting thrown to the catch action when failing. As a quick fix, handling this by looping over errors.
+                $currentErrors = $Error.Count
                 $getDdgPublicFolders = @(Get-DynamicDistributionGroup "PublicFolderMailboxes*" -IncludeSystemObjects -ErrorAction "Stop")
+                Invoke-CatchActionErrorLoop $currentErrors ${Function:Invoke-CatchActions}
             } catch {
                 Write-Verbose "Failed to get the dynamic distribution group for public folder mailboxes."
                 Invoke-CatchActions