triggermeelmo/Watcher
1
0
Fork 0
Code Issues 11 Pull Requests Actions 1 Packages Projects 3 Releases Wiki Activity

Added Server and Container State Attribute

Browse Source
This commit is contained in:
Daniel Habenicht
2026-01-21 12:32:10 +01:00
parent f820c641b4
commit 29860bd098
8 changed files with 270 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher-monitoring/Controllers/ApiController.cs
View File

@@ -75,7 +75,7 @@ public class APIController : Controller
GpuType = serverDto.GpuType, GpuType = serverDto.GpuType,
RamSize = serverDto.RamSize, RamSize = serverDto.RamSize,
DiskSpace = serverDto.DiskSpace, DiskSpace = serverDto.DiskSpace,
IsOnline = serverDto.IsOnline, State = serverDto.State,
IsVerified = serverDto.IsVerified IsVerified = serverDto.IsVerified
}; };

4
watcher-monitoring/Controllers/HomeController.cs
View File

@@ -32,8 +32,8 @@ public class HomeController : Controller
servers = _servers, servers = _servers,
containers = _containers, containers = _containers,
serversCount = _servers.Count, serversCount = _servers.Count,
serversOnline = (from server in _servers where server.IsOnline select server).Count(), serversOnline = (from server in _servers where server.State=="online" select server).Count(),
serversOffline = _servers.Count - (from server in _servers where server.IsOnline select server).Count() serversOffline = (from server in _servers where server.State=="offline" select server).Count()
}; };
return View(homeVm); return View(homeVm);

186
watcher-monitoring/Migrations/20260121112553_changedServerAndContainerAttributeState.Designer.cs generated Normal file
View File

@@ -0,0 +1,186 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using watcher_monitoring.Data;
#nullable disable
namespace watcher_monitoring.Migrations
{
[DbContext(typeof(WatcherDbContext))]
[Migration("20260121112553_changedServerAndContainerAttributeState")]
partial class changedServerAndContainerAttributeState
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "8.0.6");
modelBuilder.Entity("watcher_monitoring.Models.ApiKey", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<DateTime>("CreatedAt")
.HasColumnType("TEXT");
b.Property<string>("Description")
.HasColumnType("TEXT");
b.Property<DateTime?>("ExpiresAt")
.HasColumnType("TEXT");
b.Property<bool>("IsActive")
.HasColumnType("INTEGER");
b.Property<string>("Key")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("TEXT");
b.Property<DateTime?>("LastUsedAt")
.HasColumnType("TEXT");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("TEXT");
b.Property<int>("UserId")
.HasColumnType("INTEGER");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("ApiKeys");
});
modelBuilder.Entity("watcher_monitoring.Models.Container", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ContainerName")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("TEXT");
b.Property<string>("State")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.ToTable("Containers");
});
modelBuilder.Entity("watcher_monitoring.Models.Server", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<int>("CpuCores")
.HasColumnType("INTEGER");
b.Property<string>("CpuType")
.HasColumnType("TEXT");
b.Property<DateTime>("CreatedAt")
.HasColumnType("TEXT");
b.Property<string>("DiskSpace")
.HasColumnType("TEXT");
b.Property<string>("GpuType")
.HasColumnType("TEXT");
b.Property<string>("IPAddress")
.IsRequired()
.HasColumnType("TEXT");
b.Property<bool>("IsVerified")
.HasColumnType("INTEGER");
b.Property<DateTime>("LastSeen")
.HasColumnType("TEXT");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT");
b.Property<double>("RamSize")
.HasColumnType("REAL");
b.Property<string>("State")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.ToTable("Servers");
});
modelBuilder.Entity("watcher_monitoring.Models.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<DateTime>("CreatedAt")
.HasColumnType("TEXT");
b.Property<string>("Email")
.IsRequired()
.HasColumnType("TEXT");
b.Property<bool>("IsActive")
.HasColumnType("INTEGER");
b.Property<DateTime>("LastLogin")
.HasColumnType("TEXT");
b.Property<string>("OidcSubject")
.HasMaxLength(255)
.HasColumnType("TEXT");
b.Property<string>("Password")
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("Username")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("TEXT");
b.HasKey("Id");
b.ToTable("Users");
});
modelBuilder.Entity("watcher_monitoring.Models.ApiKey", b =>
{
b.HasOne("watcher_monitoring.Models.User", "User")
.WithMany("ApiKeys")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("User");
});
modelBuilder.Entity("watcher_monitoring.Models.User", b =>
{
b.Navigation("ApiKeys");
});
#pragma warning restore 612, 618
}
}
}

51
watcher-monitoring/Migrations/20260121112553_changedServerAndContainerAttributeState.cs Normal file
View File

@@ -0,0 +1,51 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace watcher_monitoring.Migrations
{
/// <inheritdoc />
public partial class changedServerAndContainerAttributeState : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsOnline",
table: "Servers");
migrationBuilder.AddColumn<string>(
name: "State",
table: "Servers",
type: "TEXT",
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "State",
table: "Containers",
type: "TEXT",
nullable: false,
defaultValue: "");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "State",
table: "Servers");
migrationBuilder.DropColumn(
name: "State",
table: "Containers");
migrationBuilder.AddColumn<bool>(
name: "IsOnline",
table: "Servers",
type: "INTEGER",
nullable: false,
defaultValue: false);
}
}
}

11
watcher-monitoring/Migrations/WatcherDbContextModelSnapshot.cs
View File

@@ -69,6 +69,10 @@ namespace watcher_monitoring.Migrations
.HasMaxLength(50) .HasMaxLength(50)
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<string>("State")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("Containers"); b.ToTable("Containers");
@@ -99,9 +103,6 @@ namespace watcher_monitoring.Migrations
.IsRequired() .IsRequired()
.HasColumnType("TEXT"); .HasColumnType("TEXT");
b.Property<bool>("IsOnline")
.HasColumnType("INTEGER");
b.Property<bool>("IsVerified") b.Property<bool>("IsVerified")
.HasColumnType("INTEGER"); .HasColumnType("INTEGER");
@@ -115,6 +116,10 @@ namespace watcher_monitoring.Migrations
b.Property<double>("RamSize") b.Property<double>("RamSize")
.HasColumnType("REAL"); .HasColumnType("REAL");
b.Property<string>("State")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("Servers"); b.ToTable("Servers");

2
watcher-monitoring/Models/Container.cs
View File

@@ -13,4 +13,6 @@ public class Container
[StringLength(50)] [StringLength(50)]
public required string ContainerName { get; set; } = null!; public required string ContainerName { get; set; } = null!;
public required string State { get; set; }
} }

2
watcher-monitoring/Models/Server.cs
View File

@@ -27,7 +27,7 @@ public class Server
// Metadata // Metadata
public DateTime CreatedAt { get; set; } = DateTime.UtcNow; public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
public bool IsOnline { get; set; } = false; public string State { get; set; }
public DateTime LastSeen { get; set; } public DateTime LastSeen { get; set; }

31
watcher-monitoring/Views/Home/Index.cshtml
View File

@@ -14,16 +14,20 @@
<div class="row g-4 mb-4"> <div class="row g-4 mb-4">
<div class="col-md-3"> <div class="col-md-3">
<div class="metric-card"> <a href="/monitoring/server" style="text-decoration: none;">
<div class="metric-label">Total Servers</div> <div class="metric-card">
<div class="metric-value">@Model.serversCount</div> <div class="metric-label">Total Servers</div>
</div> <div class="metric-value">@Model.serversCount</div>
</div>
</a>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="metric-card"> <a href="/monitoring/container" style="text-decoration: none;">
<div class="metric-label">Online</div> <div class="metric-card">
<div class="metric-value" style="color: var(--success)">@Model.serversOnline</div> <div class="metric-label">Online</div>
</div> <div class="metric-value" style="color: var(--success)">@Model.serversOnline</div>
</div>
</a>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="metric-card"> <div class="metric-card">
@@ -42,21 +46,24 @@
<div class="row g-4"> <div class="row g-4">
<div class="col-lg-4"> <div class="col-lg-4">
<div class="card"> <div class="card">
<h2 class="card-title"><a href="/Monitoring/server" style="text-decoration: none;">Monitored Servers</a></h2> <h2 class="card-title"><a href="/Monitoring/server" style="text-decoration: none;">Server Issues</a></h2>
<ul class="server-list"> <ul class="server-list">
@if (Model.servers != null && Model.servers.Count > 0) @if (Model.servers != null && Model.servers.Count > 0)
{ {
@foreach (var server in Model.servers) @foreach (var server in Model.servers)
{ {
<li class="server-item"> @if (server.State != "online")
{
<li class="server-item">
<div class="server-info"> <div class="server-info">
<span class="server-name">@server.Name</span> <span class="server-name">@server.Name</span>
<span class="server-ip">@server.IPAddress</span> <span class="server-ip">@server.IPAddress</span>
</div> </div>
<span class="status-badge @(server.IsOnline ? "status-online" : "status-offline")"> <span class="status-badge @(server.State=="warning" ? "status-warning" : "status-offline")">
@(server.IsOnline ? "Online" : "Offline") @(server.State=="warning" ? "Warning" : "Offline")
</span> </span>
</li> </li>
}
} }
} }
else else