From 3bdbf2be57564c902345ce036999ee779578e61e Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Wed, 27 Sep 2023 11:47:04 +1000 Subject: [PATCH] all logs send to elastic --- .../PARR.EsppTemplateSyncWorker.csproj | 1 + PARR.EsppTemplateSyncWorker/Program.cs | 10 +++- .../PARR.GeneratorTemplatesWorker.csproj | 1 + PARR.GeneratorTemplatesWorker/Program.cs | 55 ++++--------------- .../PARR.Worker/PARR.AIHITWorker.csproj | 1 + PARR.Worker/PARR.Worker/Program.cs | 10 +++- docker-compose.aihit-syncher.yml | 5 ++ docker-compose.espp-template-sync.yml | 5 ++ docker-compose.generator-templates.yml | 5 ++ 9 files changed, 44 insertions(+), 49 deletions(-) diff --git a/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj b/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj index 7a0396ba..59f92e7d 100644 --- a/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj +++ b/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj @@ -9,6 +9,7 @@ + diff --git a/PARR.EsppTemplateSyncWorker/Program.cs b/PARR.EsppTemplateSyncWorker/Program.cs index d499c455..5f071e17 100644 --- a/PARR.EsppTemplateSyncWorker/Program.cs +++ b/PARR.EsppTemplateSyncWorker/Program.cs @@ -1,3 +1,4 @@ +using Elastic.CommonSchema.Serilog; using PARR.EsppTemplateSync; using PARR.EsppTemplateSyncWorker; using Serilog; @@ -11,9 +12,12 @@ IHost host = Host.CreateDefaultBuilder(args) }) .UseSerilog((hostContext, services, config) => { - config - .WriteTo.Console() - .ReadFrom.Configuration(hostContext.Configuration); + if (hostContext.HostingEnvironment.IsProduction()) + config.WriteTo.Console(new EcsTextFormatter()); + else + config.WriteTo.Console(); + + config.ReadFrom.Configuration(hostContext.Configuration); }) .Build(); diff --git a/PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj b/PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj index aae195a0..f2fe1ed4 100644 --- a/PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj +++ b/PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj @@ -9,6 +9,7 @@ + diff --git a/PARR.GeneratorTemplatesWorker/Program.cs b/PARR.GeneratorTemplatesWorker/Program.cs index efa43ace..83bc1129 100644 --- a/PARR.GeneratorTemplatesWorker/Program.cs +++ b/PARR.GeneratorTemplatesWorker/Program.cs @@ -1,18 +1,24 @@ +using Elastic.CommonSchema.Serilog; using PARR.GeneratorTemplates; using PARR.GeneratorTemplatesWorker; using Serilog; - var builder = Host.CreateApplicationBuilder(); builder.Services.AddLogging(config => { config.ClearProviders(); - var logger = new LoggerConfiguration() - .WriteTo.Console() - .ReadFrom.Configuration(builder.Configuration) - .CreateLogger(); - config.AddSerilog(logger); + + var logger = new LoggerConfiguration(); + + if (builder.Environment.IsProduction()) + logger.WriteTo.Console(new EcsTextFormatter()); + else + logger.WriteTo.Console(); + + logger.ReadFrom.Configuration(builder.Configuration); + + config.AddSerilog(logger.CreateLogger()); }); builder.Services.InstallGeneratorTemplateServices(builder.Configuration); @@ -23,40 +29,3 @@ builder.Services.AddHostedService(); var host = builder.Build(); host.Run(); - - - - - - - - -//IHost host = Host.CreateDefaultBuilder(args) -// .ConfigureServices((hostContext, services) => -// { -// services.InstallGeneratorTemplateServices(hostContext.Configuration); -// //hostContext.Configuration.AddGeneratorTemplateConfigurations(services); -// //services.AddGeneratorTemplateSettings(hostContext.Configuration); - -// //services.AddHostedService(); -// }) -// .ConfigureAppConfiguration((hostContext, configBuilder) => -// { -// //TODO: !!!!!!!!!не смог прикрутить AddGeneratorTemplateConfigurations, не могу прокинуть туда сервисы -// configBuilder.AddGeneratorTemplateConfigurations(hostContext.Services); -// }) -// .ConfigureServices((hostContext, services) => -// { -// services.AddGeneratorTemplateSettings(hostContext.Configuration); - -// services.AddHostedService(); -// }) -// .UseSerilog((hostContext, services, config) => -// { -// config -// .WriteTo.Console() -// .ReadFrom.Configuration(hostContext.Configuration); -// }) -// .Build(); - -//host.Run(); diff --git a/PARR.Worker/PARR.Worker/PARR.AIHITWorker.csproj b/PARR.Worker/PARR.Worker/PARR.AIHITWorker.csproj index 8d361a46..9b6347fb 100644 --- a/PARR.Worker/PARR.Worker/PARR.AIHITWorker.csproj +++ b/PARR.Worker/PARR.Worker/PARR.AIHITWorker.csproj @@ -10,6 +10,7 @@ + diff --git a/PARR.Worker/PARR.Worker/Program.cs b/PARR.Worker/PARR.Worker/Program.cs index bdaf9c9b..2daa2dde 100644 --- a/PARR.Worker/PARR.Worker/Program.cs +++ b/PARR.Worker/PARR.Worker/Program.cs @@ -1,3 +1,4 @@ +using Elastic.CommonSchema.Serilog; using PARR.AIHIT; using PARR.Worker; using PARR.Worker.Settings; @@ -20,9 +21,12 @@ IHost host = Host.CreateDefaultBuilder(args) }) .UseSerilog((hostContext, services, config) => { - config - .WriteTo.Console() - .ReadFrom.Configuration(hostContext.Configuration); + if (hostContext.HostingEnvironment.IsProduction()) + config.WriteTo.Console(new EcsTextFormatter()); + else + config.WriteTo.Console(); + + config.ReadFrom.Configuration(hostContext.Configuration); }) .Build(); diff --git a/docker-compose.aihit-syncher.yml b/docker-compose.aihit-syncher.yml index 2df92237..b983f2e6 100644 --- a/docker-compose.aihit-syncher.yml +++ b/docker-compose.aihit-syncher.yml @@ -11,6 +11,11 @@ services: - TZ=Europe/Moscow volumes: - /var/log/parr-aihit-syncher:/app/log + logging: + river: fluentd + options: + fluentd-address: dvgd-mng-02.dvgd.oao.rzd:24224 + tag: parr.aihit-syncher.serilog # последняя версия diff --git a/docker-compose.espp-template-sync.yml b/docker-compose.espp-template-sync.yml index 640d7b7d..5ee564f9 100644 --- a/docker-compose.espp-template-sync.yml +++ b/docker-compose.espp-template-sync.yml @@ -13,6 +13,11 @@ services: #volumes: #- /var/log/parr-espp-template-sync:/app/log #- parr_storage_dev:/app/Data + logging: + river: fluentd + options: + fluentd-address: dvgd-mng-02.dvgd.oao.rzd:24224 + tag: parr.espp-template-sync.serilog deploy: replicas: 4 diff --git a/docker-compose.generator-templates.yml b/docker-compose.generator-templates.yml index e1a110e9..fadda1a5 100644 --- a/docker-compose.generator-templates.yml +++ b/docker-compose.generator-templates.yml @@ -7,5 +7,10 @@ services: environment: - ASPNETCORE_ENVIRONMENT=Production - TZ=Europe/Moscow + logging: + river: fluentd + options: + fluentd-address: dvgd-mng-02.dvgd.oao.rzd:24224 + tag: parr.generator-templates.serilog deploy: replicas: 1 \ No newline at end of file