gatus external-endpoints push main server
This commit is contained in:
parent
8cae455a50
commit
39bc20bc25
@ -23,7 +23,7 @@ internal static partial class HelperGatusToMona {
|
|||||||
state);
|
state);
|
||||||
httpResponseMessage.Wait(cancellationToken);
|
httpResponseMessage.Wait(cancellationToken);
|
||||||
logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {StateName} ; {state}",
|
logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {StateName} ; {state}",
|
||||||
99,
|
26,
|
||||||
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
|
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
|
||||||
appSettings.MonAConfiguration.Resource,
|
appSettings.MonAConfiguration.Resource,
|
||||||
appSettings.MonAConfiguration.StateName,
|
appSettings.MonAConfiguration.StateName,
|
||||||
@ -33,7 +33,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}",
|
||||||
10,
|
36,
|
||||||
body.Result);
|
body.Result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,17 +46,12 @@ 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);
|
_MonIn ??= MonIn.GetInstance(httpClientFactory);
|
||||||
if (_HttpClient is null) {
|
_HttpClient ??= httpClientFactory.CreateClient();
|
||||||
_HttpClient = httpClientFactory.CreateClient();
|
|
||||||
_HttpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", appSettings.GatusConfiguration.Token);
|
|
||||||
}
|
|
||||||
Task<HttpResponseMessage> httpResponseMessage = _HttpClient.PostAsync($"{appSettings.GatusConfiguration.BaseUniformResourceLocator}/api/v1/endpoints/{appSettings.GatusConfiguration.Key}/external?success=true&error=", null, cancellationToken);
|
|
||||||
httpResponseMessage.Wait(cancellationToken);
|
|
||||||
if (httpResponseMessage.Result.StatusCode != System.Net.HttpStatusCode.OK)
|
|
||||||
logger.LogWarning("Result is {statusCode}", httpResponseMessage.Result.StatusCode);
|
|
||||||
Heartbeat(appSettings, httpClientFactory, logger, State.Up, cancellationToken);
|
Heartbeat(appSettings, httpClientFactory, logger, State.Up, cancellationToken);
|
||||||
ReadOnlyCollection<string> successMatches = GetSuccessMatches(appSettings, logger, cancellationToken);
|
ReadOnlyCollection<string> successMatches = GetSuccessMatches(appSettings, logger, cancellationToken);
|
||||||
SendPerformanceMessage(appSettings, logger, successMatches, cancellationToken);
|
double value = GetValue(appSettings, successMatches);
|
||||||
|
SendPerformanceMessage(appSettings, logger, value, cancellationToken);
|
||||||
|
SendPerformanceMessage(appSettings, logger, _HttpClient, value, cancellationToken);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,13 +73,13 @@ 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}",
|
||||||
39,
|
76,
|
||||||
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}",
|
||||||
45,
|
82,
|
||||||
string.Join(Environment.NewLine, results));
|
string.Join(Environment.NewLine, results));
|
||||||
return results.AsReadOnly();
|
return results.AsReadOnly();
|
||||||
}
|
}
|
||||||
@ -104,10 +99,15 @@ internal static partial class HelperGatusToMona {
|
|||||||
return results.AsReadOnly();
|
return results.AsReadOnly();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void SendPerformanceMessage(AppSettings appSettings, ILogger<Worker> logger, ReadOnlyCollection<string> successMatches, CancellationToken cancellationToken) {
|
private static double GetValue(AppSettings appSettings, ReadOnlyCollection<string> successMatches) {
|
||||||
string performanceName = string.Concat(appSettings.MonAConfiguration.Resource, appSettings.MonAConfiguration.Suffix);
|
double result;
|
||||||
double v = successMatches.Count / appSettings.MonAConfiguration.Expected;
|
double v = successMatches.Count / appSettings.MonAConfiguration.Expected;
|
||||||
double value = Math.Round(v, 3) * 100;
|
result = Math.Round(v, 3) * 100;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void SendPerformanceMessage(AppSettings appSettings, ILogger<Worker> logger, double value, CancellationToken cancellationToken) {
|
||||||
|
string performanceName = string.Concat(appSettings.MonAConfiguration.Resource, appSettings.MonAConfiguration.Suffix);
|
||||||
Task<HttpResponseMessage> httpResponseMessage = _MonIn.SendPerformanceMessage(appSettings.MonAConfiguration.Site,
|
Task<HttpResponseMessage> httpResponseMessage = _MonIn.SendPerformanceMessage(appSettings.MonAConfiguration.Site,
|
||||||
appSettings.MonAConfiguration.Resource,
|
appSettings.MonAConfiguration.Resource,
|
||||||
performanceName,
|
performanceName,
|
||||||
@ -115,7 +115,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}",
|
||||||
76,
|
118,
|
||||||
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
|
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
|
||||||
appSettings.MonAConfiguration.Resource,
|
appSettings.MonAConfiguration.Resource,
|
||||||
performanceName,
|
performanceName,
|
||||||
@ -125,8 +125,40 @@ 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}",
|
||||||
86,
|
128,
|
||||||
body.Result);
|
body.Result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void SendPerformanceMessage(AppSettings appSettings, ILogger<Worker> logger, HttpClient httpClient, double value, CancellationToken cancellationToken) {
|
||||||
|
Task<HttpResponseMessage> httpResponseMessage;
|
||||||
|
string success = value == 100 ? "true" : "false";
|
||||||
|
string error = value == 100 ? string.Empty : $"value: {value}%;";
|
||||||
|
httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", appSettings.GatusConfiguration.Token);
|
||||||
|
httpResponseMessage = httpClient.PostAsync($"{appSettings.GatusConfiguration.BaseUniformResourceLocator}/api/v1/endpoints/{appSettings.GatusConfiguration.Key}/external?success={success}&error={error}", null, cancellationToken);
|
||||||
|
httpResponseMessage.Wait(cancellationToken);
|
||||||
|
logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {Key} ; {value}",
|
||||||
|
140,
|
||||||
|
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
|
||||||
|
appSettings.MonAConfiguration.Resource,
|
||||||
|
appSettings.GatusConfiguration.Key,
|
||||||
|
value);
|
||||||
|
if (httpResponseMessage.Result.StatusCode != System.Net.HttpStatusCode.OK)
|
||||||
|
throw new Exception(httpResponseMessage.Result.StatusCode.ToString());
|
||||||
|
if (!string.IsNullOrEmpty(appSettings.GatusToGatusConfiguration.BaseUniformResourceLocator)
|
||||||
|
&& !string.IsNullOrEmpty(appSettings.GatusToGatusConfiguration.Key)
|
||||||
|
&& !string.IsNullOrEmpty(appSettings.GatusToGatusConfiguration.Token)) {
|
||||||
|
httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", appSettings.GatusToGatusConfiguration.Token);
|
||||||
|
httpResponseMessage = httpClient.PostAsync($"{appSettings.GatusToGatusConfiguration.BaseUniformResourceLocator}/api/v1/endpoints/{appSettings.GatusToGatusConfiguration.Key}/external?success={success}&error={error}", null, cancellationToken);
|
||||||
|
httpResponseMessage.Wait(cancellationToken);
|
||||||
|
logger.LogInformation("Line {line}: {OriginalString} => {Resource} : {Key} ; {value}",
|
||||||
|
154,
|
||||||
|
httpResponseMessage.Result.RequestMessage.RequestUri.OriginalString,
|
||||||
|
appSettings.MonAConfiguration.Resource,
|
||||||
|
appSettings.GatusConfiguration.Key,
|
||||||
|
value);
|
||||||
|
if (httpResponseMessage.Result.StatusCode != System.Net.HttpStatusCode.OK)
|
||||||
|
throw new Exception(httpResponseMessage.Result.StatusCode.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -4,6 +4,7 @@ using System.Text.Json.Serialization;
|
|||||||
namespace Gatus.To.MonA.Models;
|
namespace Gatus.To.MonA.Models;
|
||||||
|
|
||||||
public record AppSettings(GatusConfiguration GatusConfiguration,
|
public record AppSettings(GatusConfiguration GatusConfiguration,
|
||||||
|
GatusToGatusConfiguration GatusToGatusConfiguration,
|
||||||
GatusToMonaConfiguration GatusToMonaConfiguration,
|
GatusToMonaConfiguration GatusToMonaConfiguration,
|
||||||
MonAConfiguration MonAConfiguration) {
|
MonAConfiguration MonAConfiguration) {
|
||||||
|
|
||||||
@ -11,10 +12,12 @@ public record AppSettings(GatusConfiguration GatusConfiguration,
|
|||||||
AppSettings result;
|
AppSettings result;
|
||||||
#pragma warning disable IL3050, IL2026
|
#pragma warning disable IL3050, IL2026
|
||||||
GatusConfiguration? gatusConfiguration = configurationRoot.GetSection(nameof(GatusConfiguration)).Get<GatusConfiguration>();
|
GatusConfiguration? gatusConfiguration = configurationRoot.GetSection(nameof(GatusConfiguration)).Get<GatusConfiguration>();
|
||||||
|
GatusToGatusConfiguration? gatusToGatusConfiguration = configurationRoot.GetSection(nameof(GatusToGatusConfiguration)).Get<GatusToGatusConfiguration>();
|
||||||
GatusToMonaConfiguration? gatusToMonaConfiguration = configurationRoot.GetSection(nameof(GatusToMonaConfiguration)).Get<GatusToMonaConfiguration>();
|
GatusToMonaConfiguration? gatusToMonaConfiguration = configurationRoot.GetSection(nameof(GatusToMonaConfiguration)).Get<GatusToMonaConfiguration>();
|
||||||
MonAConfiguration? monAConfiguration = configurationRoot.GetSection(nameof(MonAConfiguration)).Get<MonAConfiguration>();
|
MonAConfiguration? monAConfiguration = configurationRoot.GetSection(nameof(MonAConfiguration)).Get<MonAConfiguration>();
|
||||||
#pragma warning restore IL3050, IL2026
|
#pragma warning restore IL3050, IL2026
|
||||||
if (gatusConfiguration is null
|
if (gatusConfiguration is null
|
||||||
|
|| gatusToGatusConfiguration is null
|
||||||
|| gatusToMonaConfiguration is null
|
|| gatusToMonaConfiguration is null
|
||||||
|| monAConfiguration is null
|
|| monAConfiguration is null
|
||||||
|| gatusToMonaConfiguration?.Company is null) {
|
|| gatusToMonaConfiguration?.Company is null) {
|
||||||
@ -29,6 +32,7 @@ public record AppSettings(GatusConfiguration GatusConfiguration,
|
|||||||
throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
|
throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
|
||||||
}
|
}
|
||||||
result = new(gatusConfiguration,
|
result = new(gatusConfiguration,
|
||||||
|
gatusToGatusConfiguration,
|
||||||
gatusToMonaConfiguration,
|
gatusToMonaConfiguration,
|
||||||
monAConfiguration);
|
monAConfiguration);
|
||||||
Verify(result);
|
Verify(result);
|
||||||
|
20
Models/GatusToGatusConfiguration.cs
Normal file
20
Models/GatusToGatusConfiguration.cs
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Gatus.To.MonA.Models;
|
||||||
|
|
||||||
|
public record GatusToGatusConfiguration(string? BaseUniformResourceLocator,
|
||||||
|
string? Key,
|
||||||
|
string? Token) {
|
||||||
|
|
||||||
|
public override string ToString() {
|
||||||
|
string result = JsonSerializer.Serialize(this, GatusToGatusConfigurationSourceGenerationContext.Default.GatusToGatusConfiguration);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
[JsonSourceGenerationOptions(WriteIndented = true)]
|
||||||
|
[JsonSerializable(typeof(GatusToGatusConfiguration))]
|
||||||
|
internal partial class GatusToGatusConfigurationSourceGenerationContext : JsonSerializerContext {
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user