Moonlight-Panel/Servers
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started adding node-daemon communication. Added status endpoint

Browse Source
This commit is contained in:
=
2024-09-06 13:53:41 +00:00
parent 66e0fa2283
commit 6d4e1cdaaf
11 changed files with 144 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MoonlightServers.ApiServer/Extensions/NodeExtensions.cs Normal file
View File

@@ -0,0 +1,22 @@
using MoonCore.Helpers;
using MoonlightServers.ApiServer.Database.Entities;
namespace MoonlightServers.ApiServer.Extensions;
public static class NodeExtensions
{
public static HttpApiClient CreateClient(this Node node)
{
var httpClient = new HttpClient(new HttpClientHandler() // TODO: Make global http config for proxy etc
{
UseProxy = false
});
var url = $"{(node.SslEnabled ? "https" : "http")}://{node.Fqdn}:{node.ApiPort}/";
httpClient.BaseAddress = new Uri(url);
httpClient.DefaultRequestHeaders.Add("Authorization", node.Token);
return new HttpApiClient(httpClient);
}
}

17
MoonlightServers.ApiServer/Http/Controllers/Admin/Nodes/NodesController.cs
View File

@@ -5,7 +5,9 @@ using MoonCore.Helpers;
using Moonlight.ApiServer.App.Attributes;
using Moonlight.ApiServer.App.Exceptions;
using Moonlight.ApiServer.App.Helpers;
using MoonlightServers.DaemonShared.Http.Resources.Sys;
using MoonlightServers.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Extensions;
using MoonlightServers.Shared.Http.Requests.Admin.Nodes;
using MoonlightServers.Shared.Http.Responses.Admin.Nodes;
@@ -49,6 +51,21 @@ public class NodesController : BaseCrudController<Node, DetailNodeResponse, Crea
return Ok(Mapper.Map<DetailNodeResponse>(item));
}
[HttpGet("{id}/status")]
[RequirePermission("admin.servers.nodes.status")]
public async Task<ActionResult<StatusNodeResponse>> Status(int id)
{
var node = LoadItemById(id);
using var httpClient = node.CreateClient();
var response = await httpClient.GetJson<SystemInfoResponse>("system/info");
var result = Mapper.Map<StatusNodeResponse>(response);
return Ok(result);
}
private void ValidateFqdn(string fqdn, bool ssl)
{
if (ssl)

2
MoonlightServers.ApiServer/MoonlightServers.ApiServer.csproj
View File

@@ -16,7 +16,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MoonCore" Version="1.5.3" />
<PackageReference Include="MoonCore" Version="1.5.4" />
<PackageReference Include="MoonCore.Extended" Version="1.0.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />

2
MoonlightServers.Client/MoonlightServers.Client.csproj
View File

@@ -14,7 +14,7 @@
<ItemGroup Label="Moonlight Dependencies">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0"/>
<PackageReference Include="MoonCore" Version="1.5.3" />
<PackageReference Include="MoonCore" Version="1.5.4" />
<PackageReference Include="MoonCore.Blazor" Version="1.2.1" />
</ItemGroup>

18
MoonlightServers.Daemon/App/Helpers/HostHelper.cs
View File

@@ -67,37 +67,37 @@ public class HostHelper
return TimeSpan.FromSeconds(seconds);
}
public async Task<long[]> GetMemoryDetails()
public async Task<ulong[]> GetMemoryDetails() // 0, total - 1, free - 2, available - 3, cached - 4, swap total - 5, swap free
{
var result = new long[6];
var result = new ulong[6];
var memInfoText = await File.ReadAllLinesAsync("/proc/meminfo");
foreach (var line in memInfoText)
{
if (line.StartsWith("MemTotal:"))
result[0] = 1024 * long.Parse(line.Replace("MemTotal:", "").Replace("kB", "").Trim());
result[0] = 1024 * ulong.Parse(line.Replace("MemTotal:", "").Replace("kB", "").Trim());
if (line.StartsWith("MemFree:"))
result[1] = 1024 * long.Parse(line.Replace("MemFree:", "").Replace("kB", "").Trim());
result[1] = 1024 * ulong.Parse(line.Replace("MemFree:", "").Replace("kB", "").Trim());
if (line.StartsWith("MemAvailable:"))
result[2] = 1024 * long.Parse(line.Replace("MemAvailable:", "").Replace("kB", "").Trim());
result[2] = 1024 * ulong.Parse(line.Replace("MemAvailable:", "").Replace("kB", "").Trim());
if (line.StartsWith("Cached:"))
result[3] = 1024 * long.Parse(line.Replace("Cached:", "").Replace("kB", "").Trim());
result[3] = 1024 * ulong.Parse(line.Replace("Cached:", "").Replace("kB", "").Trim());
if (line.StartsWith("SwapTotal:"))
result[4] = 1024 * long.Parse(line.Replace("SwapTotal:", "").Replace("kB", "").Trim());
result[4] = 1024 * ulong.Parse(line.Replace("SwapTotal:", "").Replace("kB", "").Trim());
if (line.StartsWith("SwapFree:"))
result[5] = 1024 * long.Parse(line.Replace("SwapFree:", "").Replace("kB", "").Trim());
result[5] = 1024 * ulong.Parse(line.Replace("SwapFree:", "").Replace("kB", "").Trim());
}
return result;
}
public async Task<ulong[]> GetDiskUsage() // 0, Total size - 1, Free size, - 3, Total inodes - 4, free inodes
public async Task<ulong[]> GetDiskUsage() // 0, Total size - 1, Free size, - 2, Total inodes - 3, free inodes
{
var sysCallRes = Syscall.statvfs("/", out var buf);

47
MoonlightServers.Daemon/App/Http/Controllers/Sys/InfoController.cs Normal file
View File

@@ -0,0 +1,47 @@
using Microsoft.AspNetCore.Mvc;
using MoonlightServers.Daemon.App.Helpers;
using MoonlightServers.DaemonShared.Http.Resources.Sys;
namespace MoonlightServers.Daemon.App.Http.Controllers.Sys;
[ApiController]
[Route("system/info")]
public class InfoController : Controller
{
private readonly HostHelper HostHelper;
public InfoController(HostHelper hostHelper)
{
HostHelper = hostHelper;
}
[HttpGet]
public async Task<ActionResult<SystemInfoResponse>> Get()
{
var memoryDetails = await HostHelper.GetMemoryDetails();
var diskDetails = await HostHelper.GetDiskUsage();
var response = new SystemInfoResponse()
{
CpuModel = await HostHelper.GetCpuModel(),
CpuUsage = await HostHelper.GetCpuUsage(),
Uptime = await HostHelper.GetUptime(),
MemoryTotal = memoryDetails[0],
MemoryFree = memoryDetails[1],
MemoryAvailable = memoryDetails[2],
MemoryCached = memoryDetails[3],
SwapTotal = memoryDetails[4],
SwapFree = memoryDetails[5],
DiskTotal = diskDetails[0],
DiskFree = diskDetails[1],
DiskTotalInodes = diskDetails[2],
DiskFreeInodes = diskDetails[3]
};
return Ok(response);
}
}

3
MoonlightServers.Daemon/MoonlightServers.Daemon.csproj
View File

@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6"/>
<PackageReference Include="MoonCore" Version="1.5.3" />
<PackageReference Include="MoonCore" Version="1.5.4" />
<PackageReference Include="MoonCore.Unix" Version="1.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>
</ItemGroup>
@@ -19,7 +19,6 @@
<ItemGroup>
<Folder Include="App\Extensions\" />
<Folder Include="App\Http\Controllers\" />
<Folder Include="App\Http\Middleware\" />
<Folder Include="App\Implementations\" />
<Folder Include="App\Interfaces\" />

10
MoonlightServers.Daemon/Program.cs
View File

@@ -1,6 +1,5 @@
using MoonCore.Extensions;
using MoonCore.Helpers;
using MoonlightServers.Daemon.App.Helpers;
var loggerFactory = new LoggerFactory();
@@ -30,13 +29,6 @@ builder.Services.AddControllers();
var app = builder.Build();
var x = new HostHelper();
var data = await x.GetDiskUsage();
logger.LogInformation("Total disk: {value}", Formatter.FormatSize((long)data[0]));
logger.LogInformation("Free disk: {value}", Formatter.FormatSize((long)data[1]));
logger.LogInformation("Total inodes: {value}", data[2]);
logger.LogInformation("Free inodes: {value}", data[3]);
app.MapControllers();
app.Run();

22
MoonlightServers.DaemonShared/Http/Resources/Sys/SystemInfoResponse.cs Normal file
View File

@@ -0,0 +1,22 @@
namespace MoonlightServers.DaemonShared.Http.Resources.Sys;
public class SystemInfoResponse
{
public string CpuModel { get; set; }
public double[] CpuUsage { get; set; }
public TimeSpan Uptime { get; set; }
public ulong MemoryTotal { get; set; }
public ulong MemoryFree { get; set; }
public ulong MemoryAvailable { get; set; }
public ulong MemoryCached { get; set; }
public ulong SwapTotal { get; set; }
public ulong SwapFree { get; set; }
public ulong DiskTotal { get; set; }
public ulong DiskFree { get; set; }
public ulong DiskTotalInodes { get; set; }
public ulong DiskFreeInodes { get; set; }
}

1
MoonlightServers.DaemonShared/MoonlightServers.DaemonShared.csproj
View File

@@ -8,7 +8,6 @@
<ItemGroup>
<Folder Include="Http\Requests\" />
<Folder Include="Http\Resources\" />
<Folder Include="Models\" />
</ItemGroup>

22
MoonlightServers.Shared/Http/Responses/Admin/Nodes/StatusNodeResponse.cs Normal file
View File

@@ -0,0 +1,22 @@
namespace MoonlightServers.Shared.Http.Responses.Admin.Nodes;
public class StatusNodeResponse
{
public string CpuModel { get; set; }
public double[] CpuUsage { get; set; }
public TimeSpan Uptime { get; set; }
public ulong MemoryTotal { get; set; }
public ulong MemoryFree { get; set; }
public ulong MemoryAvailable { get; set; }
public ulong MemoryCached { get; set; }
public ulong SwapTotal { get; set; }
public ulong SwapFree { get; set; }
public ulong DiskTotal { get; set; }
public ulong DiskFree { get; set; }
public ulong DiskTotalInodes { get; set; }
public ulong DiskFreeInodes { get; set; }
}