Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<PackageVersion Include="coverlet.MTP" Version="10.0.1" />
<PackageVersion Include="EventStoreProjections" Version="2023.12.3" />
<PackageVersion Include="FileProcessor.Client" Version="2026.9.2.152" />
<PackageVersion Include="HealthMonitoring.Client" Version="2026.9.2.30" />
<PackageVersion Include="IdentityModel" Version="6.2.0" />
<PackageVersion Include="Lamar" Version="16.0.0" />
<PackageVersion Include="Lamar.Microsoft.DependencyInjection" Version="16.0.0" />
Expand Down
10 changes: 7 additions & 3 deletions EstateManagementUI.BlazorServer/Common/BoostrapperExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
using ClientProxyBase;
using EstateManagementUI.BlazorServer.Permissions;
using EstateManagementUI.BlazorServer.Testing;
using EstateManagementUI.BlazorServer.TokenManagement;
using EstateManagementUI.BlazorServer.UIServices;
using EstateManagementUI.BusinessLogic.BackendAPI;
using EstateManagementUI.BusinessLogic.Client;
using EstateManagementUI.BusinessLogic.RequestHandlers;
using EstateManagementUI.BusinessLogic.Services;
using FileProcessor.Client;
using MediatR;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies;
Expand All @@ -16,10 +18,9 @@
using Shared.Serialisation;
using System.Data.SqlTypes;
using System.Net;
using System.Reflection;
using System.Security.Cryptography.X509Certificates;
using FileProcessor.Client;
using TransactionProcessor.Client;
using EstateManagementUI.BlazorServer.Testing;

namespace EstateManagementUI.BlazorServer.Common;

Expand Down Expand Up @@ -119,7 +120,10 @@ public static WebApplicationBuilder LoadConfiguration(this WebApplicationBuilder
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
.AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: true)
.AddJsonFile($"/home/txnproc/config/appsettings.local.json", optional: true)
.AddEnvironmentVariables();
.AddEnvironmentVariables().AddInMemoryCollection(new Dictionary<string, string?>
{
["HealthMonitoring:Service:Version"] = Assembly.GetEntryAssembly()?.GetName().Version?.ToString() ?? "0.0.0.0"
});

ConfigurationReader.Initialise(builder.Configuration);
return builder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="HealthMonitoring.Client" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
<PackageReference Include="Lamar" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" />
Expand Down
18 changes: 6 additions & 12 deletions EstateManagementUI.BlazorServer/Program.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
using EstateManagementUI.BlazorServer.Common;
using EstateManagementUI.BlazorServer.Components;
using EstateManagementUI.BlazorServer.Testing;
using HealthChecks.UI.Client;
using HealthMonitoring.Client;
using Microsoft.AspNetCore.Components.Server;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using EstateManagementUI.BlazorServer.Testing;
using Sentry.Extensibility;
using Shared.Extensions;
using Shared.General;
using Shared.Monitoring;
using Shared.Serialisation;
using Spectre.Console;
using System.IdentityModel.Tokens.Jwt;
using System.Reflection;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Components.Server;
using Shared.Monitoring;

WebApplicationBuilder builder = WebApplication.CreateBuilder(args).LoadConfiguration().ConfigureKestrel();

Expand Down Expand Up @@ -96,7 +97,7 @@

builder.RegisterUIServices().RegisterSerialiser();

builder.Services.AddUptimeKuma();
builder.Services.AddHealthMonitoringRegistration(builder.Configuration);

// Add Health Checks - read URLs from configuration
var estateReportingApiUrl = builder.Configuration.GetValue<string>("AppSettings:EstateReportingApi") ?? "http://localhost:5011";
Expand Down Expand Up @@ -190,13 +191,6 @@ Uri ValidateAndCreateUri(string url, string configKey)
ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
});

app.Lifetime.ApplicationStarted.Register(() =>
{
app.RegisterWithUptimeKumaAsync()
.GetAwaiter()
.GetResult();
});

app.Run();


Expand Down
27 changes: 27 additions & 0 deletions EstateManagementUI.BlazorServer/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,32 @@
"Url": "http://localhost:5004/health",
"IntervalInSeconds": 60
}
},
"HealthMonitoring": {
"Service": {
"ServiceId": "estate-management-ui",
"Name": "Estate Management UI",
"Description": "Estate Management UI",
"HealthUrl": "https://localhost:5004/healthui",
Comment thread
StuartFerguson marked this conversation as resolved.
Resolved
"IgnoreCertificateErrors": true
},
"Dependencies": [
{
"DependencyName": "Security Service",
"TargetServiceId": "security-service"
},
{
"DependencyName": "Estate Reporting API",
"TargetServiceId": "estate-reporting-api"
},
{
"DependencyName": "Transaction Processor Service",
"TargetServiceId": "transaction-processor"
},
{
"DependencyName": "File Processor Service",
"TargetServiceId": "file-processor"
}
]
}
}
Loading