Merge pull request 'feature/network-check' (#20) from feature/network-check into development

Reviewed-on: #20

Watcher/Controllers/HomeController.cs

@@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 // Local Namespaces
 using Watcher.Data;
-using Watcher.Models;
 using Watcher.ViewModels;
+using Watcher.Services;
 
 namespace Watcher.Controllers
 {
@@ -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),
@@ -52,9 +58,10 @@ namespace Watcher.Controllers
                     .ToListAsync(),
                 Containers = await _context.Containers
                     .OrderBy(s => s.Name)
-                    .ToListAsync()
+                    .ToListAsync(),
+                NetworkStatus = _NetworkCheckStore.NetworkStatus
             };
-
+            //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,11 +91,17 @@ namespace Watcher.Controllers
                     .ToListAsync(),
                 Containers = await _context.Containers
                     .OrderBy(s => s.Name)
-                    .ToListAsync()
+                    .ToListAsync(),
+                NetworkStatus = _NetworkCheckStore.NetworkStatus
             };
 
             return PartialView("_DashboardStats", model);
         }
 
+        public String ReturnNetworkStatus()
+        {
+            return "OK";
+        }
+
     }
 }

Watcher/Program.cs

@@ -5,6 +5,7 @@ using Serilog;
 
 using Watcher.Data;
 using Watcher.Models;
+using Watcher.Services;
 //using Watcher.Services;
 //using Watcher.Workers;
 
@@ -15,7 +16,7 @@ var builder = WebApplication.CreateBuilder(args);
 // Serilog konfigurieren – nur Logs, die nicht von Microsoft stammen
 Log.Logger = new LoggerConfiguration()
     .MinimumLevel.Information()
-    .MinimumLevel.Override("Microsoft", Serilog.Events.LogEventLevel.Warning) // <--
+    .MinimumLevel.Override("Microsoft", Serilog.Events.LogEventLevel.Warning)
     .Enrich.FromLogContext()
     .WriteTo.File(
         "logs/watcher-.log",
@@ -33,6 +34,12 @@ builder.Services.AddControllersWithViews();
 // HttpContentAccessor
 builder.Services.AddHttpContextAccessor();
 
+// Storage Singleton
+builder.Services.AddSingleton<INetworkCheckStore, NetworkCheckStore>();
+
+// Background Services
+builder.Services.AddHostedService<NetworkCheck>();
+
 
 // ---------- Konfiguration ----------
 DotNetEnv.Env.Load();
@@ -214,4 +221,4 @@ app.MapControllerRoute(
     pattern: "{controller=Home}/{action=Index}/{id?}"
     );
 
-app.Run();
+app.Run();

Watcher/Services/INetworkCheckStore.cs

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

Watcher/Services/NetworkCheck.cs

@@ -0,0 +1,58 @@
+using System.Composition;
+using System.Net.NetworkInformation;
+
+namespace Watcher.Services;
+public class NetworkCheck : BackgroundService
+{
+    private readonly ILogger<NetworkCheck> _logger;
+
+    private INetworkCheckStore _NetworkCheckStore;
+
+    public NetworkCheck(ILogger<NetworkCheck> logger, INetworkCheckStore NetworkCheckStore)
+    {
+        _logger = logger;
+        _NetworkCheckStore = NetworkCheckStore;
+
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        var timer = new PeriodicTimer(TimeSpan.FromSeconds(30));
+
+        while (await timer.WaitForNextTickAsync(stoppingToken))
+        {
+            // Hintergrundprozess abwarten
+            await checkConnectionAsync();
+
+            // 5 Sekdunden Offset
+            await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
+        }
+    }
+
+    public Task checkConnectionAsync()
+    {
+        _logger.LogInformation("Networkcheck started.");
+
+        string host = "8.8.8.8";
+        Ping p = new Ping();
+
+        try
+        {
+            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.");
+        }
+
+        _logger.LogInformation("Networkcheck finished.");
+
+        return Task.CompletedTask;
+    }
+}

Watcher/Services/NetworkCheckStore.cs

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

Watcher/ViewModels/DashboardViewModel.cs

@@ -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; } = "?";
+
     }
 }

Watcher/Views/Home/_DashboardStats.cshtml

@@ -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">OK</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")">