Write logs to elasticsearch.

8 years ago · 9cdea28495
28 changed files with 191 additions and 0 deletions
--- a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj
@ -15,6 +15,7 @@
    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
  </ItemGroup>

--- a/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs
@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;

 namespace AuthServer.Host
 {
@ -10,11 +12,26 @@ namespace AuthServer.Host
    {
        public static int Main(string[] args)
        {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
            Log.Logger = new LoggerConfiguration()
                .MinimumLevel.Debug()
                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "AuthServer")
                .Enrich.FromLogContext()
                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                .CreateLogger();

            try
--- a/samples/MicroserviceDemo/applications/AuthServer.Host/appsettings.json
+++ b/samples/MicroserviceDemo/applications/AuthServer.Host/appsettings.json
@ -2,6 +2,9 @@
  "ConnectionStrings": {
    "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
  },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
  "Redis": {
    "Configuration": "127.0.0.1"
  },
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj
@ -16,6 +16,7 @@
    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
  </ItemGroup>
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs
@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;

 namespace BackendAdminApp.Host
 {
@ -10,11 +12,26 @@ namespace BackendAdminApp.Host
    {
        public static int Main(string[] args)
        {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
            Log.Logger = new LoggerConfiguration()
                .MinimumLevel.Debug()
                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "BackendAdminApp")
                .Enrich.FromLogContext()
                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                .CreateLogger();

            try
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/appsettings.json
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/appsettings.json
@ -9,6 +9,9 @@
      "BaseUrl": "http://localhost:65115/"
    }
  },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
  "Redis": {
    "Configuration": "127.0.0.1"
  },
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs
@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;

 namespace PublicWebSite.Host
 {
@ -10,11 +12,26 @@ namespace PublicWebSite.Host
    {
        public static int Main(string[] args)
        {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
            Log.Logger = new LoggerConfiguration()
                .MinimumLevel.Debug()
                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "PublicWebSite")
                .Enrich.FromLogContext()
                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                .CreateLogger();

            try
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj
@ -16,6 +16,7 @@
    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
  </ItemGroup>

--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/appsettings.json
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/appsettings.json
@ -9,6 +9,9 @@
      "BaseUrl": "http://localhost:64897/"
    }
  },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
  "Redis": {
    "Configuration": "127.0.0.1"
  },
--- a/samples/MicroserviceDemo/docs/design/Overall.md
+++ b/samples/MicroserviceDemo/docs/design/Overall.md
@ -13,6 +13,8 @@ The goal of this work is to show how to create a complete microservice solution
 * [**Redis**](https://redis.io/) for distributed cache.
 * [**RabbitMQ**](https://www.rabbitmq.com/) for distributed messaging.
 * **[Serilog](https://serilog.net/)** for logging.
+* **[Elasticsearch](https://www.elastic.co/products/elasticsearch)** as log database.
+* **[Kibana](https://www.elastic.co/products/kibana)** as visualization tool (for logs in the Elasticsearch).

 ## Diagram

--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj
@ -15,6 +15,7 @@
    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
    <PackageReference Include="Ocelot" Version="13.0.0" />
    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs
@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;

 namespace BackendAdminAppGateway.Host
 {
@ -10,11 +12,26 @@ namespace BackendAdminAppGateway.Host
    {
        public static int Main(string[] args)
        {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
            Log.Logger = new LoggerConfiguration()
                .MinimumLevel.Debug()
                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "BackendAdminAppGateway")
                .Enrich.FromLogContext()
                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                .CreateLogger();

            try
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.json
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.json
@ -8,6 +8,9 @@
    "Authority": "http://localhost:64999",
    "ApiName": "BackendAdminAppGateway"
  },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
  "ConnectionStrings": {
    "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
  },
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj
@ -15,6 +15,7 @@
    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
    <PackageReference Include="Ocelot" Version="13.0.0" />
    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs
@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;

 namespace InternalGateway.Host
 {
@ -10,11 +12,26 @@ namespace InternalGateway.Host
    {
        public static int Main(string[] args)
        {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
            Log.Logger = new LoggerConfiguration()
                .MinimumLevel.Debug()
                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "InternalGateway")
                .Enrich.FromLogContext()
                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                .CreateLogger();

            try
--- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.json
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.json
@ -6,6 +6,9 @@
  "ConnectionStrings": {
    "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
  },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
  "Redis": {
    "Configuration": "127.0.0.1"
  },
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs
@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;

 namespace PublicWebSiteGateway.Host
 {
@ -10,11 +12,26 @@ namespace PublicWebSiteGateway.Host
    {
        public static int Main(string[] args)
        {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
            Log.Logger = new LoggerConfiguration()
                .MinimumLevel.Debug()
                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "PublicWebSiteGateway")
                .Enrich.FromLogContext()
                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                .CreateLogger();

            try
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj
@ -15,6 +15,7 @@
    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
    <PackageReference Include="Ocelot" Version="13.0.0" />
    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
--- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/appsettings.json
+++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/appsettings.json
@ -6,6 +6,9 @@
  "ConnectionStrings": {
    "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
  },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
  "Redis": {
    "Configuration": "127.0.0.1"
  },
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj
@ -15,6 +15,7 @@
    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs
@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;

 namespace BloggingService.Host
 {
@ -10,11 +12,26 @@ namespace BloggingService.Host
    {
        public static int Main(string[] args)
        {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
            Log.Logger = new LoggerConfiguration()
                .MinimumLevel.Debug()
                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "BloggingService")
                .Enrich.FromLogContext()
                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                .CreateLogger();

            try
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/appsettings.json
@ -22,6 +22,9 @@
      "Scope": "InternalGateway IdentityService"
    }
  },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
  "Redis": {
    "Configuration": "127.0.0.1"
  },
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj
@ -15,6 +15,7 @@
    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs
@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;

 namespace IdentityService.Host
 {
@ -10,11 +12,26 @@ namespace IdentityService.Host
    {
        public static int Main(string[] args)
        {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
            Log.Logger = new LoggerConfiguration()
                .MinimumLevel.Debug()
                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "IdentityService")
                .Enrich.FromLogContext()
                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                .CreateLogger();

            try
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/appsettings.json
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/appsettings.json
@ -6,6 +6,9 @@
  "ConnectionStrings": {
    "Default": "Server=localhost;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true"
  },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
  "Redis": {
    "Configuration": "127.0.0.1"
  },
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj
@ -15,6 +15,7 @@
    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs
@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.Elasticsearch;

 namespace ProductService.Host
 {
@ -10,11 +12,26 @@ namespace ProductService.Host
    {
        public static int Main(string[] args)
        {
+            //TODO: Temporary: it's not good to read appsettings.json here just to configure logging
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables()
+                .Build();
+
            Log.Logger = new LoggerConfiguration()
                .MinimumLevel.Debug()
                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.WithProperty("Application", "ProductService")
                .Enrich.FromLogContext()
                .WriteTo.File("Logs/logs.txt")
+                .WriteTo.Elasticsearch(
+                    new ElasticsearchSinkOptions(new Uri(configuration["ElasticSearch:Url"]))
+                    {
+                        AutoRegisterTemplate = true,
+                        AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
+                        IndexFormat = "msdemo-log-{0:yyyy.MM}"
+                    })
                .CreateLogger();

            try
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/appsettings.json
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/appsettings.json
@ -10,6 +10,9 @@
  "Redis": {
    "Configuration": "127.0.0.1"
  },
+  "ElasticSearch": {
+    "Url": "http://localhost:9200"
+  },
  "RabbitMQ": {
    "Connections": {
      "Default": {