From df1c4ca4b449b29a7b205c0fdc87ec701c5f299c Mon Sep 17 00:00:00 2001
From: triggermeelmo <danielhabenicht@icloud.com>
Date: Wed, 29 Oct 2025 20:57:57 +0100
Subject: [PATCH] Merge Errors fixed

---
 Watcher/Controllers/MonitoringController.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Watcher/Controllers/MonitoringController.cs b/Watcher/Controllers/MonitoringController.cs
index e956ed0..e8208a7 100644
--- a/Watcher/Controllers/MonitoringController.cs
+++ b/Watcher/Controllers/MonitoringController.cs
@@ -85,7 +85,7 @@ public class MetricDto
 public class ServiceDto
 {
     public required int server_id { get; set; } // Vom Watcher-Server zugewiesene ID des Hosts
-    public required List<Container> containers { get; set; }
+    public required List<String> containers { get; set; }
 }
 
 [ApiController]
@@ -339,7 +339,7 @@ public class MonitoringController : Controller
     }
 
     // Endpoint, an den der Agent die Metrics der registrierten Container schickt
-    public async Task<IActionResult> ServiceMetrics([FromBody] ServiceMetricDto dto)
+    /*public async Task<IActionResult> ServiceMetrics([FromBody] ServiceMetricDto dto)
     {
         // Gültigkeit des Payloads prüfen
         if (!ModelState.IsValid)
@@ -375,7 +375,7 @@ public class MonitoringController : Controller
 
         return Ok();
         
-    }
+    }*/
 
     // Durchschnittliche Werte Berechnen
     public async Task<IActionResult> CalculateMedian(string Metric, int HoursToMonitor, int ServerId)