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

Merge Errors fixed

Browse Source
This commit is contained in:
Daniel Habenicht
2025-10-29 20:57:57 +01:00
parent a6d992c874
commit df1c4ca4b4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Watcher/Controllers/MonitoringController.cs
View File

@@ -85,7 +85,7 @@ public class MetricDto
public class ServiceDto 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<Container> containers { get; set; } public required List<String> containers { get; set; }
} }
[ApiController] [ApiController]
@@ -339,7 +339,7 @@ public class MonitoringController : Controller
} }
// Endpoint, an den der Agent die Metrics der registrierten Container schickt // 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 // Gültigkeit des Payloads prüfen
if (!ModelState.IsValid) if (!ModelState.IsValid)
@@ -375,7 +375,7 @@ public class MonitoringController : Controller
return Ok(); return Ok();
} }*/
// Durchschnittliche Werte Berechnen // Durchschnittliche Werte Berechnen
public async Task<IActionResult> CalculateMedian(string Metric, int HoursToMonitor, int ServerId) public async Task<IActionResult> CalculateMedian(string Metric, int HoursToMonitor, int ServerId)