diff --git a/watcher-monitoring/Controllers/ApiController.cs b/watcher-monitoring/Controllers/ApiController.cs index fd5a08b..07ea181 100644 --- a/watcher-monitoring/Controllers/ApiController.cs +++ b/watcher-monitoring/Controllers/ApiController.cs @@ -8,6 +8,7 @@ using watcher_monitoring.Models; using watcher_monitoring.Data; using watcher_monitoring.Attributes; using watcher_monitoring.Payloads; +using System.Net; @@ -122,7 +123,7 @@ public class APIController : Controller public async Task Containers() { List containers = await _context.Containers.ToListAsync(); - return Ok(); + return Ok(containers); } [HttpDelete("delete-container")] @@ -166,15 +167,18 @@ public class APIController : Controller } try { - Server server = new Server + Server newServer = new Server { - Name = "test", - IPAddress = dto.IpAddress + Name = dto.hostName, + IPAddress = dto.ipAddress }; - _context.Servers.Add(server); - await _context.SaveChangesAsync(); - return Ok(); + _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); @@ -201,7 +205,7 @@ public class APIController : Controller try { // Find Server in Database - var server = await _context.Servers.FindAsync(dto.Id); + var server = await _context.Servers.FindAsync(dto.id); if (server == null) { @@ -210,11 +214,11 @@ public class APIController : Controller } // Add Hardware Configuration - server.CpuType = dto.CpuType; - server.CpuCores = dto.CpuCores; - server.GpuType = dto.GpuType; - server.RamSize = dto.RamSize; - // Diskspace fehlt + 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); @@ -231,9 +235,34 @@ public class APIController : Controller // Server-Metrics endpoint for watcher-agent [HttpPost("agent-server-metrics/{id}")] - public async Task ServerMetrics ([FromBody] HardwareDto dto) + public async Task ServerMetrics ([FromBody] MetricDto dto) { - return Ok(); + 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 @@ -244,7 +273,7 @@ public class APIController : Controller } // Container-Metrics endpoint for watcher-agent - [HttpPost("agent-container-metrics/{id}")] + [HttpPost("agent-container-metrics")] public async Task ContainerMetrics ([FromBody] HardwareDto dto) { return Ok(); diff --git a/watcher-monitoring/Payloads/HardwareDto.cs b/watcher-monitoring/Payloads/HardwareDto.cs index 97f4387..39c1aa7 100644 --- a/watcher-monitoring/Payloads/HardwareDto.cs +++ b/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; } } \ No newline at end of file diff --git a/watcher-monitoring/Payloads/MetricDto.cs b/watcher-monitoring/Payloads/MetricDto.cs new file mode 100644 index 0000000..a87f370 --- /dev/null +++ b/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 + +} \ No newline at end of file diff --git a/watcher-monitoring/Payloads/RegistrationDto.cs b/watcher-monitoring/Payloads/RegistrationDto.cs index f29db80..dc7e102 100644 --- a/watcher-monitoring/Payloads/RegistrationDto.cs +++ b/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; } } \ No newline at end of file diff --git a/watcher-monitoring/Views/Shared/_Layout.cshtml b/watcher-monitoring/Views/Shared/_Layout.cshtml index 45ae1dd..13e758c 100644 --- a/watcher-monitoring/Views/Shared/_Layout.cshtml +++ b/watcher-monitoring/Views/Shared/_Layout.cshtml @@ -58,7 +58,7 @@
  • - + diff --git a/watcher-monitoring/persistence/watcher.db-shm b/watcher-monitoring/persistence/watcher.db-shm index b569c83..9ed5ec9 100644 Binary files a/watcher-monitoring/persistence/watcher.db-shm and b/watcher-monitoring/persistence/watcher.db-shm differ diff --git a/watcher-monitoring/persistence/watcher.db-wal b/watcher-monitoring/persistence/watcher.db-wal index f4c7fda..1046ba1 100644 Binary files a/watcher-monitoring/persistence/watcher.db-wal and b/watcher-monitoring/persistence/watcher.db-wal differ