diff --git a/Scenarios/AzSHCI and Grafana/Dashboards/AzSHCI-Host_Health_Dashboard.json b/Scenarios/AzSHCI and Grafana/Dashboards/AzSHCI-Host_Health_Dashboard.json index a068cd40..5e15adb6 100644 --- a/Scenarios/AzSHCI and Grafana/Dashboards/AzSHCI-Host_Health_Dashboard.json +++ b/Scenarios/AzSHCI and Grafana/Dashboards/AzSHCI-Host_Health_Dashboard.json @@ -646,7 +646,7 @@ "type": "fill" } ], - "hide": true, + "hide": false, "measurement": "win_mem", "orderByTime": "ASC", "policy": "default", @@ -693,6 +693,7 @@ "type": "fill" } ], + "hide": true, "measurement": "win_pagefile", "orderByTime": "ASC", "policy": "default", diff --git a/Scenarios/AzSHCI and Grafana/Scenario.ps1 b/Scenarios/AzSHCI and Grafana/Scenario.ps1 index 40651168..eadb06ec 100644 --- a/Scenarios/AzSHCI and Grafana/Scenario.ps1 +++ b/Scenarios/AzSHCI and Grafana/Scenario.ps1 @@ -739,7 +739,7 @@ New-NetFirewallRule -CimSession $GrafanaServerName ` $RDMAAdapters=(Get-NetAdapterRdma | Where-Object OperationalState -eq $true | Where-Object Description -NotLike Hyper* |Sort-Object InterfaceDescription).InterfaceDescription $output=$Null foreach ($Adapter in $RDMAAdapters){$output+="`,`"$Adapter`""} - $output=$output.TrimStart(",") + if ($output){$output=$output.TrimStart(",")} $Config=$config.replace("PlaceRDMAAdaptersHere","$Output") $Config | Out-File -FilePath "$env:ProgramFiles\telegraf\telegraf.conf" -Encoding UTF8 -Force $using:posh | Out-File -FilePath "$env:ProgramFiles\telegraf\telegraf.ps1" -Encoding UTF8 -Force @@ -773,7 +773,7 @@ New-NetFirewallRule -CimSession $GrafanaServerName ` $RDMAAdapters=(Get-NetAdapterRdma | Where-Object OperationalState -eq $true | Where-Object Description -NotLike Hyper* |Sort-Object InterfaceDescription).InterfaceDescription $output=$Null foreach ($Adapter in $RDMAAdapters){$output+="`,`"$Adapter`""} - $output=$output.TrimStart(",") + if ($output){$output=$output.TrimStart(",")} $Config=$config.replace("PlaceRDMAAdaptersHere","$Output") $Config | Out-File -FilePath "$env:ProgramFiles\telegraf\telegraf.conf" -Encoding UTF8 -Force $using:posh | Out-File -FilePath "$env:ProgramFiles\telegraf\telegraf.ps1" -Encoding UTF8 -Force diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Cache.png b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Cache.png index 413474a0..213d1713 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Cache.png and b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Cache.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Host_Health_Dashboard.png b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Host_Health_Dashboard.png index d107011b..7824b0fa 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Host_Health_Dashboard.png and b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Host_Health_Dashboard.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Hyper-V_Metrics.png b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Hyper-V_Metrics.png index 20221fd7..f3bac7c2 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Hyper-V_Metrics.png and b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Hyper-V_Metrics.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Network_Dashboard.png b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Network_Dashboard.png index 8e7bce30..fcab0dcd 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Network_Dashboard.png and b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Network_Dashboard.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Overview.png b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Overview.png index c0e2966b..a6e2aee9 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Overview.png and b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Overview.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Storage_Dashboard.png b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Storage_Dashboard.png index e4929531..689189a4 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Storage_Dashboard.png and b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Storage_Dashboard.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Storage_Dashboard_Small.png b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Storage_Dashboard_Small.png index 6f054b70..c3dbb18e 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Storage_Dashboard_Small.png and b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-Storage_Dashboard_Small.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-VMFleet.png b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-VMFleet.png index f9b8348b..23ffb875 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-VMFleet.png and b/Scenarios/AzSHCI and Grafana/Screenshots/Dash-AzSHCI-VMFleet.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/DownloadedFiles.png b/Scenarios/AzSHCI and Grafana/Screenshots/DownloadedFiles.png index fadb7341..66d721d8 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/DownloadedFiles.png and b/Scenarios/AzSHCI and Grafana/Screenshots/DownloadedFiles.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource01.png b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource01.png index ec0d584a..c1ba1ff0 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource01.png and b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource01.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource02.png b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource02.png index 7487bb2a..98603ad6 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource02.png and b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource02.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource03.png b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource03.png index 5634d566..8afb89c1 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource03.png and b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource03.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource04.png b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource04.png index 48c357bb..f86c9054 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource04.png and b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaAddDatasource04.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaImportDashboard01.png b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaImportDashboard01.png index 5250656f..8ee817c2 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaImportDashboard01.png and b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaImportDashboard01.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaImportDashboard02.png b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaImportDashboard02.png index 2bee3586..5a1d7c5e 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaImportDashboard02.png and b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaImportDashboard02.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaUsers.png b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaUsers.png index 6c808d57..77a29f9f 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaUsers.png and b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaUsers.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaWeb.png b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaWeb.png index ea7bc322..b908c57d 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaWeb.png and b/Scenarios/AzSHCI and Grafana/Screenshots/GrafanaWeb.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/Scenario.png b/Scenarios/AzSHCI and Grafana/Screenshots/Scenario.png index 3d766a8a..863ef158 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/Scenario.png and b/Scenarios/AzSHCI and Grafana/Screenshots/Scenario.png differ diff --git a/Scenarios/AzSHCI and Grafana/Screenshots/VMs.png b/Scenarios/AzSHCI and Grafana/Screenshots/VMs.png index 1a52fd33..23996c8f 100644 Binary files a/Scenarios/AzSHCI and Grafana/Screenshots/VMs.png and b/Scenarios/AzSHCI and Grafana/Screenshots/VMs.png differ diff --git a/Scenarios/AzSHCI and Grafana/readme.md b/Scenarios/AzSHCI and Grafana/readme.md index 2bd05b22..e0de3089 100644 --- a/Scenarios/AzSHCI and Grafana/readme.md +++ b/Scenarios/AzSHCI and Grafana/readme.md @@ -34,7 +34,7 @@ In following lab you will install [Grafana](http://grafana.com), [influxDB and T The scenario demonstrates how to configure Grafana to use SSL and also to use LDAP over SSL. Scenario shares the code with [Certification Authority scenario](/Scenarios/Certification%20Authority)). To secure InfluxDB is IPSec used. Also InfluxDB access is restricted (and encrypted) using firewall rules to nodes and grafana server (and management server, in this case DC). -As prerequisite, deploy [S2D hyperconverged scenario](/Scenarios/S2D%20Hyperconverged) just to have some data to play with. $realVMs=$true in Labconfig to have real virtual machines that provide workload. You can also consider loading some workload using [S2D and Diskspd scenario](/Scenarios/S2D%20and%20Diskspd) +As prerequisite, deploy [Azure Stack HCI 22H2 scenario](/Scenarios/AzSHCI%20Deployment%2022H2%20Edition) just to have some data to play with. $realVMs=$true in Labconfig to have real virtual machines that provide workload. You can also consider loading some workload using [AzSHCI and VMFleet scenario](/Scenarios/AzSHCI%20and%20VMFleet) Big thanks to https://twitter.com/Vecteurinfo who provided telegraf.conf and telegraf.ps1 together with his [dashboard](https://twitter.com/Vecteurinfo/status/1116386589389856770?s=20) that was later modified by Martin Rasendorfer to be universal and to be able to switch between clusters. Also big help comes from https://twitter.com/vladimirmach and his insight into Linux world and certs. Lastly big thanks goes to Lee Harrison who provided his [dashboards and telegraf.conf](https://github.com/hciharrison/monitoring) @@ -47,25 +47,23 @@ Further improvements welcomed - feel free to pull request! ![](/Scenarios/AzSHCI%20and%20Grafana/Screenshots/VMs.png) ```PowerShell -$LabConfig=@{ DomainAdminName='LabAdmin'; AdminPassword='LS1setup!';<# Prefix = 'WSLab-';#> SwitchName = 'LabSwitch'; DCEdition='4'; Internet=$true ; AdditionalNetworksConfig=@(); VMs=@()} +$LabConfig=@{ DomainAdminName='LabAdmin'; AdminPassword='LS1setup!';<# Prefix = 'MSLab-';#> SwitchName = 'LabSwitch'; DCEdition='4'; Internet=$true ; AdditionalNetworksConfig=@(); VMs=@()} -1..4 | ForEach-Object {$VMNames="S2D"; $LABConfig.VMs += @{ VMName = "$VMNames$_" ; Configuration = 'S2D' ; ParentVHD = 'Win2019Core_G2.vhdx'; SSDNumber = 0; SSDSize=800GB ; HDDNumber = 12; HDDSize= 4TB ; MemoryStartupBytes= 4GB ; NestedVirt=$true}} +#Azure Stack HCI 22H2 +1..4 | ForEach-Object {$LABConfig.VMs += @{ VMName = "AzSHCI$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI22H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 2TB ; MemoryStartupBytes= 1GB; VMProcessorCount=4 ; vTPM=$true}} +#Or with nested virtualization enabled +#1..4 | ForEach-Object {$LABConfig.VMs += @{ VMName = "AzSHCI$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI22H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 2TB ; MemoryStartupBytes= 4GB; VMProcessorCount=4 ; vTPM=$true ; NestedVirt=$true}} -#or without nested virt and just 512MB of memory -#1..4 | ForEach-Object {$VMNames="S2D"; $LABConfig.VMs += @{ VMName = "$VMNames$_" ; Configuration = 'S2D' ; ParentVHD = 'Win2019Core_G2.vhdx'; SSDNumber = 0; SSDSize=800GB ; HDDNumber = 12; HDDSize= 4TB ; MemoryStartupBytes= 512MB}} - -$LabConfig.VMs += @{ VMName = 'CA' ; ParentVHD = 'Win2019Core_G2.vhdx'} -$LabConfig.VMs += @{ VMName = 'Grafana' ; ParentVHD = 'Win2019Core_G2.vhdx'; MemoryStartupBytes= 1GB } -$LabConfig.VMs += @{ VMName = 'InfluxDB' ; Configuration = 's2d' ; ParentVHD = 'Win2019Core_G2.vhdx'; SSDNumber = 1; SSDSize=1GB ; HDDNumber = 0; HDDSize= 4TB ; MemoryStartupBytes= 1GB } - -#Optional management machine -#$LabConfig.VMs += @{ VMName = 'Management' ; ParentVHD = 'Win1019H1_G2.vhdx' ; AddToolsVHD=$True ; DisableWCF=$True } +$LabConfig.VMs += @{ VMName = 'Management' ; ParentVHD = 'Win2022_G2.vhdx' ; MGMTNICs=1} +$LabConfig.VMs += @{ VMName = 'CA' ; ParentVHD = 'Win2022Core_G2.vhdx' ; MGMTNICs=1} +$LabConfig.VMs += @{ VMName = 'Grafana' ; ParentVHD = 'Win2022Core_G2.vhdx'; MemoryStartupBytes= 1GB ; MGMTNICs=1} +$LabConfig.VMs += @{ VMName = 'InfluxDB' ; ParentVHD = 'Win2022Core_G2.vhdx'; Configuration = 's2d' ; SSDNumber = 1 ; SSDSize=1GB ; HDDNumber = 0 ; HDDSize= 4TB ; MemoryStartupBytes= 1GB ; MGMTNICs=1} ``` ## The lab -Follow the code in [Scenario.ps1](/Scenarios/AzSHCI%20and%20Grafana/Scenario.ps1). Run all code from DC (or Management machine). +Follow the code in [Scenario.ps1](/Scenarios/AzSHCI%20and%20Grafana/Scenario.ps1). Run all code from Management machine. ![](/Scenarios/AzSHCI%20and%20Grafana/Screenshots/Scenario.png)