6 Commits

11 changed files with 229 additions and 23 deletions

View File

@@ -50,13 +50,13 @@ jobs:
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
registry: git.triggermeelmo.com registry: git.triggermeelmo.com
username: ${{ secrets.AUTOMATION_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.AUTOMATION_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push Multi-Arch Docker Image - name: Build and Push Multi-Arch Docker Image
run: | run: |
docker buildx build \ docker buildx build \
--platform ${{ env.DOCKER_PLATFORMS }} \ --platform ${{ env.DOCKER_PLATFORMS }} \
-t ${{ env.REGISTRY_URL }}/${{ env.DOCKER_IMAGE_NAME }}:v0.1.1 \ -t ${{ env.REGISTRY_URL }}/${{ env.DOCKER_IMAGE_NAME }}:v0.1.0 \
-t ${{ env.REGISTRY_URL }}/${{ env.DOCKER_IMAGE_NAME }}:${{ github.sha }} \ -t ${{ env.REGISTRY_URL }}/${{ env.DOCKER_IMAGE_NAME }}:${{ github.sha }} \
--push . --push .

View File

@@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
// Local Namespaces // Local Namespaces
using Watcher.Data; using Watcher.Data;
using Watcher.Models;
using Watcher.ViewModels; using Watcher.ViewModels;
using Watcher.Services;
namespace Watcher.Controllers namespace Watcher.Controllers
{ {
@@ -18,11 +18,16 @@ namespace Watcher.Controllers
// Logging einbinden // Logging einbinden
private readonly ILogger<HomeController> _logger; private readonly ILogger<HomeController> _logger;
// Daten der Backgroundchecks abrufen
private IDashboardStore _DashboardStore;
// HomeController Constructor // HomeController Constructor
public HomeController(AppDbContext context, ILogger<HomeController> logger) public HomeController(AppDbContext context, ILogger<HomeController> logger, IDashboardStore dashboardStore)
{ {
_context = context; _context = context;
_logger = logger; _logger = logger;
_DashboardStore = dashboardStore;
} }
// Dashboard unter /home/index // Dashboard unter /home/index
@@ -36,6 +41,7 @@ namespace Watcher.Controllers
.Where(u => u.Username == preferredUserName) .Where(u => u.Username == preferredUserName)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
Console.WriteLine("Index" + _DashboardStore.NetworkStatus);
var viewModel = new DashboardViewModel var viewModel = new DashboardViewModel
{ {
ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline), ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline),
@@ -52,9 +58,11 @@ namespace Watcher.Controllers
.ToListAsync(), .ToListAsync(),
Containers = await _context.Containers Containers = await _context.Containers
.OrderBy(s => s.Name) .OrderBy(s => s.Name)
.ToListAsync() .ToListAsync(),
NetworkStatus = _DashboardStore.NetworkStatus,
DatabaseStatus = _DashboardStore.DatabaseStatus
}; };
//ViewBag.NetworkConnection = _NetworkCheckStore.NetworkStatus;
return View(viewModel); return View(viewModel);
} }
@@ -67,6 +75,8 @@ namespace Watcher.Controllers
var now = DateTime.UtcNow; var now = DateTime.UtcNow;
Console.WriteLine("DashboardStats" + _DashboardStore.NetworkStatus);
var model = new DashboardViewModel var model = new DashboardViewModel
{ {
ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline), ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline),
@@ -82,11 +92,18 @@ namespace Watcher.Controllers
.ToListAsync(), .ToListAsync(),
Containers = await _context.Containers Containers = await _context.Containers
.OrderBy(s => s.Name) .OrderBy(s => s.Name)
.ToListAsync() .ToListAsync(),
NetworkStatus = _DashboardStore.NetworkStatus,
DatabaseStatus = _DashboardStore.DatabaseStatus
}; };
return PartialView("_DashboardStats", model); return PartialView("_DashboardStats", model);
} }
public String ReturnNetworkStatus()
{
return "OK";
}
} }
} }

View File

@@ -5,6 +5,7 @@ using Serilog;
using Watcher.Data; using Watcher.Data;
using Watcher.Models; using Watcher.Models;
using Watcher.Services;
//using Watcher.Services; //using Watcher.Services;
//using Watcher.Workers; //using Watcher.Workers;
@@ -15,7 +16,7 @@ var builder = WebApplication.CreateBuilder(args);
// Serilog konfigurieren nur Logs, die nicht von Microsoft stammen // Serilog konfigurieren nur Logs, die nicht von Microsoft stammen
Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
.MinimumLevel.Information() .MinimumLevel.Information()
.MinimumLevel.Override("Microsoft", Serilog.Events.LogEventLevel.Warning) // <-- .MinimumLevel.Override("Microsoft", Serilog.Events.LogEventLevel.Warning)
.Enrich.FromLogContext() .Enrich.FromLogContext()
.WriteTo.File( .WriteTo.File(
"logs/watcher-.log", "logs/watcher-.log",
@@ -33,6 +34,13 @@ builder.Services.AddControllersWithViews();
// HttpContentAccessor // HttpContentAccessor
builder.Services.AddHttpContextAccessor(); builder.Services.AddHttpContextAccessor();
// Storage Singleton
builder.Services.AddSingleton<IDashboardStore, DashboardStore>();
// Background Services
builder.Services.AddHostedService<NetworkCheck>();
builder.Services.AddHostedService<DatabaseCheck>();
// ---------- Konfiguration ---------- // ---------- Konfiguration ----------
DotNetEnv.Env.Load(); DotNetEnv.Env.Load();

View File

@@ -0,0 +1,8 @@
namespace Watcher.Services;
public class DashboardStore : IDashboardStore
{
public String? NetworkStatus { get; set; }
public String? DatabaseStatus { get; set; }
}

View File

@@ -0,0 +1,67 @@
using Microsoft.Data.Sqlite;
namespace Watcher.Services;
public class DatabaseCheck : BackgroundService
{
private readonly ILogger<DatabaseCheck> _logger;
private IDashboardStore _dashboardStore;
public DatabaseCheck(ILogger<DatabaseCheck> logger, IDashboardStore dashboardStore)
{
_logger = logger;
_dashboardStore = dashboardStore;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
var timer = new PeriodicTimer(TimeSpan.FromSeconds(30));
while (await timer.WaitForNextTickAsync(stoppingToken))
{
// Hintergrundprozess abwarten
await checkDatabaseIntegrity();
// 5 Sekdunden Offset
await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
}
}
// String sqliteConnectionString als Argument übergeben
public Task checkDatabaseIntegrity()
{
using var conn = new SqliteConnection("Data Source=./persistence/watcher.db");
_logger.LogInformation("Sqlite Integrity-Check started...");
try
{
conn.Open();
using var command = conn.CreateCommand();
command.CommandText = """
SELECT integrity_check FROM pragma_integrity_check;
""";
using var reader = command.ExecuteReader();
while (reader.Read())
{
string status = reader.GetString(0);
_dashboardStore.DatabaseStatus = status;
_logger.LogInformation("Sqlite DatabaseIntegrity: ${status}", status);
}
conn.Close();
}
catch (SqliteException e)
{
conn.Close();
_logger.LogError(e.Message);
// TODO: LogEvent erstellen
}
_logger.LogInformation("Database Integrity-Check finished.");
return Task.CompletedTask;
}
}

View File

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

View File

@@ -0,0 +1,59 @@
using System.Net.NetworkInformation;
namespace Watcher.Services;
public class NetworkCheck : BackgroundService
{
private readonly ILogger<NetworkCheck> _logger;
private IDashboardStore _DashboardStore;
public NetworkCheck(ILogger<NetworkCheck> logger, IDashboardStore DashboardStore)
{
_logger = logger;
_DashboardStore = DashboardStore;
}
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)
{
_DashboardStore.NetworkStatus = "online";
_logger.LogInformation("Ping successfull. Watcher is online.");
}
}
catch
{
_DashboardStore.NetworkStatus = "offline";
_logger.LogError("Ping failed. Watcher appears to have no network connection.");
// LogEvent erstellen
}
_logger.LogInformation("Networkcheck finished.");
return Task.CompletedTask;
}
}

View File

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

View File

@@ -1,3 +1,4 @@
@using Microsoft.IdentityModel.Tokens
@model Watcher.ViewModels.DashboardViewModel @model Watcher.ViewModels.DashboardViewModel
@{ @{
@@ -57,18 +58,54 @@
<div class="card-body"> <div class="card-body">
<h5 class="fw-bold mb-3"><i class="bi bi-heart-pulse me-2 text-danger"></i>Systemstatus</h5> <h5 class="fw-bold mb-3"><i class="bi bi-heart-pulse me-2 text-danger"></i>Systemstatus</h5>
@if (!Model.NetworkStatus.IsNullOrEmpty())
{
@if (Model.NetworkStatus == "online")
{
<div class="d-flex justify-content-between align-items-center mb-2"> <div class="d-flex justify-content-between align-items-center mb-2">
<span>Netzwerk</span> <span>Netzwerk</span>
<span class="badge bg-success">OK</span> <span class="badge bg-success">@Model.NetworkStatus</span>
</div> </div>
<div class="progress mb-3" style="height: 6px;"> <div class="progress mb-3" style="height: 6px;">
<div class="progress-bar bg-success w-100"></div> <div class="progress-bar bg-success w-100"></div>
</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>
}
}
@if (!Model.DatabaseStatus.IsNullOrEmpty())
{
@if (Model.DatabaseStatus == "$ok")
{
<div class="d-flex justify-content-between align-items-center mb-2"> <div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span> <span>Datenbank</span>
<span class="badge bg-success">OK</span> <span class="badge bg-success">OK</span>
</div> </div>
} else
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span>
<span class="badge bg-danger">Big Problem</span>
</div>
}
} else
{
<div class="d-flex justify-content-between align-items-center mb-2">
<span>Datenbank</span>
<span class="badge bg-primary">Missing Data</span>
</div>
}
<div class="progress mb-3" style="height: 6px;"> <div class="progress mb-3" style="height: 6px;">
<div class="progress-bar bg-success w-100"></div> <div class="progress-bar bg-success w-100"></div>
</div> </div>

Binary file not shown.