Refactor HelperGatusToMona to conditionally execute heartbeat and update performance message logic; update project dependencies and configuration models

This commit is contained in:
2025-10-20 13:25:14 -07:00
parent 39bc20bc25
commit 3a307bb488
6 changed files with 88 additions and 69 deletions

16
.vscode/tasks.json vendored
View File

@ -50,9 +50,7 @@
"build", "build",
"-r", "-r",
"win-x64", "win-x64",
"${workspaceFolder}/Gatus-to-MonA.csproj", "${workspaceFolder}/Gatus-to-MonA.csproj"
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
], ],
"problemMatcher": "$msCompile" "problemMatcher": "$msCompile"
}, },
@ -64,9 +62,7 @@
"build", "build",
"-r", "-r",
"linux-x64", "linux-x64",
"${workspaceFolder}/Gatus-to-MonA.csproj", "${workspaceFolder}/Gatus-to-MonA.csproj"
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
], ],
"problemMatcher": "$msCompile" "problemMatcher": "$msCompile"
}, },
@ -91,9 +87,7 @@
"-c", "-c",
"Release", "Release",
"-p:PublishAot=true", "-p:PublishAot=true",
"${workspaceFolder}/Gatus-to-MonA.csproj", "${workspaceFolder}/Gatus-to-MonA.csproj"
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
], ],
"problemMatcher": "$msCompile" "problemMatcher": "$msCompile"
}, },
@ -108,9 +102,7 @@
"-c", "-c",
"Release", "Release",
"-p:PublishAot=true", "-p:PublishAot=true",
"${workspaceFolder}/Gatus-to-MonA.csproj", "${workspaceFolder}/Gatus-to-MonA.csproj"
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
], ],
"problemMatcher": "$msCompile" "problemMatcher": "$msCompile"
}, },

View File

@ -16,7 +16,7 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.1" />
<PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="8.0.15" /> <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="8.0.21" />
<PackageReference Include="System.Text.Json" Version="9.0.2" /> <PackageReference Include="System.Text.Json" Version="9.0.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -15,26 +15,28 @@ internal static partial class HelperGatusToMona {
Path.Combine(appSettings.GatusToMonaConfiguration.Directory, appSettings.GatusConfiguration.FileName); Path.Combine(appSettings.GatusToMonaConfiguration.Directory, appSettings.GatusConfiguration.FileName);
internal static void Heartbeat(AppSettings appSettings, IHttpClientFactory httpClientFactory, ILogger<Worker> logger, State state, CancellationToken cancellationToken) { internal static void Heartbeat(AppSettings appSettings, IHttpClientFactory httpClientFactory, ILogger<Worker> logger, State state, CancellationToken cancellationToken) {
_MonIn ??= MonIn.GetInstance(httpClientFactory);
CreateEmptyFile(appSettings); CreateEmptyFile(appSettings);
Task<HttpResponseMessage> httpResponseMessage = _MonIn.SendStatus(appSettings.MonAConfiguration.Site, if (appSettings.MonAConfiguration.Use) {
appSettings.MonAConfiguration.Resource, _MonIn ??= MonIn.GetInstance(httpClientFactory);
appSettings.MonAConfiguration.StateName, Task<HttpResponseMessage> httpResponseMessage = _MonIn.SendStatus(appSettings.MonAConfiguration.Site,
state); appSettings.MonAConfiguration.Resource,
httpResponseMessage.Wait(cancellationToken); appSettings.MonAConfiguration.StateName,
logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {StateName} ; {state}", state);
26, httpResponseMessage.Wait(cancellationToken);
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString, logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {StateName} ; {state}",
appSettings.MonAConfiguration.Resource, 27,
appSettings.MonAConfiguration.StateName, httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
state); appSettings.MonAConfiguration.Resource,
if (httpResponseMessage.Result.StatusCode != System.Net.HttpStatusCode.OK) appSettings.MonAConfiguration.StateName,
throw new Exception(httpResponseMessage.Result.StatusCode.ToString()); state);
Task<string> body = httpResponseMessage.Result.Content.ReadAsStringAsync(cancellationToken); if (httpResponseMessage.Result.StatusCode != System.Net.HttpStatusCode.OK)
body.Wait(cancellationToken); throw new Exception(httpResponseMessage.Result.StatusCode.ToString());
logger.LogInformation("Line {line}: {Result}", Task<string> body = httpResponseMessage.Result.Content.ReadAsStringAsync(cancellationToken);
36, body.Wait(cancellationToken);
body.Result); logger.LogInformation("Line {line}: {Result}",
37,
body.Result);
}
} }
private static void CreateEmptyFile(AppSettings appSettings) { private static void CreateEmptyFile(AppSettings appSettings) {
@ -45,22 +47,59 @@ internal static partial class HelperGatusToMona {
} }
internal static bool UpdateCount(AppSettings appSettings, IHttpClientFactory httpClientFactory, ILogger<Worker> logger, CancellationToken cancellationToken) { internal static bool UpdateCount(AppSettings appSettings, IHttpClientFactory httpClientFactory, ILogger<Worker> logger, CancellationToken cancellationToken) {
_MonIn ??= MonIn.GetInstance(httpClientFactory);
_HttpClient ??= httpClientFactory.CreateClient(); _HttpClient ??= httpClientFactory.CreateClient();
Heartbeat(appSettings, httpClientFactory, logger, State.Up, cancellationToken); if (appSettings.MonAConfiguration.Use) {
ReadOnlyCollection<string> successMatches = GetSuccessMatches(appSettings, logger, cancellationToken); _MonIn ??= MonIn.GetInstance(httpClientFactory);
double value = GetValue(appSettings, successMatches); Heartbeat(appSettings, httpClientFactory, logger, State.Up, cancellationToken);
SendPerformanceMessage(appSettings, logger, value, cancellationToken); }
ReadOnlyCollection<string> lines = DownloadThenReadAllLinesMaybeSync(appSettings, logger, cancellationToken);
ReadOnlyCollection<string> successMatches = GetSuccessMatches(appSettings, logger, lines);
double value = (double)GetValue(appSettings, successMatches);
if (appSettings.MonAConfiguration.Use) {
SendPerformanceMessage(appSettings, logger, value, cancellationToken);
}
SendPerformanceMessage(appSettings, logger, _HttpClient, value, cancellationToken); SendPerformanceMessage(appSettings, logger, _HttpClient, value, cancellationToken);
return true; return true;
} }
private static ReadOnlyCollection<string> GetSuccessMatches(AppSettings appSettings, ILogger<Worker> logger, CancellationToken cancellationToken) { private static ReadOnlyCollection<string> DownloadThenReadAllLinesMaybeSync(AppSettings appSettings, ILogger<Worker> logger, CancellationToken cancellationToken) {
string[] results;
string file = GetFile(appSettings);
DownloadLines(appSettings, file, cancellationToken);
results = File.ReadAllLines(file);
if (!string.IsNullOrEmpty(appSettings.GatusToMonaConfiguration.SyncDirectory)) {
string text = string.Join(Environment.NewLine, results);
string path = Path.Combine(appSettings.GatusToMonaConfiguration.SyncDirectory, appSettings.GatusConfiguration.FileName);
try {
if (!Directory.Exists(appSettings.GatusToMonaConfiguration.SyncDirectory))
_ = Directory.CreateDirectory(appSettings.GatusToMonaConfiguration.SyncDirectory);
File.WriteAllText(path, text);
Directory.SetLastWriteTime(appSettings.GatusToMonaConfiguration.SyncDirectory, DateTime.Now);
} catch (Exception ex) {
logger.LogInformation("Exception {ex}: {ex}",
80,
$"{ex.Message}{Environment.NewLine}{ex.StackTrace}");
}
}
return results.AsReadOnly();
}
private static void DownloadLines(AppSettings appSettings, string file, CancellationToken cancellationToken) {
FileStream fileStream = new(file, FileMode.Truncate);
HttpClient httpClient = new();
Task<Stream> streamTask = httpClient.GetStreamAsync($"{appSettings.GatusConfiguration.BaseUniformResourceLocator}/metrics", cancellationToken);
streamTask.Wait(cancellationToken);
Task task = streamTask.Result.CopyToAsync(fileStream, cancellationToken);
task.Wait(cancellationToken);
fileStream.Dispose();
streamTask.Dispose();
httpClient.Dispose();
}
private static ReadOnlyCollection<string> GetSuccessMatches(AppSettings appSettings, ILogger<Worker> logger, ReadOnlyCollection<string> lines) {
List<string> results = []; List<string> results = [];
string value; string value;
string[] segments; string[] segments;
string file = GetFile(appSettings);
ReadOnlyCollection<string> lines = GetLines(appSettings, file, cancellationToken);
foreach (string line in lines) { foreach (string line in lines) {
if (!line.StartsWith(appSettings.GatusConfiguration.Metric)) if (!line.StartsWith(appSettings.GatusConfiguration.Metric))
continue; continue;
@ -73,35 +112,20 @@ internal static partial class HelperGatusToMona {
if (value[^1] is not '0' and not '1') if (value[^1] is not '0' and not '1')
continue; continue;
logger.LogInformation("Line {line}: {value}", logger.LogInformation("Line {line}: {value}",
76, 115,
value); value);
if (line.EndsWith('1')) if (line.EndsWith('1'))
results.Add(string.Concat('{', value)); results.Add(string.Concat('{', value));
} }
logger.LogInformation("Line {line}: {results}", logger.LogInformation("Line {line}: {results}",
82, 121,
string.Join(Environment.NewLine, results)); string.Join(Environment.NewLine, results));
return results.AsReadOnly(); return results.AsReadOnly();
} }
private static ReadOnlyCollection<string> GetLines(AppSettings appSettings, string file, CancellationToken cancellationToken) { private static decimal GetValue(AppSettings appSettings, ReadOnlyCollection<string> successMatches) {
string[] results; decimal result;
FileStream fileStream = new(file, FileMode.Truncate); decimal v = successMatches.Count / appSettings.MonAConfiguration.Expected;
HttpClient httpClient = new();
Task<Stream> streamTask = httpClient.GetStreamAsync($"{appSettings.GatusConfiguration.BaseUniformResourceLocator}/metrics", cancellationToken);
streamTask.Wait(cancellationToken);
Task task = streamTask.Result.CopyToAsync(fileStream, cancellationToken);
task.Wait(cancellationToken);
fileStream.Dispose();
streamTask.Dispose();
httpClient.Dispose();
results = File.ReadAllLines(file);
return results.AsReadOnly();
}
private static double GetValue(AppSettings appSettings, ReadOnlyCollection<string> successMatches) {
double result;
double v = successMatches.Count / appSettings.MonAConfiguration.Expected;
result = Math.Round(v, 3) * 100; result = Math.Round(v, 3) * 100;
return result; return result;
} }
@ -115,7 +139,7 @@ internal static partial class HelperGatusToMona {
description: string.Empty); description: string.Empty);
httpResponseMessage.Wait(cancellationToken); httpResponseMessage.Wait(cancellationToken);
logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {performanceName} ; {value}", logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {performanceName} ; {value}",
118, 142,
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString, httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
appSettings.MonAConfiguration.Resource, appSettings.MonAConfiguration.Resource,
performanceName, performanceName,
@ -125,7 +149,7 @@ internal static partial class HelperGatusToMona {
Task<string> body = httpResponseMessage.Result.Content.ReadAsStringAsync(cancellationToken); Task<string> body = httpResponseMessage.Result.Content.ReadAsStringAsync(cancellationToken);
body.Wait(cancellationToken); body.Wait(cancellationToken);
logger.LogInformation("Line {line}: {Result}", logger.LogInformation("Line {line}: {Result}",
128, 152,
body.Result); body.Result);
} }
@ -137,7 +161,7 @@ internal static partial class HelperGatusToMona {
httpResponseMessage = httpClient.PostAsync($"{appSettings.GatusConfiguration.BaseUniformResourceLocator}/api/v1/endpoints/{appSettings.GatusConfiguration.Key}/external?success={success}&error={error}", null, cancellationToken); httpResponseMessage = httpClient.PostAsync($"{appSettings.GatusConfiguration.BaseUniformResourceLocator}/api/v1/endpoints/{appSettings.GatusConfiguration.Key}/external?success={success}&error={error}", null, cancellationToken);
httpResponseMessage.Wait(cancellationToken); httpResponseMessage.Wait(cancellationToken);
logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {Key} ; {value}", logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {Key} ; {value}",
140, 164,
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString, httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
appSettings.MonAConfiguration.Resource, appSettings.MonAConfiguration.Resource,
appSettings.GatusConfiguration.Key, appSettings.GatusConfiguration.Key,
@ -151,10 +175,10 @@ internal static partial class HelperGatusToMona {
httpResponseMessage = httpClient.PostAsync($"{appSettings.GatusToGatusConfiguration.BaseUniformResourceLocator}/api/v1/endpoints/{appSettings.GatusToGatusConfiguration.Key}/external?success={success}&error={error}", null, cancellationToken); httpResponseMessage = httpClient.PostAsync($"{appSettings.GatusToGatusConfiguration.BaseUniformResourceLocator}/api/v1/endpoints/{appSettings.GatusToGatusConfiguration.Key}/external?success={success}&error={error}", null, cancellationToken);
httpResponseMessage.Wait(cancellationToken); httpResponseMessage.Wait(cancellationToken);
logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {Key} ; {value}", logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {Key} ; {value}",
154, 178,
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString, httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
appSettings.MonAConfiguration.Resource, appSettings.MonAConfiguration.Resource,
appSettings.GatusConfiguration.Key, appSettings.GatusToGatusConfiguration.Key,
value); value);
if (httpResponseMessage.Result.StatusCode != System.Net.HttpStatusCode.OK) if (httpResponseMessage.Result.StatusCode != System.Net.HttpStatusCode.OK)
throw new Exception(httpResponseMessage.Result.StatusCode.ToString()); throw new Exception(httpResponseMessage.Result.StatusCode.ToString());

View File

@ -6,7 +6,8 @@ namespace Gatus.To.MonA.Models;
public record GatusToMonaConfiguration(string Company, public record GatusToMonaConfiguration(string Company,
string Directory, string Directory,
string Helper, string Helper,
int MillisecondsDelay) { int MillisecondsDelay,
string? SyncDirectory) {
public override string ToString() { public override string ToString() {
string result = JsonSerializer.Serialize(this, GatusToMonaConfigurationSourceGenerationContext.Default.GatusToMonaConfiguration); string result = JsonSerializer.Serialize(this, GatusToMonaConfigurationSourceGenerationContext.Default.GatusToMonaConfiguration);

View File

@ -3,12 +3,13 @@ using System.Text.Json.Serialization;
namespace Gatus.To.MonA.Models; namespace Gatus.To.MonA.Models;
public record MonAConfiguration(int Expected, public record MonAConfiguration(decimal Expected,
int Minutes, int Minutes,
string Resource, string Resource,
string Site, string Site,
string StateName, string StateName,
string Suffix) { string Suffix,
bool Use) {
public override string ToString() { public override string ToString() {
string result = JsonSerializer.Serialize(this, MonAConfigurationSourceGenerationContext.Default.MonAConfiguration); string result = JsonSerializer.Serialize(this, MonAConfigurationSourceGenerationContext.Default.MonAConfiguration);

View File

@ -23,7 +23,7 @@ public partial class Worker : BackgroundService {
} }
public override Task StopAsync(CancellationToken cancellationToken) { public override Task StopAsync(CancellationToken cancellationToken) {
if (_AppSettings.GatusToMonaConfiguration.Helper == nameof(Helpers.HelperGatusToMona)) if (_AppSettings.GatusToMonaConfiguration.Helper is nameof(Helpers.HelperGatusToMona))
Helpers.HelperGatusToMona.Heartbeat(_AppSettings, _HttpClientFactory, _Logger, Infineon.Monitoring.MonA.State.Down, cancellationToken); Helpers.HelperGatusToMona.Heartbeat(_AppSettings, _HttpClientFactory, _Logger, Infineon.Monitoring.MonA.State.Down, cancellationToken);
return base.StopAsync(cancellationToken); return base.StopAsync(cancellationToken);
} }
@ -31,6 +31,7 @@ public partial class Worker : BackgroundService {
private async Task Body(CancellationToken cancellationToken) { private async Task Body(CancellationToken cancellationToken) {
if (!_IsWindowsService) { if (!_IsWindowsService) {
_Logger.LogInformation("Set break point and skip to run {_AppSettings.GatusToMonaConfiguration.Helper}!", _AppSettings.GatusToMonaConfiguration.Helper); _Logger.LogInformation("Set break point and skip to run {_AppSettings.GatusToMonaConfiguration.Helper}!", _AppSettings.GatusToMonaConfiguration.Helper);
BodyInner(cancellationToken);
throw new EvaluateException($"Set break point and skip to run {_AppSettings.GatusToMonaConfiguration.Helper}!"); throw new EvaluateException($"Set break point and skip to run {_AppSettings.GatusToMonaConfiguration.Helper}!");
} }
if (!_IsWindowsService) { if (!_IsWindowsService) {