From 8f7237196cdfad6d46398ecbeb9a4cef6fd853f6 Mon Sep 17 00:00:00 2001 From: Markus Fleschutz Date: Mon, 9 Sep 2024 22:03:20 +0200 Subject: [PATCH] Improved some scripts --- scripts/check-pending-reboot.ps1 | 34 ++++++++++---------- scripts/check-software.ps1 | 3 +- scripts/check-uptime.ps1 | 55 +++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 21 deletions(-) diff --git a/scripts/check-pending-reboot.ps1 b/scripts/check-pending-reboot.ps1 index f8a8c368..df69dd0b 100755 --- a/scripts/check-pending-reboot.ps1 +++ b/scripts/check-pending-reboot.ps1 @@ -22,50 +22,48 @@ function Test-RegistryValue { param([parameter(Mandatory=$true)][ValidateNotNull } try { - $Reason = "" + $reply = "✅ No pending reboot" if ($IsLinux) { if (Test-Path "/var/run/reboot-required") { - $Reason = "found: /var/run/reboot-required" - Write-Host "⚠️ Pending reboot ($Reason)" + $reply = "⚠️ Pending reboot (found: /var/run/reboot-required)" } } else { + $reason = "" if (Test-Path -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired") { - $Reason += ", ...\Auto Update\RebootRequired" + $reason += ", ...\Auto Update\RebootRequired" } if (Test-Path -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\PostRebootReporting") { - $Reason += ", ...\Auto Update\PostRebootReporting" + $reason += ", ...\Auto Update\PostRebootReporting" } if (Test-Path -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending") { - $Reason += ", ...\Component Based Servicing\RebootPending" + $reason += ", ...\Component Based Servicing\RebootPending" } if (Test-Path -Path "HKLM:\SOFTWARE\Microsoft\ServerManager\CurrentRebootAttempts") { - $Reason += ", ...\ServerManager\CurrentRebootAttempts" + $reason += ", ...\ServerManager\CurrentRebootAttempts" } if (Test-RegistryValue -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing" -Value "RebootInProgress") { - $Reason += ", ...\CurrentVersion\Component Based Servicing with 'RebootInProgress'" + $reason += ", ...\CurrentVersion\Component Based Servicing with 'RebootInProgress'" } if (Test-RegistryValue -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing" -Value "PackagesPending") { - $Reason += ", '...\CurrentVersion\Component Based Servicing' with 'PackagesPending'" + $reason += ", '...\CurrentVersion\Component Based Servicing' with 'PackagesPending'" } if (Test-RegistryValue -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager" -Value "PendingFileRenameOperations2") { - $Reason += ", '...\CurrentControlSet\Control\Session Manager' with 'PendingFileRenameOperations2'" + $reason += ", '...\CurrentControlSet\Control\Session Manager' with 'PendingFileRenameOperations2'" } if (Test-RegistryValue -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce" -Value "DVDRebootSignal") { - $Reason += ", '...\Windows\CurrentVersion\RunOnce' with 'DVDRebootSignal'" + $reason += ", '...\Windows\CurrentVersion\RunOnce' with 'DVDRebootSignal'" } if (Test-RegistryValue -Path "HKLM:\SYSTEM\CurrentControlSet\Services\Netlogon" -Value "JoinDomain") { - $Reason += ", '...\CurrentControlSet\Services\Netlogon' with 'JoinDomain'" + $reason += ", '...\CurrentControlSet\Services\Netlogon' with 'JoinDomain'" } if (Test-RegistryValue -Path "HKLM:\SYSTEM\CurrentControlSet\Services\Netlogon" -Value "AvoidSpnSet") { - $Reason += ", '...\CurrentControlSet\Services\Netlogon' with 'AvoidSpnSet'" + $reason += ", '...\CurrentControlSet\Services\Netlogon' with 'AvoidSpnSet'" } - if ($Reason -ne "") { - Write-Host "⚠️ Pending reboot (registry got $($Reason.substring(2)))" + if ($reason -ne "") { + $reply = "⚠️ Pending reboot (registry got $($reason.substring(2)))" } } - if ($Reason -eq "") { - Write-Host "✅ No pending reboot" - } + Write-Host $reply exit 0 # success } catch { "⚠️ Error in line $($_.InvocationInfo.ScriptLineNumber): $($Error[0])" diff --git a/scripts/check-software.ps1 b/scripts/check-software.ps1 index 6de1bed8..a31d0799 100755 --- a/scripts/check-software.ps1 +++ b/scripts/check-software.ps1 @@ -22,5 +22,4 @@ Write-Host "`n S O F T W A R E" -foregroundColor green & "$PSScriptRoot/check-powershell.ps1" & "$PSScriptRoot/check-time-zone.ps1" & "$PSScriptRoot/check-swap-space.ps1" -& "$PSScriptRoot/check-pending-reboot.ps1" -exit 0 # success \ No newline at end of file +exit 0 # success diff --git a/scripts/check-uptime.ps1 b/scripts/check-uptime.ps1 index 73c635af..9bca87e3 100755 --- a/scripts/check-uptime.ps1 +++ b/scripts/check-uptime.ps1 @@ -25,6 +25,15 @@ function TimeSpanAsString([TimeSpan]$uptime) } } +function Test-RegistryValue { param([parameter(Mandatory=$true)][ValidateNotNullOrEmpty()]$Path, [parameter(Mandatory=$true)] [ValidateNotNullOrEmpty()]$Value) + try { + Get-ItemProperty -Path $Path -Name $Value -EA Stop + return $true + } catch { + return $false + } +} + try { [system.threading.thread]::currentthread.currentculture = [system.globalization.cultureinfo]"en-US" if ($IsLinux) { @@ -34,7 +43,51 @@ try { $lastBootTime = (Get-CimInstance Win32_OperatingSystem).LastBootUpTime $uptime = New-TimeSpan -Start $lastBootTime -End (Get-Date) } - Write-Host "✅ $(hostname) is up for $(TimeSpanAsString $uptime) since $($lastBootTime.ToShortDateString())" + $status = "✅" + $pending = "No pending reboot" + if ($IsLinux) { + if (Test-Path "/var/run/reboot-required") { + $status = "⚠️ " + $pending = "Pending reboot (found: /var/run/reboot-required)" + } + } else { + $reason = "" + if (Test-Path -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired") { + $reason += ", ...\Auto Update\RebootRequired" + } + if (Test-Path -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\PostRebootReporting") { + $reason += ", ...\Auto Update\PostRebootReporting" + } + if (Test-Path -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending") { + $reason += ", ...\Component Based Servicing\RebootPending" + } + if (Test-Path -Path "HKLM:\SOFTWARE\Microsoft\ServerManager\CurrentRebootAttempts") { + $reason += ", ...\ServerManager\CurrentRebootAttempts" + } + if (Test-RegistryValue -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing" -Value "RebootInProgress") { + $reason += ", ...\CurrentVersion\Component Based Servicing with 'RebootInProgress'" + } + if (Test-RegistryValue -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing" -Value "PackagesPending") { + $reason += ", '...\CurrentVersion\Component Based Servicing' with 'PackagesPending'" + } + if (Test-RegistryValue -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager" -Value "PendingFileRenameOperations2") { + $reason += ", '...\CurrentControlSet\Control\Session Manager' with 'PendingFileRenameOperations2'" + } + if (Test-RegistryValue -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce" -Value "DVDRebootSignal") { + $reason += ", '...\Windows\CurrentVersion\RunOnce' with 'DVDRebootSignal'" + } + if (Test-RegistryValue -Path "HKLM:\SYSTEM\CurrentControlSet\Services\Netlogon" -Value "JoinDomain") { + $reason += ", '...\CurrentControlSet\Services\Netlogon' with 'JoinDomain'" + } + if (Test-RegistryValue -Path "HKLM:\SYSTEM\CurrentControlSet\Services\Netlogon" -Value "AvoidSpnSet") { + $reason += ", '...\CurrentControlSet\Services\Netlogon' with 'AvoidSpnSet'" + } + if ($reason -ne "") { + $status = "⚠️ " + $pending = "Pending reboot (registry got $($reason.substring(2)))" + } + } + Write-Host "$status $(hostname) is up for $(TimeSpanAsString $uptime) since $($lastBootTime.ToShortDateString()) - $pending" exit 0 # success } catch { "⚠️ Error in line $($_.InvocationInfo.ScriptLineNumber): $($Error[0])"