aa

watcher-monitoring/Controllers/ApiController.cs

@@ -1,13 +1,16 @@
- // Get Methoden um Metrics abzugreifen
- // Get Methden um Informationen über den Status des Servers einzuholen
  using System.Diagnostics;
-using Microsoft.AspNetCore.Mvc;
-using watcher_monitoring.Models;
+ using System.Threading.Tasks;
 
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+
+using watcher_monitoring.Models;
 using watcher_monitoring.Data;
 using watcher_monitoring.Attributes;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
+using watcher_monitoring.Payloads;
+using System.Net;
+
+
 
 namespace watcher_monitoring.Controllers;
 
@@ -26,19 +29,68 @@ public class APIController : Controller
         _logger = logger;
     }
 
-    // Server Calls
+    // API Calls
 
     [HttpGet("get-server")]
     public async Task<IActionResult> Servers()
     {
         List<Server> servers = await _context.Servers.ToListAsync();
-        return Ok();
+        return Ok(servers);
     }
 
+    // DEVELOPMENT ONLY
     [HttpPost("add-server")]
-    public async Task<IActionResult> AddServer()
+    public async Task<IActionResult> AddServer([FromBody] Server serverDto)
     {
-        return Ok();
+        // payload check
+        if (!ModelState.IsValid)
+        {
+            var errors = ModelState.Values
+                .SelectMany(v => v.Errors)
+                .Select(e => e.ErrorMessage)
+                .ToList();
+
+            _logger.LogError("Invalid server payload");
+            return BadRequest(new { error = "Invalid server payload", details = errors });
+        }
+
+        try
+        {
+            // Check if server with same IP already exists
+            var existingServer = await _context.Servers
+                .FirstOrDefaultAsync(s => s.IPAddress == serverDto.IPAddress);
+
+            if (existingServer != null)
+            {
+                _logger.LogWarning("Server mit IP-Adresse {ip} existiert bereits", serverDto.IPAddress);
+                return BadRequest(new { error = "Server mit dieser IP-Adresse existiert bereits" });
+            }
+
+            Server server = new Server
+            {
+                Name = serverDto.Name,
+                IPAddress = serverDto.IPAddress,
+                CpuType = serverDto.CpuType,
+                CpuCores = serverDto.CpuCores,
+                GpuType = serverDto.GpuType,
+                RamSize = serverDto.RamSize,
+                DiskSpace = serverDto.DiskSpace,
+                IsOnline = serverDto.IsOnline,
+                IsVerified = serverDto.IsVerified
+            };
+
+            _context.Servers.Add(server);
+            await _context.SaveChangesAsync();
+
+            _logger.LogInformation("Server '{name}' mit IP {ip} erfolgreich hinzugefügt", server.Name, server.IPAddress);
+
+            return Ok(new { message = "Server erfolgreich hinzugefügt", serverId = server.Id });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Fehler beim Hinzufügen des Servers");
+            return BadRequest(new { error = "Fehler beim Hinzufügen des Servers", details = ex.Message });
+        }
     }
 
     [HttpDelete("delete-server/{id}")]
@@ -71,7 +123,7 @@ public class APIController : Controller
     public async Task<IActionResult> Containers()
     {
         List<Container> containers = await _context.Containers.ToListAsync();
-        return Ok();
+        return Ok(containers);
     }
 
     [HttpDelete("delete-container")]
@@ -95,4 +147,135 @@ public class APIController : Controller
             return BadRequest();
         }
     }
+
+    // Agent Calls
+
+    // Registration Endpoint for watcher-agent
+    [HttpPost("agent-register")]
+    public async Task<IActionResult> Register([FromBody] RegistrationDto dto)
+    {
+        // payload check
+        if (!ModelState.IsValid)
+        {
+            var errors = ModelState.Values
+                .SelectMany(v => v.Errors)
+                .Select(e => e.ErrorMessage)
+                .ToList();
+
+            _logger.LogError("Invalid registration payload");
+            return BadRequest(new { error = "Invalid registration payload", details = errors });
+        }
+
+        try {
+            Server newServer = new Server
+            {
+                Name = dto.hostName,
+                IPAddress = dto.ipAddress
+            };
+
+            _context.Servers.Add(newServer);
+            await _context.SaveChangesAsync();
+
+            var server = await _context.Servers.FindAsync(dto.ipAddress);
+
+            return Ok(server.Id); 
+        } catch (Exception ex)
+        {
+            Console.WriteLine(ex.Message);
+            _logger.LogError(ex.Message);
+            return BadRequest();
+        }
+    }
+
+    // Hardware Configuration Endpoint for watcher-agent
+    [HttpPost("agent-hardware")]
+    public async Task<IActionResult> HardwareConfiguration ([FromBody] HardwareDto dto)
+    {
+        // payload check
+        if (!ModelState.IsValid)
+        {
+            var errors = ModelState.Values
+                .SelectMany(v => v.Errors)
+                .Select(e => e.ErrorMessage)
+                .ToList();
+
+            _logger.LogError("Invalid hardware configuration");
+            return BadRequest(new { error = "Invalid Hardware Configuration Payload", details = errors });
+        }
+        try
+        {
+            // Find Server in Database
+            var server = await _context.Servers.FindAsync(dto.id);
+
+            if (server == null)
+            {
+                _logger.LogError("Server not found");
+                return BadRequest("Server not found");
+            }
+
+            // Add Hardware Configuration
+            server.CpuType = dto.cpuType;
+            server.CpuCores = dto.cpuCores;
+            server.GpuType = dto.gpuType;
+            server.RamSize = dto.ramSize;
+            // TODO: Diskspace fehlt
+
+            await _context.SaveChangesAsync();
+            _logger.LogInformation("Harware configuration successfull for server {server}", server.Name);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex.Message);
+            return BadRequest(ex.Message);
+        }
+
+
+        return Ok();
+    }
+
+    // Server-Metrics endpoint for watcher-agent
+    [HttpPost("agent-server-metrics/{id}")]
+    public async Task<IActionResult> ServerMetrics ([FromBody] MetricDto dto)
+    {
+        if (!ModelState.IsValid)
+        {
+            var errors = ModelState.Values
+                .SelectMany(v => v.Errors)
+                .Select(e => e.ErrorMessage)
+                .ToList();
+
+            _logger.LogError("Invalid monitoring payload");
+            return BadRequest(new { error = "Invalid monitoring payload", details = errors });
+        }
+
+        var server = await _context.Servers.FindAsync(dto.id);
+
+        if (server != null)
+        {
+            // neues Objekt mit Typ Metric anlegen
+
+            // Metric in Datenbank eintragen
+
+            return Ok();
+        }
+        else
+        {
+            _logger.LogError("metric cannot be added to database");
+            return BadRequest();
+        }
+    }
+
+    // Service-Detection endpoint for watcher-agent
+    [HttpPost("agent-container-detection")]
+    public async Task<IActionResult> ContainerDetection ([FromBody] HardwareDto dto)
+    {
+        return Ok();
+    }
+
+    // Container-Metrics endpoint for watcher-agent
+    [HttpPost("agent-container-metrics")]
+    public async Task<IActionResult> ContainerMetrics ([FromBody] HardwareDto dto)
+    {
+        return Ok();
+    }
 }

watcher-monitoring/Controllers/HomeController.cs

@@ -25,11 +25,14 @@ public class HomeController : Controller
     public async Task<IActionResult> Index()
     {
         List<Server> servers = await _context.Servers.ToListAsync();
+        List<Container> containers = await _context.Containers.ToListAsync();
+
+        ViewBag.Containers = containers;
+        ViewBag.ContainerCount = containers.Count();
 
         ViewBag.TotalServers = servers.Count;
         ViewBag.OnlineServers = servers.Count(s => s.IsOnline);
         ViewBag.OfflineServers = servers.Count(s => !s.IsOnline);
-        ViewBag.ServiceCount = 8;
         ViewBag.Servers = servers;
 
         return View();

watcher-monitoring/Controllers/MonitoringController.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
 
-using watcher_monitoring.Payloads;
 using watcher_monitoring.Data;
-using watcher_monitoring.Models;
-using Microsoft.AspNetCore.Authorization.Infrastructure;
 
 namespace watcher_monitoring.Controllers;
 
+[Authorize]
 [Route("[controller]")]
 public class MonitoringController : Controller
 {
@@ -20,104 +19,10 @@ public class MonitoringController : Controller
         _logger = logger;
     }
 
-    // Registration Endpoint for watcher-agent
-    [HttpPost("register")]
-    public async Task<IActionResult> Register([FromBody] RegistrationDto dto)
+    [HttpGet("container")]
+    public async Task<IActionResult> ContainerIndex()
     {
-        // payload check
-        if (!ModelState.IsValid)
-        {
-            var errors = ModelState.Values
-                .SelectMany(v => v.Errors)
-                .Select(e => e.ErrorMessage)
-                .ToList();
-
-            _logger.LogError("Invalid registration payload");
-            return BadRequest(new { error = "Invalid registration payload", details = errors });
-        }
-
-        try {
-            Server server = new Server
-            {
-                Name = "test",
-                IPAddress = dto.IpAddress
-            };
-
-            _context.Servers.Add(server);
-            await _context.SaveChangesAsync(); 
-            return Ok(); 
-        } catch (Exception ex)
-        {
-            Console.WriteLine(ex.Message);
-            _logger.LogError(ex.Message);
-            return BadRequest();
-        }
-    }
-
-    // Hardware Configuration Endpoint for watcher-agent
-    [HttpPost("hardware-configuration")]
-    public async Task<IActionResult> HardwareConfiguration ([FromBody] HardwareDto dto)
-    {
-        // payload check
-        if (!ModelState.IsValid)
-        {
-            var errors = ModelState.Values
-                .SelectMany(v => v.Errors)
-                .Select(e => e.ErrorMessage)
-                .ToList();
-
-            _logger.LogError("Invalid hardware configuration");
-            return BadRequest(new { error = "Invalid Hardware Configuration Payload", details = errors });
-        }
-        try
-        {
-            // Find Server in Database
-            var server = await _context.Servers.FindAsync(dto.Id);
-
-            // Add Hardware Configuration
-            try
-            {
-                server.CpuType = dto.CpuType;
-                server.CpuCores = dto.CpuCores;
-                server.GpuType = dto.GpuType;
-                server.RamSize = dto.RamSize;
-                // Diskspace fehlt
-
-                _logger.LogInformation("Harware configuration successfull for server {server}", server.Name);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex.Message);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex.Message);
-        }
-
-
-        return Ok();
-    }
-
-    // Server-Metrics endpoint for watcher-agent
-    [HttpPost("server-metrics/{id}")]
-    public async Task<IActionResult> ServerMetrics ([FromBody] HardwareDto dto)
-    {
-        return Ok();
-    }
-
-    // Service-Detection endpoint for watcher-agent
-    [HttpPost("container-detection")]
-    public async Task<IActionResult> ContainerDetection ([FromBody] HardwareDto dto)
-    {
-        return Ok();
-    }
-
-    // Container-Metrics endpoint for watcher-agent
-    [HttpPost("container-metrics/{id}")]
-    public async Task<IActionResult> ContainerMetrics ([FromBody] HardwareDto dto)
-    {
-        return Ok();
+        return View();
     }
 
 }

watcher-monitoring/Payloads/HardwareDto.cs

@@ -6,21 +6,18 @@ namespace watcher_monitoring.Payloads;
 public class HardwareDto
 {
     [Required]
-    public required int Id;
-
-    [Required]
-    public string? IpAddress { get; set; }
+    public required int id;
 
     // Hardware Info
     [Required]
-    public string? CpuType { get; set; }
+    public string? cpuType { get; set; }
 
     [Required]
-    public int CpuCores { get; set; }
+    public int cpuCores { get; set; }
 
     [Required]
-    public string? GpuType { get; set; }
+    public string? gpuType { get; set; }
 
     [Required]
-    public double RamSize { get; set; }
+    public double ramSize { get; set; }
 }

watcher-monitoring/Payloads/MetricDto.cs

@@ -0,0 +1,44 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace watcher_monitoring.Payloads;
+
+public class MetricDto
+{
+    // Server Identity
+    [Required]
+    public int id { get; set; }
+
+    // Hardware Metrics
+    // CPU
+    public double cpuLoad { get; set; } // %
+
+    public double cpuTemp { get; set; } // deg C
+
+    // GPU
+    public double gpuLoad { get; set; } // %
+
+    public double gpuTemp { get; set; } // deg C
+
+    public double vRamSize { get; set; } // Bytes
+
+    public double vRamLoad { get; set; } // %
+
+    // RAM
+    public double ramSize { get; set; } // Bytes
+
+    public double ramLoad { get; set; } // %
+
+    // Disks
+    public double diskSize { get; set; } // Bytes
+
+    public double diskLoad { get; set; } // Bytes
+
+    public double diskTempp { get; set; } // deg C (if available)
+
+    // Network
+    public double netIn { get; set; } // Bytes/s
+
+    public double netOut { get; set; } // Bytes/s
+
+}

watcher-monitoring/Payloads/RegistrationDto.cs

@@ -7,5 +7,7 @@ namespace watcher_monitoring.Payloads;
 public class RegistrationDto
 {
     [Required]
-    public required string IpAddress { get; set; }
+    public required string ipAddress { get; set; }
+
+    public required string hostName { get; set; }
 }

watcher-monitoring/Program.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.OpenApi.Models;
 
@@ -65,6 +66,17 @@ builder.Services.AddHealthChecks();
 builder.Services.AddSwaggerGen(options =>
 {
     options.SwaggerDoc("v1", new OpenApiInfo { Title = "Watcher-Server API", Version = "v1" });
+
+    // Nur API-Controller dokumentieren (mit [ApiController]-Attribut)
+    options.DocInclusionPredicate((docName, apiDesc) =>
+    {
+        var controllerActionDescriptor = apiDesc.ActionDescriptor as Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor;
+        if (controllerActionDescriptor == null) return false;
+
+        // Nur Controller mit [ApiController]-Attribut einbeziehen
+        return controllerActionDescriptor.ControllerTypeInfo
+            .GetCustomAttributes(typeof(ApiControllerAttribute), true).Any();
+    });
 });
 
 var app = builder.Build();

watcher-monitoring/Views/Home/Index.cshtml

@@ -33,14 +33,14 @@
         </div>
         <div class="col-md-3">
             <div class="metric-card">
-                <div class="metric-label">Totoal Services</div>
-                <div class="metric-value">@ViewBag.ServiceCount</div>
+                <div class="metric-label">Total Containers</div>
+                <div class="metric-value">@ViewBag.ContainerCount</div>
             </div>
         </div>
     </div>
 
     <div class="row g-4">
-        <div class="col-lg-8">
+        <div class="col-lg-4">
             <div class="card">
                 <h2 class="card-title">Monitored Servers</h2>
                 <ul class="server-list">
@@ -68,6 +68,31 @@
                 </ul>
             </div>
         </div>
+        <div class="col-lg-4">
+            <div class="card">
+                <h2 class="card-title">Monitored Containers</h2>
+                <ul class="server-list">
+                    @if (ViewBag.Containers != null && ViewBag.Containers.Count > 0)
+                    {
+                        @foreach (var container in ViewBag.Containers)
+                        {
+                            <li class="server-item">
+                                <div class="server-info">
+                                    <span class="server-name">@container.Name</span>
+                                    <span class="server-ip">Container Image</span>
+                                </div>
+                            </li>
+                        }
+                    }
+                    else
+                    {
+                        <li class="text-center py-4" style="color: var(--text-muted)">
+                            No Containers added yet
+                        </li>
+                    }
+                </ul>
+            </div>
+        </div>
 
         <div class="col-lg-4">
             <div class="card">

watcher-monitoring/Views/Shared/_Layout.cshtml

@@ -58,7 +58,7 @@
                                     </form>
                                 </li>
                                 <li class="dropdown-item">
-                                    <a style="display: inline-block; vertical-align: middle; margin-right: 8px;">
+                                    <a style="display: inline-block; vertical-align: middle; margin-right: 8px;"
                                         asp-area="" asp-controller="User" asp-action="Index"><svg width="16" height="16"
                                             viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
                                             style="display: inline-block; vertical-align: middle; margin-right: 8px;">