From 00f5d9102a4e0aea571010833d0b2648e74f8536 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Wed, 27 Sep 2023 11:31:46 +1000 Subject: [PATCH] api log to elastic --- PARR.API/PARR.API.csproj | 1 + PARR.API/Program.cs | 10 +++++++--- PARR.API/appsettings.Development.json | 9 +++++++++ docker-compose.yml | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/PARR.API/PARR.API.csproj b/PARR.API/PARR.API.csproj index d1fd5b8d..34c9d712 100644 --- a/PARR.API/PARR.API.csproj +++ b/PARR.API/PARR.API.csproj @@ -19,6 +19,7 @@ + diff --git a/PARR.API/Program.cs b/PARR.API/Program.cs index 8f526c47..f5427ef5 100644 --- a/PARR.API/Program.cs +++ b/PARR.API/Program.cs @@ -1,3 +1,4 @@ +using Elastic.CommonSchema.Serilog; using FluentValidation; using PARR.API.Installers; using PARR.BLL; @@ -9,9 +10,12 @@ var builder = WebApplication.CreateBuilder(args); builder.Host.UseSerilog((context, config) => { - config - .WriteTo.Console() - .ReadFrom.Configuration(builder.Configuration); + if (context.HostingEnvironment.IsProduction()) + config.WriteTo.Console(new EcsTextFormatter()); + else + config.WriteTo.Console(); + + config.ReadFrom.Configuration(builder.Configuration); }); // Add services to the container. diff --git a/PARR.API/appsettings.Development.json b/PARR.API/appsettings.Development.json index 2efe829c..8fda1341 100644 --- a/PARR.API/appsettings.Development.json +++ b/PARR.API/appsettings.Development.json @@ -5,6 +5,15 @@ "Microsoft.AspNetCore": "Debug" } }, + "Serilog": { + "MinimumLevel": { + "Default": "Information", + "Override": { + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } + }, "StorageSettings": { "StoragePath": "W:\\" }, diff --git a/docker-compose.yml b/docker-compose.yml index 3c3dc3ba..3b54da15 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,11 @@ services: #volumes: #- /var/log/parr-api:/app/log #- parr_storage_dev:/app/Data + logging: + driver: fluentd + options: + fluentd-address: dvgd-mng-02.dvgd.oao.rzd:24224 + tag: parr.api.serilog deploy: replicas: 2