Watcher/watcher
4
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

staging #43

Merged
triggermeelmo merged 75 commits from staging into development 2025-11-06 21:23:27 +01:00
Conversation 0 Commits 75 Files Changed 61 +21 -2
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c85e338fa - Show all commits

23
Watcher/Controllers/MonitoringController.cs
View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Text.Json;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
@@ -236,8 +237,26 @@ public class MonitoringController : Controller
return BadRequest(new { error = "Invalid Payload", details = errors }); return BadRequest(new { error = "Invalid Payload", details = errors });
} }
// Json zu was brauchbarem machen
string containersJson = await dto.Containers.ReadAsStringAsync();
List<Container> newContainers = JsonSerializer.Deserialize<List<Container>>(containersJson)?? new List<Container>();;
foreach (Container c in newContainers)
{
c.ServerId = dto.Server_id;
// Debug Logs
// TODO entfernen wenn fertig getestet
Console.WriteLine("---------");
Console.WriteLine("ServerId: " + c.ServerId);
Console.WriteLine("ContainerId: " + c.ContainerId);
Console.WriteLine("Name: " + c.Name);
Console.WriteLine("Image: " + c.Image);
Console.WriteLine("---------");
}
// Container Objekte erstellen // Container Objekte erstellen
List<Container> newContainers = ParseServiceDiscoveryInput(dto.Server_id, dto.Containers); //List<Container> newContainers = ParseServiceDiscoveryInput(dto.Server_id, containers);
// Liste aller Container, die bereits der übergebenen ServerId zugewiesen sind // Liste aller Container, die bereits der übergebenen ServerId zugewiesen sind
List<Container> existingContainers = _context.Containers List<Container> existingContainers = _context.Containers
@@ -391,7 +410,7 @@ public class MonitoringController : Controller
return metric_input; return metric_input;
} }
private List<Container> ParseServiceDiscoveryInput(int server_id, JsonContent containers) private List<Container> ParseServiceDiscoveryInput(int server_id, List<Container> containers)
{ {
List<Container> containerList = new List<Container>(); List<Container> containerList = new List<Container>();