Merge pull request 'feature/service-detection' (#33) from feature/service-detection into staging

Reviewed-on: #33

Tests/servicediscovery.py

@@ -3,9 +3,10 @@ import urllib.request
 
 url = "http://localhost:5000/monitoring/service-discovery"
 payload = {
-    "server_id": 7,
+"ServerId": 1,
-    "containers": ["{\"id\":\"6621c5b67c25\",\"image\":\"git.triggermeelmo.com/donpat1to/watcher-agent:v0.1.26\",\"name\":\"watcher-agent\"}",
+"ContainerId": "aaaaaaaaaaaa",
-                   "{\"id\":\"b8c86fb260bd\",\"image\":\"git.triggermeelmo.com/watcher/watcher-server:v0.1.10\",\"name\":\"watcher\"}"]
+"Name": "test-Name",
+"Image": "test-Image"
 }
 
 data = json.dumps(payload).encode("utf-8")

Watcher/Controllers/ContainerController.cs

@@ -20,7 +20,7 @@ public class ContainerController : Controller
     public async Task<IActionResult> Overview()
 {
     var containers = await _context.Containers.ToListAsync();
-    var servers = await _context.Servers.ToListAsync();
+        var servers = await _context.Servers.ToListAsync();
 
     var viewModel = new ContainerOverviewViewModel
     {

Watcher/Controllers/MonitoringController.cs

@@ -1,12 +1,9 @@
 using System.ComponentModel.DataAnnotations;
-using System.Net.Http.Json;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
@@ -84,8 +81,8 @@ public class MetricDto
 
 public class ServiceDto
 {
-    public required int server_id { get; set; } // Vom Watcher-Server zugewiesene ID des Hosts
+    public required int Server_id { get; set; } // Vom Watcher-Server zugewiesene ID des Hosts
-    public required List<String> containers { get; set; }
+    public required JsonContent Containers { get; set; }
 }
 
 [ApiController]
@@ -241,37 +238,12 @@ public class MonitoringController : Controller
         }
 
         // Json zu was brauchbarem machen
-        //string containersJson = await dto.containers.ReadAsStringAsync();
+        string containersJson = await dto.Containers.ReadAsStringAsync();
-        //List<Container> newContainers = JsonSerializer.Deserialize<List<Container>>(containersJson)?? new List<Container>();;
+        List<Container> newContainers = JsonSerializer.Deserialize<List<Container>>(containersJson)?? new List<Container>();;
-
-        List<Container> newContainers = new List<Container>();
-
-        foreach (String s in dto.containers)
-        {
-            // JSON zu einem JsonDocument parsen
-            using JsonDocument doc = JsonDocument.Parse(s);
-            JsonElement root = doc.RootElement;
-
-            // Einzelne Werte extrahieren
-            string id = root.GetProperty("id").GetString() ?? "";
-            string image = root.GetProperty("image").GetString() ?? "";
-            string name = root.GetProperty("name").GetString() ?? "";
-
-            Container newContainer = new Container
-            {
-                ServerId = dto.server_id,
-                ContainerId = id,
-                Image = image,
-                Name = name,
-            };
-
-
-            newContainers.Add(newContainer);
-        }
 
         foreach (Container c in newContainers)
         {
-            c.ServerId = dto.server_id;
+            c.ServerId = dto.Server_id;
             // Debug Logs
             // TODO entfernen wenn fertig getestet
             Console.WriteLine("---------");
@@ -288,7 +260,7 @@ public class MonitoringController : Controller
 
         // Liste aller Container, die bereits der übergebenen ServerId zugewiesen sind
         List<Container> existingContainers = _context.Containers
-            .Where(c => c.ServerId == dto.server_id)
+            .Where(c => c.ServerId == dto.Server_id)
             .ToList();
 
 

Watcher/Migrations/20251029105954_container-changed.Designer.cs

@@ -1,355 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Watcher.Data;
-
-#nullable disable
-
-namespace Watcher.Migrations
-{
-    [DbContext(typeof(AppDbContext))]
-    [Migration("20251029105954_container-changed")]
-    partial class containerchanged
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.6");
-
-            modelBuilder.Entity("Watcher.Models.Container", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ContainerId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Image")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("ImageId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsRunning")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("ServerId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("TagId")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ImageId");
-
-                    b.HasIndex("TagId");
-
-                    b.ToTable("Containers");
-                });
-
-            modelBuilder.Entity("Watcher.Models.Image", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Tag")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Images");
-                });
-
-            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("ContainerId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Level")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Message")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("ServerId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("Timestamp")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ContainerId");
-
-                    b.HasIndex("ServerId");
-
-                    b.ToTable("LogEvents");
-                });
-
-            modelBuilder.Entity("Watcher.Models.Metric", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<double>("CPU_Load")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("CPU_Temp")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("DISK_Size")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("DISK_Temp")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("DISK_Usage")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("GPU_Load")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("GPU_Temp")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("GPU_Vram_Size")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("GPU_Vram_Usage")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("NET_In")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("NET_Out")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("RAM_Load")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("RAM_Size")
-                        .HasColumnType("REAL");
-
-                    b.Property<int?>("ServerId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("Timestamp")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Metrics");
-                });
-
-            modelBuilder.Entity("Watcher.Models.Server", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<double>("CPU_Load_Critical")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("CPU_Load_Warning")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("CPU_Temp_Critical")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("CPU_Temp_Warning")
-                        .HasColumnType("REAL");
-
-                    b.Property<int>("CpuCores")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CpuType")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("TEXT");
-
-                    b.Property<double>("DISK_Temp_Critical")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("DISK_Temp_Warning")
-                        .HasColumnType("REAL");
-
-                    b.Property<string>("Description")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DiskSpace")
-                        .HasColumnType("TEXT");
-
-                    b.Property<double>("Disk_Usage_Critical")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("Disk_Usage_Warning")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("GPU_Load_Critical")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("GPU_Load_Warning")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("GPU_Temp_Critical")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("GPU_Temp_Warning")
-                        .HasColumnType("REAL");
-
-                    b.Property<string>("GpuType")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("IPAddress")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsOnline")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsVerified")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("LastSeen")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<double>("RAM_Load_Critical")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("RAM_Load_Warning")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("RamSize")
-                        .HasColumnType("REAL");
-
-                    b.Property<int?>("TagId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("TagId");
-
-                    b.ToTable("Servers");
-                });
-
-            modelBuilder.Entity("Watcher.Models.Tag", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Tags");
-                });
-
-            modelBuilder.Entity("Watcher.Models.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Email")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("IdentityProvider")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("LastLogin")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OIDC_Id")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("Watcher.Models.Container", b =>
-                {
-                    b.HasOne("Watcher.Models.Image", null)
-                        .WithMany("Containers")
-                        .HasForeignKey("ImageId");
-
-                    b.HasOne("Watcher.Models.Tag", null)
-                        .WithMany("Containers")
-                        .HasForeignKey("TagId");
-                });
-
-            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
-                {
-                    b.HasOne("Watcher.Models.Container", "Container")
-                        .WithMany()
-                        .HasForeignKey("ContainerId");
-
-                    b.HasOne("Watcher.Models.Server", "Server")
-                        .WithMany()
-                        .HasForeignKey("ServerId");
-
-                    b.Navigation("Container");
-
-                    b.Navigation("Server");
-                });
-
-            modelBuilder.Entity("Watcher.Models.Server", b =>
-                {
-                    b.HasOne("Watcher.Models.Tag", null)
-                        .WithMany("Servers")
-                        .HasForeignKey("TagId");
-                });
-
-            modelBuilder.Entity("Watcher.Models.Image", b =>
-                {
-                    b.Navigation("Containers");
-                });
-
-            modelBuilder.Entity("Watcher.Models.Tag", b =>
-                {
-                    b.Navigation("Containers");
-
-                    b.Navigation("Servers");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Watcher/Migrations/20251029105954_container-changed.cs

@@ -1,22 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Watcher.Migrations
-{
-    /// <inheritdoc />
-    public partial class containerchanged : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-
-        }
-    }
-}

Watcher/Models/Container.cs

@@ -1,23 +1,14 @@
-using System.Text.Json.Serialization;
-
 namespace Watcher.Models;
 
 public class Container
 {
-    [JsonPropertyName("id")]
     public int Id { get; set; }
 
     public int ServerId { get; set; }
 
     public String? ContainerId { get; set; }
-
-    [JsonPropertyName("image")]
     public String? Image { get; set; }
-
-    [JsonPropertyName("name")]
     public String? Name { get; set; }
 
-    // keine Variable, die vom Agent übergeben wird. Ein container ist immer Running, die Variable dient nur für die Übersicht
-    // auf dem Dashboard.
     public Boolean IsRunning { get; set; } = true;
 }

Watcher/Views/Container/Overview.cshtml

@@ -12,22 +12,20 @@
     <div >
             <table class="ServiceList">
                 <tr>
-                    <th>Container-ID</th>
+                    <th>Service</th>
-                    <th>Name</th>
+                    <th>HostServer</th>
-                    <th>Image</th>
+                    <th>Status</th>
-                    <th>Host-ID</th>
+                    <th>Deployment</th>
-                    <th>Aktionen</th>
+                    <th></th>
 
                 </tr>
                 @foreach (Container container in Model.Containers)
                 {
                     <tr class="ServiceRow">
-                        <td>@container.ContainerId</td>
                         <td>@container.Name</td>
-                        <td>@container.Image</td>
+                        <td><a  class="ServiceEntry" href="/Server/Details/${containerId}">@container.ServerId</a></td>
-                        <!-- TODO: Link Hardcoded -->
+                        <td>nicht automatisiert</td>
-                        <td><a  class="ServiceEntry" href="/Server/Details/2">@container.ServerId</a></td>
+                        <td>Docker</td>
-                        <td>nicht verfügbar</td>
                     </tr>
                 }
             </table>