diff --git a/CMakeLists.txt b/CMakeLists.txt index b29ee52a..07a79f4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,7 @@ endif() set(FILE_VERSION "${TAG}.${REVISION}") set(INFORMATIONAL_VERSION "${TAG}+${REVISION}-${COMMIT_ID}") +set(COMMIT_URL "https://github.com/ShaylenReddy42/Seelans-Tyres/commit/${COMMIT_ID}") message(STATUS "File Version: ${FILE_VERSION}") message(STATUS "Informational Version: ${INFORMATIONAL_VERSION}") diff --git a/Frontends/SeelansTyres.Frontends.Mvc/Program.cs b/Frontends/SeelansTyres.Frontends.Mvc/Program.cs index 09e9f7ca..3ec4786c 100644 --- a/Frontends/SeelansTyres.Frontends.Mvc/Program.cs +++ b/Frontends/SeelansTyres.Frontends.Mvc/Program.cs @@ -6,9 +6,47 @@ using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Authentication; using System.Security.Claims; +using Serilog; +using Serilog.Exceptions; +using Serilog.Sinks.Elasticsearch; +using Serilog.Events; +using System.Reflection; var builder = WebApplication.CreateBuilder(args); +builder.Logging.ClearProviders(); + +var assembly = typeof(Program).Assembly; + +builder.Host.UseSerilog((hostBuilderContext, loggerConfiguration) => +{ + loggerConfiguration + .ReadFrom.Configuration(hostBuilderContext.Configuration) + .Enrich.FromLogContext() + .Enrich.WithExceptionDetails() + .Enrich.WithProperty("Application Name", hostBuilderContext.HostingEnvironment.ApplicationName) + .Enrich.WithProperty("Descriptive Application Name", assembly.GetCustomAttribute()!.Product) + .Enrich.WithProperty("Codebase Version", $"v{assembly.GetCustomAttribute()!.InformationalVersion}") + .WriteTo.Console(); + + var metadata = assembly.GetCustomAttributes().ToList(); + + metadata.ForEach(attribute => loggerConfiguration.Enrich.WithProperty(attribute.Key, attribute.Value)); + + if (hostBuilderContext.Configuration.GetValue("LoggingSinks:Elasticsearch:Enabled") is true) + { + loggerConfiguration + .WriteTo.Elasticsearch( + new ElasticsearchSinkOptions(new Uri(hostBuilderContext.Configuration["LoggingSinks:Elasticsearch:Url"])) + { + AutoRegisterTemplate = true, + AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7, + IndexFormat = "seelanstyres-logs-{0:yyyy.MM.dd}", + MinimumLogEventLevel = LogEventLevel.Debug + }); + } +}); + // Add services to the container. builder.Services.AddControllersWithViews(); diff --git a/Frontends/SeelansTyres.Frontends.Mvc/SeelansTyres.Frontends.Mvc.csproj b/Frontends/SeelansTyres.Frontends.Mvc/SeelansTyres.Frontends.Mvc.csproj index 2a2f5aab..4890ef85 100644 --- a/Frontends/SeelansTyres.Frontends.Mvc/SeelansTyres.Frontends.Mvc.csproj +++ b/Frontends/SeelansTyres.Frontends.Mvc/SeelansTyres.Frontends.Mvc.csproj @@ -40,6 +40,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/Frontends/SeelansTyres.Frontends.Mvc/appsettings.json b/Frontends/SeelansTyres.Frontends.Mvc/appsettings.json index 766a85ff..b5d77762 100644 --- a/Frontends/SeelansTyres.Frontends.Mvc/appsettings.json +++ b/Frontends/SeelansTyres.Frontends.Mvc/appsettings.json @@ -1,8 +1,16 @@ { - "Logging": { - "LogLevel": { + "Serilog": { + "MinimumLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Override": { + "Microsoft.AspNetCore": "Warning" + } + } + }, + "LoggingSinks": { + "Elasticsearch": { + "Url": "undecided", + "Enabled": false } }, "AllowedHosts": "*", diff --git a/Gateways/SeelansTyres.Gateways.MvcBff/Program.cs b/Gateways/SeelansTyres.Gateways.MvcBff/Program.cs index f631b0bd..679f0a9b 100644 --- a/Gateways/SeelansTyres.Gateways.MvcBff/Program.cs +++ b/Gateways/SeelansTyres.Gateways.MvcBff/Program.cs @@ -4,12 +4,50 @@ using Ocelot.Middleware; using SeelansTyres.Gateways.MvcBff.DelegatingHandlers; using SeelansTyres.Gateways.MvcBff.Services; +using Serilog; +using Serilog.Events; +using Serilog.Exceptions; +using Serilog.Sinks.Elasticsearch; +using System.Reflection; using static System.Net.Mime.MediaTypeNames; var builder = WebApplication.CreateBuilder(args); builder.Configuration.EnableSubstitutionsWithDelimitedFallbackDefaults("$(", ")", " ?? "); +builder.Logging.ClearProviders(); + +var assembly = typeof(Program).Assembly; + +builder.Host.UseSerilog((hostBuilderContext, loggerConfiguration) => +{ + loggerConfiguration + .ReadFrom.Configuration(hostBuilderContext.Configuration) + .Enrich.FromLogContext() + .Enrich.WithExceptionDetails() + .Enrich.WithProperty("Application Name", hostBuilderContext.HostingEnvironment.ApplicationName) + .Enrich.WithProperty("Descriptive Application Name", assembly.GetCustomAttribute()!.Product) + .Enrich.WithProperty("Codebase Version", $"v{assembly.GetCustomAttribute()!.InformationalVersion}") + .WriteTo.Console(); + + var metadata = assembly.GetCustomAttributes().ToList(); + + metadata.ForEach(attribute => loggerConfiguration.Enrich.WithProperty(attribute.Key, attribute.Value)); + + if (hostBuilderContext.Configuration.GetValue("LoggingSinks:Elasticsearch:Enabled") is true) + { + loggerConfiguration + .WriteTo.Elasticsearch( + new ElasticsearchSinkOptions(new Uri(hostBuilderContext.Configuration["LoggingSinks:Elasticsearch:Url"])) + { + AutoRegisterTemplate = true, + AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7, + IndexFormat = "seelanstyres-logs-{0:yyyy.MM.dd}", + MinimumLogEventLevel = LogEventLevel.Debug + }); + } +}); + var authenticationScheme = "SeelansTyresMvcBffAuthenticationScheme"; builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) diff --git a/Gateways/SeelansTyres.Gateways.MvcBff/SeelansTyres.Gateways.MvcBff.csproj b/Gateways/SeelansTyres.Gateways.MvcBff/SeelansTyres.Gateways.MvcBff.csproj index fb11b965..40fa6673 100644 --- a/Gateways/SeelansTyres.Gateways.MvcBff/SeelansTyres.Gateways.MvcBff.csproj +++ b/Gateways/SeelansTyres.Gateways.MvcBff/SeelansTyres.Gateways.MvcBff.csproj @@ -22,6 +22,10 @@ + + + + diff --git a/Gateways/SeelansTyres.Gateways.MvcBff/appsettings.json b/Gateways/SeelansTyres.Gateways.MvcBff/appsettings.json index 616ad7cb..d38e6abc 100644 --- a/Gateways/SeelansTyres.Gateways.MvcBff/appsettings.json +++ b/Gateways/SeelansTyres.Gateways.MvcBff/appsettings.json @@ -1,8 +1,16 @@ { - "Logging": { - "LogLevel": { + "Serilog": { + "MinimumLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Override": { + "Microsoft.AspNetCore": "Warning" + } + } + }, + "LoggingSinks": { + "Elasticsearch": { + "Url": "undecided", + "Enabled": false } }, "AllowedHosts": "*", diff --git a/Services/SeelansTyres.Services.AddressService/Program.cs b/Services/SeelansTyres.Services.AddressService/Program.cs index 6d2f0815..24606383 100644 --- a/Services/SeelansTyres.Services.AddressService/Program.cs +++ b/Services/SeelansTyres.Services.AddressService/Program.cs @@ -6,10 +6,47 @@ using SeelansTyres.Services.AddressService.Authorization; using SeelansTyres.Services.AddressService.Data; using SeelansTyres.Services.AddressService.Services; +using Serilog; +using Serilog.Events; +using Serilog.Exceptions; +using Serilog.Sinks.Elasticsearch; using System.Reflection; var builder = WebApplication.CreateBuilder(args); +builder.Logging.ClearProviders(); + +var assembly = typeof(Program).Assembly; + +builder.Host.UseSerilog((hostBuilderContext, loggerConfiguration) => +{ + loggerConfiguration + .ReadFrom.Configuration(hostBuilderContext.Configuration) + .Enrich.FromLogContext() + .Enrich.WithExceptionDetails() + .Enrich.WithProperty("Application Name", hostBuilderContext.HostingEnvironment.ApplicationName) + .Enrich.WithProperty("Descriptive Application Name", assembly.GetCustomAttribute()!.Product) + .Enrich.WithProperty("Codebase Version", $"v{assembly.GetCustomAttribute()!.InformationalVersion}") + .WriteTo.Console(); + + var metadata = assembly.GetCustomAttributes().ToList(); + + metadata.ForEach(attribute => loggerConfiguration.Enrich.WithProperty(attribute.Key, attribute.Value)); + + if (hostBuilderContext.Configuration.GetValue("LoggingSinks:Elasticsearch:Enabled") is true) + { + loggerConfiguration + .WriteTo.Elasticsearch( + new ElasticsearchSinkOptions(new Uri(hostBuilderContext.Configuration["LoggingSinks:Elasticsearch:Url"])) + { + AutoRegisterTemplate = true, + AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7, + IndexFormat = "seelanstyres-logs-{0:yyyy.MM.dd}", + MinimumLogEventLevel = LogEventLevel.Debug + }); + } +}); + // Add services to the container. builder.Services.AddControllers(); diff --git a/Services/SeelansTyres.Services.AddressService/SeelansTyres.Services.AddressService.csproj b/Services/SeelansTyres.Services.AddressService/SeelansTyres.Services.AddressService.csproj index ee597d76..ffe326f3 100644 --- a/Services/SeelansTyres.Services.AddressService/SeelansTyres.Services.AddressService.csproj +++ b/Services/SeelansTyres.Services.AddressService/SeelansTyres.Services.AddressService.csproj @@ -26,6 +26,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/Services/SeelansTyres.Services.AddressService/appsettings.json b/Services/SeelansTyres.Services.AddressService/appsettings.json index f1f59d34..ce73ef38 100644 --- a/Services/SeelansTyres.Services.AddressService/appsettings.json +++ b/Services/SeelansTyres.Services.AddressService/appsettings.json @@ -1,8 +1,16 @@ { - "Logging": { - "LogLevel": { + "Serilog": { + "MinimumLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Override": { + "Microsoft.AspNetCore": "Warning" + } + } + }, + "LoggingSinks": { + "Elasticsearch": { + "Url": "undecided", + "Enabled": false } }, "AllowedHosts": "*", diff --git a/Services/SeelansTyres.Services.IdentityService/Program.cs b/Services/SeelansTyres.Services.IdentityService/Program.cs index 935b2985..9300471d 100644 --- a/Services/SeelansTyres.Services.IdentityService/Program.cs +++ b/Services/SeelansTyres.Services.IdentityService/Program.cs @@ -12,26 +12,46 @@ using Serilog; using Serilog.Events; using Serilog.Exceptions; +using Serilog.Sinks.Elasticsearch; using Serilog.Sinks.SystemConsole.Themes; using System.Reflection; var builder = WebApplication.CreateBuilder(args); +builder.Logging.ClearProviders(); + +var assembly = typeof(Program).Assembly; + builder.Host.UseSerilog((hostBuilderContext, loggerConfiguration) => { loggerConfiguration - .MinimumLevel.Debug() - .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) - .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information) - .MinimumLevel.Override("System", LogEventLevel.Warning) - .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information) + .ReadFrom.Configuration(hostBuilderContext.Configuration) .Enrich.FromLogContext() .Enrich.WithExceptionDetails() - .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code); -}); + .Enrich.WithProperty("Application Name", hostBuilderContext.HostingEnvironment.ApplicationName) + .Enrich.WithProperty("Descriptive Application Name", assembly.GetCustomAttribute()!.Product) + .Enrich.WithProperty("Codebase Version", $"v{assembly.GetCustomAttribute()!.InformationalVersion}") + .WriteTo.Console( + outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", + theme: AnsiConsoleTheme.Code); -var connectionString = builder.Configuration["SeelansTyresIdentityContext"]; -var assemblyName = typeof(Program).Assembly.GetName().Name; + var metadata = assembly.GetCustomAttributes().ToList(); + + metadata.ForEach(attribute => loggerConfiguration.Enrich.WithProperty(attribute.Key, attribute.Value)); + + if (hostBuilderContext.Configuration.GetValue("LoggingSinks:Elasticsearch:Enabled") is true) + { + loggerConfiguration + .WriteTo.Elasticsearch( + new ElasticsearchSinkOptions(new Uri(hostBuilderContext.Configuration["LoggingSinks:Elasticsearch:Url"])) + { + AutoRegisterTemplate = true, + AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7, + IndexFormat = "seelanstyres-logs-{0:yyyy.MM.dd}", + MinimumLogEventLevel = LogEventLevel.Debug + }); + } +}); builder.Services.AddControllersWithViews(); @@ -59,6 +79,9 @@ }}); }); +var connectionString = builder.Configuration["SeelansTyresIdentityContext"]; +var assemblyName = assembly.GetName().Name; + builder.Services.AddDbContext(options => { options.UseSqlServer(connectionString, options => options.MigrationsAssembly(assemblyName)); diff --git a/Services/SeelansTyres.Services.IdentityService/SeelansTyres.Services.IdentityService.csproj b/Services/SeelansTyres.Services.IdentityService/SeelansTyres.Services.IdentityService.csproj index 2c237421..5dff889a 100644 --- a/Services/SeelansTyres.Services.IdentityService/SeelansTyres.Services.IdentityService.csproj +++ b/Services/SeelansTyres.Services.IdentityService/SeelansTyres.Services.IdentityService.csproj @@ -31,6 +31,8 @@ + + diff --git a/Services/SeelansTyres.Services.IdentityService/Services/ConfigurationDataSeeder.cs b/Services/SeelansTyres.Services.IdentityService/Services/ConfigurationDataSeeder.cs index 4f6f6ce4..f704b2a7 100644 --- a/Services/SeelansTyres.Services.IdentityService/Services/ConfigurationDataSeeder.cs +++ b/Services/SeelansTyres.Services.IdentityService/Services/ConfigurationDataSeeder.cs @@ -1,6 +1,5 @@ using IdentityServer4.EntityFramework.DbContexts; using IdentityServer4.EntityFramework.Mappers; -using Serilog; namespace SeelansTyres.Services.IdentityService.Services; @@ -8,17 +7,19 @@ public class ConfigurationDataSeeder { private readonly ConfigurationDbContext context; private readonly IConfiguration configuration; + private readonly ILogger logger; public ConfigurationDataSeeder( ConfigurationDbContext context, - IConfiguration configuration) => - (this.context, this.configuration) = (context, configuration); + IConfiguration configuration, + ILogger logger) => + (this.context, this.configuration, this.logger) = (context, configuration, logger); public async Task SeedConfigurationDataAsync() { Config.Configuration = configuration; - Log.Debug("Clients being populated"); + logger.LogDebug("Clients being populated"); Config.Clients.ToList().ForEach(client => { var clientEntity = @@ -32,7 +33,7 @@ public async Task SeedConfigurationDataAsync() }); await context.SaveChangesAsync(); - Log.Debug("IdentityResources being populated"); + logger.LogDebug("IdentityResources being populated"); Config.IdentityResources.ToList().ForEach(identityResource => { var identityResourceEntity = @@ -46,7 +47,7 @@ public async Task SeedConfigurationDataAsync() }); await context.SaveChangesAsync(); - Log.Debug("ApiScopes being populated"); + logger.LogDebug("ApiScopes being populated"); Config.ApiScopes.ToList().ForEach(apiScope => { var apiScopeEntity = @@ -60,7 +61,7 @@ public async Task SeedConfigurationDataAsync() }); await context.SaveChangesAsync(); - Log.Debug("ApiResources being populated"); + logger.LogDebug("ApiResources being populated"); Config.ApiResources.ToList().ForEach(apiResource => { var apiResourceEntity = diff --git a/Services/SeelansTyres.Services.IdentityService/appsettings.json b/Services/SeelansTyres.Services.IdentityService/appsettings.json index dce588b9..156dbf94 100644 --- a/Services/SeelansTyres.Services.IdentityService/appsettings.json +++ b/Services/SeelansTyres.Services.IdentityService/appsettings.json @@ -1,5 +1,22 @@ { "AllowedHosts": "*", + "Serilog": { + "MinimumLevel": { + "Default": "Debug", + "Override": { + "Microsoft": "Warning", + "Microsoft.AspNetCore.Authentication": "Information", + "Microsoft.Hosting.Lifetime": "Information", + "System": "Warning" + } + } + }, + "LoggingSinks": { + "Elasticsearch": { + "Url": "undecided", + "Enabled": false + } + }, "AdminCredentials": { "Email": "...", "Password": "..." diff --git a/Services/SeelansTyres.Services.OrderService/Program.cs b/Services/SeelansTyres.Services.OrderService/Program.cs index 74ecd436..90f1347d 100644 --- a/Services/SeelansTyres.Services.OrderService/Program.cs +++ b/Services/SeelansTyres.Services.OrderService/Program.cs @@ -6,10 +6,47 @@ using SeelansTyres.Services.OrderService.Authorization; using SeelansTyres.Services.OrderService.Data; using SeelansTyres.Services.OrderService.Services; +using Serilog; +using Serilog.Events; +using Serilog.Exceptions; +using Serilog.Sinks.Elasticsearch; using System.Reflection; var builder = WebApplication.CreateBuilder(args); +builder.Logging.ClearProviders(); + +var assembly = typeof(Program).Assembly; + +builder.Host.UseSerilog((hostBuilderContext, loggerConfiguration) => +{ + loggerConfiguration + .ReadFrom.Configuration(hostBuilderContext.Configuration) + .Enrich.FromLogContext() + .Enrich.WithExceptionDetails() + .Enrich.WithProperty("Application Name", hostBuilderContext.HostingEnvironment.ApplicationName) + .Enrich.WithProperty("Descriptive Application Name", assembly.GetCustomAttribute()!.Product) + .Enrich.WithProperty("Codebase Version", $"v{assembly.GetCustomAttribute()!.InformationalVersion}") + .WriteTo.Console(); + + var metadata = assembly.GetCustomAttributes().ToList(); + + metadata.ForEach(attribute => loggerConfiguration.Enrich.WithProperty(attribute.Key, attribute.Value)); + + if (hostBuilderContext.Configuration.GetValue("LoggingSinks:Elasticsearch:Enabled") is true) + { + loggerConfiguration + .WriteTo.Elasticsearch( + new ElasticsearchSinkOptions(new Uri(hostBuilderContext.Configuration["LoggingSinks:Elasticsearch:Url"])) + { + AutoRegisterTemplate = true, + AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7, + IndexFormat = "seelanstyres-logs-{0:yyyy.MM.dd}", + MinimumLogEventLevel = LogEventLevel.Debug + }); + } +}); + // Add services to the container. builder.Services.AddControllers(); diff --git a/Services/SeelansTyres.Services.OrderService/SeelansTyres.Services.OrderService.csproj b/Services/SeelansTyres.Services.OrderService/SeelansTyres.Services.OrderService.csproj index ee597d76..ffe326f3 100644 --- a/Services/SeelansTyres.Services.OrderService/SeelansTyres.Services.OrderService.csproj +++ b/Services/SeelansTyres.Services.OrderService/SeelansTyres.Services.OrderService.csproj @@ -26,6 +26,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/Services/SeelansTyres.Services.OrderService/appsettings.json b/Services/SeelansTyres.Services.OrderService/appsettings.json index dbc7bb7e..7c34b639 100644 --- a/Services/SeelansTyres.Services.OrderService/appsettings.json +++ b/Services/SeelansTyres.Services.OrderService/appsettings.json @@ -1,8 +1,16 @@ { - "Logging": { - "LogLevel": { + "Serilog": { + "MinimumLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Override": { + "Microsoft.AspNetCore": "Warning" + } + } + }, + "LoggingSinks": { + "Elasticsearch": { + "Url": "undecided", + "Enabled": false } }, "AllowedHosts": "*", diff --git a/Services/SeelansTyres.Services.TyresService/Program.cs b/Services/SeelansTyres.Services.TyresService/Program.cs index 4e8b10c3..fe8b22f6 100644 --- a/Services/SeelansTyres.Services.TyresService/Program.cs +++ b/Services/SeelansTyres.Services.TyresService/Program.cs @@ -6,10 +6,47 @@ using SeelansTyres.Services.TyresService.Authorization; using SeelansTyres.Services.TyresService.Data; using SeelansTyres.Services.TyresService.Services; +using Serilog; +using Serilog.Events; +using Serilog.Exceptions; +using Serilog.Sinks.Elasticsearch; using System.Reflection; var builder = WebApplication.CreateBuilder(args); +builder.Logging.ClearProviders(); + +var assembly = typeof(Program).Assembly; + +builder.Host.UseSerilog((hostBuilderContext, loggerConfiguration) => +{ + loggerConfiguration + .ReadFrom.Configuration(hostBuilderContext.Configuration) + .Enrich.FromLogContext() + .Enrich.WithExceptionDetails() + .Enrich.WithProperty("Application Name", hostBuilderContext.HostingEnvironment.ApplicationName) + .Enrich.WithProperty("Descriptive Application Name", assembly.GetCustomAttribute()!.Product) + .Enrich.WithProperty("Codebase Version", $"v{assembly.GetCustomAttribute()!.InformationalVersion}") + .WriteTo.Console(); + + var metadata = assembly.GetCustomAttributes().ToList(); + + metadata.ForEach(attribute => loggerConfiguration.Enrich.WithProperty(attribute.Key, attribute.Value)); + + if (hostBuilderContext.Configuration.GetValue("LoggingSinks:Elasticsearch:Enabled") is true) + { + loggerConfiguration + .WriteTo.Elasticsearch( + new ElasticsearchSinkOptions(new Uri(hostBuilderContext.Configuration["LoggingSinks:Elasticsearch:Url"])) + { + AutoRegisterTemplate = true, + AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv7, + IndexFormat = "seelanstyres-logs-{0:yyyy.MM.dd}", + MinimumLogEventLevel = LogEventLevel.Debug + }); + } +}); + // Add services to the container. builder.Services.AddControllers(); diff --git a/Services/SeelansTyres.Services.TyresService/SeelansTyres.Services.TyresService.csproj b/Services/SeelansTyres.Services.TyresService/SeelansTyres.Services.TyresService.csproj index c3450fdf..b9358195 100644 --- a/Services/SeelansTyres.Services.TyresService/SeelansTyres.Services.TyresService.csproj +++ b/Services/SeelansTyres.Services.TyresService/SeelansTyres.Services.TyresService.csproj @@ -26,6 +26,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/Services/SeelansTyres.Services.TyresService/appsettings.json b/Services/SeelansTyres.Services.TyresService/appsettings.json index de483701..743182ef 100644 --- a/Services/SeelansTyres.Services.TyresService/appsettings.json +++ b/Services/SeelansTyres.Services.TyresService/appsettings.json @@ -1,8 +1,16 @@ { - "Logging": { - "LogLevel": { + "Serilog": { + "MinimumLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Override": { + "Microsoft.AspNetCore": "Warning" + } + } + }, + "LoggingSinks": { + "Elasticsearch": { + "Url": "undecided", + "Enabled": false } }, "AllowedHosts": "*", diff --git a/cmake/SeelansTyres.Frontends.Mvc.AssemblyInfo.cs.in b/cmake/SeelansTyres.Frontends.Mvc.AssemblyInfo.cs.in index 206af48e..900772a5 100644 --- a/cmake/SeelansTyres.Frontends.Mvc.AssemblyInfo.cs.in +++ b/cmake/SeelansTyres.Frontends.Mvc.AssemblyInfo.cs.in @@ -27,3 +27,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("@FILE_VERSION@")] [assembly: AssemblyFileVersion("@FILE_VERSION@")] [assembly: AssemblyInformationalVersion("@INFORMATIONAL_VERSION@")] + +// Custom Metadata +[assembly: AssemblyMetadata("Commit Url", "@COMMIT_URL@")] diff --git a/cmake/SeelansTyres.Gateways.MvcBff.AssemblyInfo.cs.in b/cmake/SeelansTyres.Gateways.MvcBff.AssemblyInfo.cs.in index a80160af..61ef89b0 100644 --- a/cmake/SeelansTyres.Gateways.MvcBff.AssemblyInfo.cs.in +++ b/cmake/SeelansTyres.Gateways.MvcBff.AssemblyInfo.cs.in @@ -27,3 +27,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("@FILE_VERSION@")] [assembly: AssemblyFileVersion("@FILE_VERSION@")] [assembly: AssemblyInformationalVersion("@INFORMATIONAL_VERSION@")] + +// Custom Metadata +[assembly: AssemblyMetadata("Commit Url", "@COMMIT_URL@")] diff --git a/cmake/SeelansTyres.Services.AddressService.AssemblyInfo.cs.in b/cmake/SeelansTyres.Services.AddressService.AssemblyInfo.cs.in index 4adc08a1..2d5efc5f 100644 --- a/cmake/SeelansTyres.Services.AddressService.AssemblyInfo.cs.in +++ b/cmake/SeelansTyres.Services.AddressService.AssemblyInfo.cs.in @@ -27,3 +27,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("@FILE_VERSION@")] [assembly: AssemblyFileVersion("@FILE_VERSION@")] [assembly: AssemblyInformationalVersion("@INFORMATIONAL_VERSION@")] + +// Custom Metadata +[assembly: AssemblyMetadata("Commit Url", "@COMMIT_URL@")] diff --git a/cmake/SeelansTyres.Services.IdentityService.AssemblyInfo.cs.in b/cmake/SeelansTyres.Services.IdentityService.AssemblyInfo.cs.in index 2a4d4f70..bed227f9 100644 --- a/cmake/SeelansTyres.Services.IdentityService.AssemblyInfo.cs.in +++ b/cmake/SeelansTyres.Services.IdentityService.AssemblyInfo.cs.in @@ -27,3 +27,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("@FILE_VERSION@")] [assembly: AssemblyFileVersion("@FILE_VERSION@")] [assembly: AssemblyInformationalVersion("@INFORMATIONAL_VERSION@")] + +// Custom Metadata +[assembly: AssemblyMetadata("Commit Url", "@COMMIT_URL@")] diff --git a/cmake/SeelansTyres.Services.OrderService.AssemblyInfo.cs.in b/cmake/SeelansTyres.Services.OrderService.AssemblyInfo.cs.in index 7310461d..67cb47c2 100644 --- a/cmake/SeelansTyres.Services.OrderService.AssemblyInfo.cs.in +++ b/cmake/SeelansTyres.Services.OrderService.AssemblyInfo.cs.in @@ -27,3 +27,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("@FILE_VERSION@")] [assembly: AssemblyFileVersion("@FILE_VERSION@")] [assembly: AssemblyInformationalVersion("@INFORMATIONAL_VERSION@")] + +// Custom Metadata +[assembly: AssemblyMetadata("Commit Url", "@COMMIT_URL@")] diff --git a/cmake/SeelansTyres.Services.TyresService.AssemblyInfo.cs.in b/cmake/SeelansTyres.Services.TyresService.AssemblyInfo.cs.in index 18cbe21b..9f7c6b77 100644 --- a/cmake/SeelansTyres.Services.TyresService.AssemblyInfo.cs.in +++ b/cmake/SeelansTyres.Services.TyresService.AssemblyInfo.cs.in @@ -27,3 +27,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("@FILE_VERSION@")] [assembly: AssemblyFileVersion("@FILE_VERSION@")] [assembly: AssemblyInformationalVersion("@INFORMATIONAL_VERSION@")] + +// Custom Metadata +[assembly: AssemblyMetadata("Commit Url", "@COMMIT_URL@")]