Skip to content

Worker site name & column width bug fix #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aspicola2605 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Worker site name & column width bug fix #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
068113a
New package files for worker site name
aspicola2605 Sep 13, 2018
b8d1996
Function files for worker site name/bug fixes
aspicola2605 Sep 13, 2018
e007a1b
Update euc-monitoring-json-ref.txt
aspicola2605 Sep 13, 2018
50bc044
Update euc-monitoring.json.template
aspicola2605 Sep 13, 2018
3303ca3
New-HtmlReport bug fix #2
aspicola2605 Sep 13, 2018
1ad7361
json reference update
aspicola2605 Sep 13, 2018
798cd56
Merge pull request #1 from aspicola2605/master_workersitename
aspicola2605 Sep 14, 2018
b1a2742
Update version #
aspicola2605 Sep 14, 2018
4285c14
Correct appveyor error
aspicola2605 Sep 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions PSGallery/Private/Get-DonutHTML.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function Get-DonutHTML {
Name Version Date Change Detail
David Brett 1.0 07/02/2018 Function Creation
Adam Yarborough 1.1 12/06/2018 Change to return string
Alex Spicola 1.2 11/09/2018 Worker donut site name
.EXAMPLE
None Required
#>
Expand All @@ -40,6 +41,7 @@ function Get-DonutHTML {
[parameter(Mandatory = $true, ValueFromPipeline = $true)]$DonutGoodColour,
[parameter(Mandatory = $true, ValueFromPipeline = $true)]$DonutBadColour,
[parameter(Mandatory = $true, ValueFromPipeline = $true)]$DonutStroke,
[parameter(Mandatory = $true, ValueFromPipeline = $true)]$SiteName,
[parameter(Mandatory = $true, ValueFromPipeline = $true)]$SeriesName,
[parameter(Mandatory = $true, ValueFromPipeline = $true)]$SeriesUpCount,
[parameter(Mandatory = $true, ValueFromPipeline = $true)]$SeriesDownCount,
Expand All @@ -62,12 +64,14 @@ function Get-DonutHTML {
$HTML += "<circle class='donut-segment' cx='21' cy='21' r='15.91549430918954' fill='transparent' stroke='$DonutBadColour' stroke-width='$DonutStroke' stroke-dasharray='$SeriesUpCount $SeriesDownCount' stroke-dashoffset='25'></circle>"

if ( $Worker ) {
$HTML += "<g class='worker-chart-text'>"
$HTML += "<text x='50%' y='50%' class='worker-chart-label'>"
$HTML += "<g class='worker-chart-text'>"
$HTML += "<text x='50%' y='50%' class='worker-chart-label'>"
$HTML += "$SiteName $SeriesName"
$HTML += "</text>"
}
else {
$HTML += "<g class='chart-text'>"
$HTML += "<text x='50%' y='50%' class='chart-label'>"
$HTML += "<text x='50%' y='50%' class='chart-label'>"
}

$HTML += "$SeriesName"
Expand Down
19 changes: 14 additions & 5 deletions PSGallery/Private/New-HtmlReport.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ function New-HtmlReport {
David Brett 1.4 26/06/2018 Bug Fixes and Code Cleaning
Fixes #24
Fixes #40
David Brett 1.5 21/08/2018 Bug fixes and naming clean up
David Brett 1.5 21/08/2018 Bug fixes and naming clean
Alex Spicola 1.6 11/09/2018 Worker donut site name, bug fixes
.EXAMPLE
None Required
#>
Expand Down Expand Up @@ -114,9 +115,9 @@ function New-HtmlReport {
foreach ($SeriesResult in $Results) {
if ("Worker" -ne $seriesresult.series) {
$totalinf ++
}
}
}
$totalinf--
if ($TotalInf -gt 1) {$totalinf--} else {$TotalInf = 1}
$ColumnPercent = 100 / [int]$totalinf

foreach ($SeriesResult in $Results) {
Expand All @@ -125,6 +126,7 @@ function New-HtmlReport {
$Width = $Height
$Up = 0
$Down = 0
$SiteName = "" # Blank XD site name, not used for these donuts
$Series = $SeriesResult.Series
if ($null -ne $series) {
if ( "Worker" -ne $Series ) {
Expand All @@ -144,7 +146,7 @@ function New-HtmlReport {
"NetScaler" {$NewSeries = "Citrix ADC"; break}
default {$NewSeries = $Series; break}
}
Get-DonutHTML $Height $Width $UpColor $DownColor $DonutStroke $NewSeries $Up $Down | Out-File $HTMLOutputFileFull -Append
Get-DonutHTML $Height $Width $UpColor $DownColor $DonutStroke $SiteName $NewSeries $Up $Down | Out-File $HTMLOutputFileFull -Append
"</td>" | Out-File $HTMLOutputFileFull -Append
}
}
Expand Down Expand Up @@ -172,6 +174,7 @@ function New-HtmlReport {
foreach ($SeriesResult in $Results) {
$DonutStroke = $ConfigObject.Global.WebData.WorkerDonutStroke
$Height = $ConfigObject.Global.WebData.WorkerDonutSize
$ShowSiteName = $ConfigObject.Global.WebData.WorkerSiteName
$Width = $Height
$Series = $SeriesResult.Series

Expand All @@ -189,7 +192,13 @@ function New-HtmlReport {
default {$NewName = $Series; break}
}
"<td width='$ColumnPercent%' align=center valign=top>" | Out-File $HTMLOutputFileFull -Append
Get-DonutHTML $Height $Width $UpColor $DownColor $DonutStroke $NewName $Up $Down -Worker | Out-File $HTMLOutputFileFull -Append
if ($ShowSiteName -eq $true) {
$SiteName = $CheckData.Values.SiteName | Select-Object -Unique
Get-DonutHTML $Height $Width $UpColor $DownColor $DonutStroke $SiteName $NewName $Up $Down -Worker | Out-File $HTMLOutputFileFull -Append
} else {
$SiteName = ""
Get-DonutHTML $Height $Width $UpColor $DownColor $DonutStroke $SiteName $NewName $Up $Down -Worker | Out-File $HTMLOutputFileFull -Append
}
"</td>" | Out-File $HTMLOutputFileFull -Append
}
}
Expand Down
1 change: 1 addition & 0 deletions Package/euc-monitoring-json-ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"htmldatafile": "htmldata.txt", - Can leave as default
"htmloutputfile": "index.html", - HTML Output File. can leave as default
"refreshduration": 0, - HTML Automatic page refresh, in seconds. 0 for no refresh
"WorkerSiteName": false, - Display XD site name in server and desktkop worker donuts
"UpColour": "rgba(221, 70, 70, 0.9)", - Color for Up Servers
"DownColour": "rgba(67, 137, 203, 0.95)", - Color for Down Servers.
"WorkerDonutStroke": 5, - Width for the Worker Donut Ring
Expand Down
3 changes: 2 additions & 1 deletion Package/euc-monitoring.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"htmldatafile": "htmldata.txt",
"htmloutputfile": "index.html",
"refreshduration": 0,
"WorkerSiteName": false,
"UpColour": "rgba(221, 70, 70, 0.9)",
"DownColour": "rgba(67, 137, 203, 0.95)",
"WorkerDonutStroke": 5,
Expand Down Expand Up @@ -366,4 +367,4 @@
"SessionManagerProxy"
]
}
}
}