all logs send to elastic

PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />

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
+        if (hostContext.HostingEnvironment.IsProduction())
-            .WriteTo.Console()
+            config.WriteTo.Console(new EcsTextFormatter());
-            .ReadFrom.Configuration(hostContext.Configuration);
+        else
+            config.WriteTo.Console();
+
+        config.ReadFrom.Configuration(hostContext.Configuration);
     })
     .Build();
 

PARR.GeneratorTemplatesWorker/PARR.GeneratorTemplatesWorker.csproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />

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()
+    var logger = new LoggerConfiguration();
-                       .ReadFrom.Configuration(builder.Configuration)
+
-                       .CreateLogger();
+    if (builder.Environment.IsProduction())
-    config.AddSerilog(logger);
+        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<Worker>();
 
 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<Worker>();
-//    })
-//    .ConfigureAppConfiguration((hostContext, configBuilder) =>
-//    {
-//        //TODO: !!!!!!!!!не смог прикрутить AddGeneratorTemplateConfigurations, не могу прокинуть туда сервисы
-//        configBuilder.AddGeneratorTemplateConfigurations(hostContext.Services);
-//    })
-//    .ConfigureServices((hostContext, services) =>
-//    {
-//        services.AddGeneratorTemplateSettings(hostContext.Configuration);
-
-//        services.AddHostedService<Worker>();
-//    })
-//    .UseSerilog((hostContext, services, config) =>
-//    {
-//        config
-//            .WriteTo.Console()
-//            .ReadFrom.Configuration(hostContext.Configuration);
-//    })
-//    .Build();
-
-//host.Run();

PARR.Worker/PARR.Worker/PARR.AIHITWorker.csproj

@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />

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
+        if (hostContext.HostingEnvironment.IsProduction())
-            .WriteTo.Console()
+            config.WriteTo.Console(new EcsTextFormatter());
-            .ReadFrom.Configuration(hostContext.Configuration);
+        else
+            config.WriteTo.Console();
+
+        config.ReadFrom.Configuration(hostContext.Configuration);
     })
     .Build();
 

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
 
 
 # последняя версия

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
 

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