From 609e4519a74742198d2c4c54a505f353f6cfa57a Mon Sep 17 00:00:00 2001 From: kmccarthyy <107080002+kmccarthyy@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:25:01 -0600 Subject: [PATCH 1/2] Update GetUsageCounts.ps1 Proposing to reword 'Licensed Target Count' to 'Licensed Machine Count' as well as changing 'Machine counts' to 'Total Machine Count.' There was some confusion from a customer who is moving to PTM. They thought that we were not correctly de-duplicating targets across spaces. They were under the impression that their quote would be based on the 'Total Machine Count,' not the 'Licensed Machine Count.' --- REST/PowerShell/Administration/GetUsageCounts.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/REST/PowerShell/Administration/GetUsageCounts.ps1 b/REST/PowerShell/Administration/GetUsageCounts.ps1 index 7c5580dc..8f1d9336 100644 --- a/REST/PowerShell/Administration/GetUsageCounts.ps1 +++ b/REST/PowerShell/Administration/GetUsageCounts.ps1 @@ -566,10 +566,10 @@ Write-Host "The item counts are as follows:" Write-Host " Instance ID: $($apiInformation.InstallationId)" Write-Host " Server Version: $($apiInformation.Version)" Write-Host " Number of Server Nodes: $($nodeInfo.TotalResults)" -Write-Host " Licensed Target Count: $($ObjectCounts.LicensedTargetCount) (these are active targets de-duped across the instance if running a modern version of Octopus)" -ForegroundColor Green +Write-Host " Licensed Machine Count: $($ObjectCounts.LicensedTargetCount) (these are active targets de-duped across the instance if running a modern version of Octopus)" -ForegroundColor Green Write-Host " Project Count: $($ObjectCounts.ProjectCount)" Write-Host " Tenant Count: $($ObjectCounts.TenantCount)" -Write-Host " Machine Counts (Active Linux and Windows Tentacles and SSH Connections): $($ObjectCounts.WindowsLinuxMachineCount)" +Write-Host " Total Machine Count (Active Linux and Windows Tentacles and SSH Connections): $($ObjectCounts.WindowsLinuxMachineCount)" Write-Host " Deployment Target Count: $($ObjectCounts.TargetCount)" Write-Host " Active and Available Targets: $($ObjectCounts.ActiveTargetCount)" -ForegroundColor Green Write-Host " Active but Unavailable Targets: $($ObjectCounts.UnavailableTargetCount)" -ForegroundColor Yellow From 063bc0081f02c61149d0d12c29036000f056217d Mon Sep 17 00:00:00 2001 From: kmccarthyy <107080002+kmccarthyy@users.noreply.github.com> Date: Mon, 10 Mar 2025 09:16:44 -0500 Subject: [PATCH 2/2] Update GetUsageCounts.ps1 putting "Licensed Target Count" back per Ryan's request (this is the language used for those still on the old licensing model). --- REST/PowerShell/Administration/GetUsageCounts.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REST/PowerShell/Administration/GetUsageCounts.ps1 b/REST/PowerShell/Administration/GetUsageCounts.ps1 index 8f1d9336..542081ef 100644 --- a/REST/PowerShell/Administration/GetUsageCounts.ps1 +++ b/REST/PowerShell/Administration/GetUsageCounts.ps1 @@ -566,7 +566,7 @@ Write-Host "The item counts are as follows:" Write-Host " Instance ID: $($apiInformation.InstallationId)" Write-Host " Server Version: $($apiInformation.Version)" Write-Host " Number of Server Nodes: $($nodeInfo.TotalResults)" -Write-Host " Licensed Machine Count: $($ObjectCounts.LicensedTargetCount) (these are active targets de-duped across the instance if running a modern version of Octopus)" -ForegroundColor Green +Write-Host " Licensed Target Count: $($ObjectCounts.LicensedTargetCount) (these are active targets de-duped across the instance if running a modern version of Octopus)" -ForegroundColor Green Write-Host " Project Count: $($ObjectCounts.ProjectCount)" Write-Host " Tenant Count: $($ObjectCounts.TenantCount)" Write-Host " Total Machine Count (Active Linux and Windows Tentacles and SSH Connections): $($ObjectCounts.WindowsLinuxMachineCount)"