Watcher/watcher
4
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Live Anzeige des Netzwerkstatus funktioniert

Browse Source
This commit is contained in:
Daniel Habenicht
2025-10-01 10:15:50 +02:00
parent 6248fad147
commit 52c4243efc
7 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Watcher/Controllers/HomeController.cs
View File

@@ -18,11 +18,16 @@ namespace Watcher.Controllers
// Logging einbinden
private readonly ILogger<HomeController> _logger;
// Daten der Backgroundchecks abrufen
private INetworkCheckStore _NetworkCheckStore;
// HomeController Constructor
public HomeController(AppDbContext context, ILogger<HomeController> logger)
public HomeController(AppDbContext context, ILogger<HomeController> logger, INetworkCheckStore NetworkCheckStore)
{
_context = context;
_logger = logger;
_NetworkCheckStore = NetworkCheckStore;
}
// Dashboard unter /home/index
@@ -36,6 +41,7 @@ namespace Watcher.Controllers
.Where(u => u.Username == preferredUserName)
.FirstOrDefaultAsync();
Console.WriteLine("Index" + _NetworkCheckStore.NetworkStatus);
var viewModel = new DashboardViewModel
{
ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline),
@@ -53,8 +59,9 @@ namespace Watcher.Controllers
Containers = await _context.Containers
.OrderBy(s => s.Name)
.ToListAsync(),
NetworkStatus = _NetworkCheckStore.NetworkStatus
};
//ViewBag.NetworkConnection = ReturnNetworkStatus();
//ViewBag.NetworkConnection = _NetworkCheckStore.NetworkStatus;
return View(viewModel);
}
@@ -67,6 +74,8 @@ namespace Watcher.Controllers
var now = DateTime.UtcNow;
Console.WriteLine("DashboardStats" + _NetworkCheckStore.NetworkStatus);
var model = new DashboardViewModel
{
ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline),
@@ -82,7 +91,8 @@ namespace Watcher.Controllers
.ToListAsync(),
Containers = await _context.Containers
.OrderBy(s => s.Name)
.ToListAsync()
.ToListAsync(),
NetworkStatus = _NetworkCheckStore.NetworkStatus
};
return PartialView("_DashboardStats", model);

5
Watcher/Program.cs
View File

@@ -34,6 +34,9 @@ builder.Services.AddControllersWithViews();
// HttpContentAccessor
builder.Services.AddHttpContextAccessor();
// Storage Singleton
builder.Services.AddSingleton<INetworkCheckStore, NetworkCheckStore>();
// Background Services
builder.Services.AddHostedService<NetworkCheck>();
@@ -218,4 +221,4 @@ app.MapControllerRoute(
pattern: "{controller=Home}/{action=Index}/{id?}"
);
app.Run();
app.Run();

6
Watcher/Services/INetworkCheckStore.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Watcher.Services;
public interface INetworkCheckStore
{
String? NetworkStatus { get; set; }
}

13
Watcher/Services/NetworkCheck.cs
View File

@@ -6,16 +6,13 @@ public class NetworkCheck : BackgroundService
{
private readonly ILogger<NetworkCheck> _logger;
public static String networkCheckResult
{
get { return networkCheckResult; }
set { networkCheckResult = value; }
private INetworkCheckStore _NetworkCheckStore;
}
public NetworkCheck(ILogger<NetworkCheck> logger)
public NetworkCheck(ILogger<NetworkCheck> logger, INetworkCheckStore NetworkCheckStore)
{
_logger = logger;
_NetworkCheckStore = NetworkCheckStore;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -44,11 +41,13 @@ public class NetworkCheck : BackgroundService
PingReply reply = p.Send(host, 3000);
if (reply.Status == IPStatus.Success)
{
_NetworkCheckStore.NetworkStatus = "online";
_logger.LogInformation("Ping successfull. Watcher is online.");
}
}
catch
{
_NetworkCheckStore.NetworkStatus = "offline";
_logger.LogError("Ping failed. Watcher appears to have no network connection.");
}

6
Watcher/Services/NetworkCheckStore.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Watcher.Services;
public class NetworkCheckStore : INetworkCheckStore
{
public String? NetworkStatus { get; set; }
}

2
Watcher/ViewModels/DashboardViewModel.cs
View File

@@ -14,5 +14,7 @@ namespace Watcher.ViewModels
public List<LogEvent> RecentEvents { get; set; } = new();
public List<Container> Containers { get; set; } = new();
public String? NetworkStatus { get; set; } = "?";
}
}

34
Watcher/Views/Home/_DashboardStats.cshtml
View File

@@ -1,3 +1,4 @@
@using Microsoft.IdentityModel.Tokens
@model Watcher.ViewModels.DashboardViewModel
@{
@@ -57,13 +58,28 @@
<div class="card-body">
<h5 class="fw-bold mb-3"><i class="bi bi-heart-pulse me-2 text-danger"></i>Systemstatus</h5>
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Netzwerk</span>
<span class="badge bg-success">NetworkConnection</span>
</div>
<div class="progress mb-3" style="height: 6px;">
<div class="progress-bar bg-success w-100"></div>
</div>
@if (!Model.NetworkStatus.IsNullOrEmpty())
{
@if (Model.NetworkStatus == "online")
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Netzwerk</span>
<span class="badge bg-success">@Model.NetworkStatus</span>
</div>
<div class="progress mb-3" style="height: 6px;">
<div class="progress-bar bg-success w-100"></div>
</div>
} else if (Model.NetworkStatus == "offline")
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Netzwerk</span>
<span class="badge bg-danger">@Model.NetworkStatus</span>
</div>
<div class="progress mb-3" style="height: 6px;">
<div class="progress-bar bg-danger w-100"></div>
</div>
}
}
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span>
@@ -123,10 +139,10 @@
{
<li class="list-group-item d-flex justify-content-between align-items-center serverlist">
<span>@server.Name</span>
<span class="badge bg-info")">
<span class="badge bg-info" )">
CPU: 30.45%
</span>
<span class="badge bg-info")">
<span class="badge bg-info" )">
RAM: 65.09%
</span>
<span class="badge @(server.IsOnline ? "bg-success" : "bg-danger")">