Merge pull request #2216 from Shanefe/CalLogs-Use_Prod_Code

CalLogs - Switch to Prod code

Calendar/CalLogHelpers/CalLogCSVFunctions.ps1

@@ -102,7 +102,7 @@ function CreateExternalMasterIDMap {
     foreach ($Key in $SharedFolders.Keys) {
         Write-Host -ForegroundColor Green "$Key : $($SharedFolders[$Key])"
     }
-    # ToDo: Need to check for multiple ExternalMasterIDs pointing to the same FolderName
+    # ToDo: Need to check for multiple ExternalSharingMasterId pointing to the same FolderName
     Write-Verbose "Created the following Mapping :"
     Write-Verbose $SharedFolders
 }
@@ -131,7 +131,6 @@ function BuildCSV {
 
     Write-Host "Starting to Process Calendar Logs..."
     $GCDOResults = @()
-    $LogType = @()
     $script:MailboxList = @{}
     Write-Host "Creating Map of Mailboxes to CNs..."
     CreateExternalMasterIDMap
@@ -144,9 +143,6 @@ function BuildCSV {
         $Index++
         $ItemType = $CalendarItemTypes.($CalLog.ItemClass)
 
-        $ShortClientName = CreateShortClientName($CalLog.LogClientInfoString)
-        $LogType = SetLogType($CalLog)
-
         # CleanNotFounds
         $PropsToClean = "FreeBusyStatus", "ClientIntent", "AppointmentSequenceNumber", "AppointmentLastSequenceNumber", "RecurrencePattern", "AppointmentAuxiliaryFlags", "EventEmailReminderTimer", "IsSeriesCancelled", "AppointmentCounterProposal", "MeetingRequestType", "SendMeetingMessagesDiagnostics"
         foreach ($Prop in $PropsToClean) {
@@ -160,9 +156,9 @@ function BuildCSV {
         $GCDOResults += [PSCustomObject]@{
             'LogRow'                         = $Index
             'LogTimestamp'                   = ConvertDateTime($CalLog.LogTimestamp)
-            'LogType'                        = $LogType
+            'LogRowType'                     = $CalLog.LogRowType.ToString()
             'SubjectProperty'                = $CalLog.SubjectProperty
-            'Client'                         = $ShortClientName
+            'Client'                         = $CalLog.ShortClientInfoString
             'LogClientInfoString'            = $CalLog.LogClientInfoString
             'TriggerAction'                  = $CalLog.CalendarLogTriggerAction
             'ItemClass'                      = $ItemType

Calendar/CalLogHelpers/CalLogInfoFunctions.ps1

@@ -100,39 +100,3 @@ function CheckForBifurcation {
     return $IsBifurcated
 }
 
-<#
-.SYNOPSIS
-Sets the Calendar Log Type.
-Many updates are not interesting in the Calendar Log, marking these as ignorable. 99% of the time this is correct.
-#>
-function SetLogType {
-    param(
-        $CalLog
-    )
-
-    if ($CalLog.ItemClass -eq "(Occurrence Deleted)") {
-        return "Ignorable"
-    } elseif ($ShortClientName -like "CalendarSyncAssistant" -or
-        $ShortClientName -eq "CalendarReplication" -or
-        $CalendarItemTypes.($CalLog.ItemClass) -eq "SharingCFM" -or
-        $CalendarItemTypes.($CalLog.ItemClass) -eq "SharingDelete") {
-        return "Sync"
-    } elseif ($ShortClientName -eq "Other EBA" -or
-        $ShortClientName -eq "Other TBA" -or
-        $ShortClientName -eq "LocationProcessor" -or
-        $ShortClientName -eq "GriffinRestClient" -or
-        $ShortClientName -eq "RestConnector" -or
-        $ShortClientName -eq "ELC-B2" -or
-        $ShortClientName -eq "TimeService" ) {
-        return "Ignorable"
-    } elseif ($CalLog.ItemClass -eq "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}" ) {
-        return "Exception"
-    } elseif (($CalendarItemTypes.($CalLog.ItemClass) -like "*Resp*" -and $CalLog.CalendarLogTriggerAction -ne "Create" ) -or
-        $CalendarItemTypes.($CalLog.ItemClass) -eq "AttendeeList" -or
-        ($CalendarItemTypes.($CalLog.ItemClass) -eq "Forward.Notification" -and ($CalLog.CalendarLogTriggerAction -eq "SoftDelete") -or $CalLog.CalendarLogTriggerAction -like "*move*") -or
-        ($CalLog.ItemClass -eq "IPM.Schedule.Meeting.Request" -and $CalLog.CalendarLogTriggerAction -like "*move*" ) ) {
-        return "Cleanup"
-    } else {
-        return "Core"
-    }
-}

Calendar/CalLogHelpers/FindChangedPropFunctions.ps1

@@ -11,7 +11,7 @@
     Changed properties will be added to the Timeline.
 #>
 function FindChangedProperties {
-    if ($CalLog.Client -ne "LocationProcessor" -or $CalLog.Client -notlike "EBA:*" -or $CalLog.Client -notlike "TBA:*") {
+    if ($CalLog.Client -ne "LocationProcessor" -or $CalLog.Client -notlike "*EBA*" -or $CalLog.Client -notlike "*TBA*") {
         if ($script:PreviousCalLog -and $script:AddChangedProperties) {
             if ($CalLog.StartTime.ToString() -ne $script:PreviousCalLog.StartTime.ToString()) {
                 [Array]$TimeLineText = "The StartTime changed from [$($script:PreviousCalLog.StartTime)] to: [$($CalLog.StartTime)]"

Calendar/CalLogHelpers/Invoke-GetCalLogs.ps1

@@ -10,10 +10,11 @@ $script:CustomPropertyNameList =
 "AppointmentLastSequenceNumber",
 "AppointmentRecurring",
 "CalendarItemType",
+"CalendarLogTriggerAction",
 "CalendarProcessed",
-"ClientIntent",
 "ChangeList",
-"CalendarLogTriggerAction",
+"ClientIntent",
+"CreationTime",
 "DisplayAttendeesCc",
 "DisplayAttendeesTo",
 "EventEmailReminderTimer",
@@ -22,20 +23,22 @@ $script:CustomPropertyNameList =
 "From",
 "HasAttachment",
 "InternetMessageId",
-"ItemID",
 "IsAllDayEvent",
 "IsCancelled",
 "IsMeeting",
 "IsOrganizerProperty",
+"IsSharedInEvent",
+"ItemID",
+"LogClientInfoString",
+"LogRowType",
+"LogTimestamp",
 "NormalizedSubject",
+"OriginalStartDate",
 "SendMeetingMessagesDiagnostics",
+"Sensitivity",
 "SentRepresentingDisplayName",
 "SentRepresentingEmailAddress",
-"Sensitivity",
-"LogTimestamp",
-"LogClientInfoString",
-"OriginalStartDate",
-"CreationTime",
+"ShortClientInfoString",
 "TimeZone"
 
 $LogLimit = 2000
@@ -63,6 +66,7 @@ function GetCalendarDiagnosticObjects {
         MaxResults         = $LogLimit
         ResultSize         = $LogLimit
         ShouldBindToItem   = $true
+        ShouldDecodeEnums  = $true
     }
 
     if ($TrackingLogs.IsPresent) {

Calendar/CalLogHelpers/TimelineFunctions.ps1

@@ -67,7 +67,7 @@ function BuildTimeline {
     FindOrganizer($script:FirstLog)
 
     # Ignorable and items from Shared Calendars are not included in the TimeLine.
-    [array]$InterestingCalLogs = $script:EnhancedCalLogs | Where-Object { $_.LogType -eq "Core" -and $_.SharedFolderName -eq "Not Shared" }
+    [array]$InterestingCalLogs = $script:EnhancedCalLogs | Where-Object { $_.LogRowType -eq "Interesting" -and $_.SharedFolderName -eq "Not Shared" }
 
     if ($InterestingCalLogs.count -eq 0) {
         Write-Host "All CalLogs are Ignorable, nothing to create a timeline with, displaying initial values."

Calendar/Get-CalendarDiagnosticObjectsSummary.ps1

@@ -84,8 +84,8 @@ if (Test-ScriptVersion -AutoUpdate -VersionsUrl "https://aka.ms/CL-VersionsUrl"
 
 $script:command = $MyInvocation
 Write-Verbose "The script was started with the following command line:"
-Write-Verbose "Name: " $command.MyCommand.name
-Write-Verbose "Command Line: " $command.line
+Write-Verbose "Name:  $($script:command.MyCommand.name)"
+Write-Verbose "Command Line:  $($script:command.line)"
 Write-Verbose "Script Version: $BuildVersion"
 $script:BuildVersion = $BuildVersion
 
@@ -97,14 +97,15 @@ $script:BuildVersion = $BuildVersion
 . $PSScriptRoot\CalLogHelpers\MeetingSummaryFunctions.ps1
 . $PSScriptRoot\CalLogHelpers\Invoke-GetMailbox.ps1
 . $PSScriptRoot\CalLogHelpers\Invoke-GetCalLogs.ps1
-. $PSScriptRoot\CalLogHelpers\ShortClientNameFunctions.ps1
 . $PSScriptRoot\CalLogHelpers\CalLogInfoFunctions.ps1
 . $PSScriptRoot\CalLogHelpers\CalLogExportFunctions.ps1
 . $PSScriptRoot\CalLogHelpers\CreateTimelineRow.ps1
 . $PSScriptRoot\CalLogHelpers\FindChangedPropFunctions.ps1
 . $PSScriptRoot\CalLogHelpers\Write-DashLineBoxColor.ps1
 
 if ($ExportToExcel.IsPresent) {
+    . $PSScriptRoot\..\Shared\Confirm-Administrator.ps1
+    $script:IsAdministrator = Confirm-Administrator
     . $PSScriptRoot\CalLogHelpers\ExcelModuleInstaller.ps1
     . $PSScriptRoot\CalLogHelpers\ExportToExcelFunctions.ps1
 }
@@ -162,14 +163,13 @@ if (-not ([string]::IsNullOrEmpty($Subject)) ) {
                     if ($LogToExamine.count -gt 100) {
                         Write-Host -ForegroundColor Cyan "`t This is a large number of logs to examine, this may take a while."
                     }
-                    Write-Host -ForegroundColor Cyan "`t Ignore the next [$($LogToExamine.count)] warnings..."
                     $logLeftCount = $LogToExamine.count
 
                     $ExceptionLogs = $LogToExamine | ForEach-Object {
                         $logLeftCount -= 1
                         Write-Verbose "Getting Exception Logs for [$($_.ItemId.ObjectId)]"
-                        Get-CalendarDiagnosticObjects -Identity $ID -ItemIds $_.ItemId.ObjectId -ShouldFetchRecurrenceExceptions $true -CustomPropertyNames $CustomPropertyNameList -ShouldBindToItem $true
-                        if ($logLeftCount % 20 -eq 0) {
+                        Get-CalendarDiagnosticObjects -Identity $ID -ItemIds $_.ItemId.ObjectId -ShouldFetchRecurrenceExceptions $true -CustomPropertyNames $CustomPropertyNameList -ShouldBindToItem $true -WarningAction SilentlyContinue
+                        if (($logLeftCount % 10 -eq 0) -and ($logLeftCount -gt 0)) {
                             Write-Host -ForegroundColor Cyan "`t [$($logLeftCount)] logs left to examine..."
                         }
                     }