diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj b/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj
index 60b972cf6..659edc8cb 100644
--- a/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj
+++ b/src/ModularMonolith/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj
@@ -58,7 +58,6 @@
-
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/ElasticsearchOptions.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/ElasticsearchOptions.cs
deleted file mode 100644
index 1920340be..000000000
--- a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/ElasticsearchOptions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Serilog.Events;
-
-namespace ClassifiedAds.Infrastructure.Logging;
-
-public class ElasticsearchOptions
-{
- public bool IsEnabled { get; set; }
-
- public string Host { get; set; }
-
- public string IndexFormat { get; set; }
-
- public LogEventLevel MinimumLogEventLevel { get; set; }
-}
diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggerOptions.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggerOptions.cs
deleted file mode 100644
index 7424b7f8b..000000000
--- a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggerOptions.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace ClassifiedAds.Infrastructure.Logging;
-
-public class LoggerOptions
-{
- public FileOptions File { get; set; }
-
- public ElasticsearchOptions Elasticsearch { get; set; }
-}
diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs
index 50fe9e30c..d2ab3685c 100644
--- a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs
+++ b/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingExtensions.cs
@@ -8,9 +8,6 @@
using OpenTelemetry.Trace;
using Serilog;
using Serilog.Exceptions;
-using Serilog.Formatting.Json;
-using Serilog.Sinks.Elasticsearch;
-using Serilog.Sinks.File;
using System;
using System.Collections.Generic;
using System.IO;
@@ -43,8 +40,7 @@ private static void UseClassifiedAdsLogger(this IWebHostEnvironment env, Logging
.Enrich.WithExceptionDetails()
.Filter.ByIncludingOnly((logEvent) =>
{
- if (logEvent.Level >= options.File.MinimumLogEventLevel
- || logEvent.Level >= options.Elasticsearch.MinimumLogEventLevel)
+ if (logEvent.Level >= options.File.MinimumLogEventLevel)
{
var sourceContext = logEvent.Properties.ContainsKey("SourceContext")
? logEvent.Properties["SourceContext"].ToString()
@@ -65,22 +61,6 @@ private static void UseClassifiedAdsLogger(this IWebHostEnvironment env, Logging
outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] [{SourceContext}] [TraceId: {TraceId}] [MachineName: {MachineName}] [ProcessId: {ProcessId}] {Message:lj}{NewLine}{Exception}",
restrictedToMinimumLevel: options.File.MinimumLogEventLevel);
- if (options.Elasticsearch != null && options.Elasticsearch.IsEnabled)
- {
- loggerConfiguration = loggerConfiguration
- .WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri(options.Elasticsearch.Host))
- {
- MinimumLogEventLevel = options.Elasticsearch.MinimumLogEventLevel,
- AutoRegisterTemplate = true,
- AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
- IndexFormat = options.Elasticsearch.IndexFormat + "-{0:yyyy.MM.dd}",
- // BufferBaseFilename = Path.Combine(env.ContentRootPath, "logs", "buffer"),
- InlineFields = true,
- EmitEventFailure = EmitEventFailureHandling.WriteToFailureSink,
- FailureSink = new FileSink(Path.Combine(logsPath, "elasticsearch-failures.txt"), new JsonFormatter(), null),
- });
- }
-
Log.Logger = loggerConfiguration.CreateLogger();
}
@@ -102,12 +82,6 @@ private static LoggingOptions SetDefault(LoggingOptions options)
MinimumLogEventLevel = Serilog.Events.LogEventLevel.Warning,
};
- options.Elasticsearch ??= new ElasticsearchOptions
- {
- IsEnabled = false,
- MinimumLogEventLevel = Serilog.Events.LogEventLevel.Warning,
- };
-
options.EventLog ??= new EventLogOptions
{
IsEnabled = false,
@@ -258,8 +232,7 @@ private static void UseClassifiedAdsLogger(this IHostEnvironment env, LoggingOpt
.Enrich.WithExceptionDetails()
.Filter.ByIncludingOnly((logEvent) =>
{
- if (logEvent.Level >= options.File.MinimumLogEventLevel
- || logEvent.Level >= options.Elasticsearch.MinimumLogEventLevel)
+ if (logEvent.Level >= options.File.MinimumLogEventLevel)
{
var sourceContext = logEvent.Properties.ContainsKey("SourceContext")
? logEvent.Properties["SourceContext"].ToString()
@@ -280,22 +253,6 @@ private static void UseClassifiedAdsLogger(this IHostEnvironment env, LoggingOpt
outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] [{SourceContext}] [TraceId: {TraceId}] [MachineName: {MachineName}] [ProcessId: {ProcessId}] {Message:lj}{NewLine}{Exception}",
restrictedToMinimumLevel: options.File.MinimumLogEventLevel);
- if (options.Elasticsearch != null && options.Elasticsearch.IsEnabled)
- {
- loggerConfiguration = loggerConfiguration
- .WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri(options.Elasticsearch.Host))
- {
- MinimumLogEventLevel = options.Elasticsearch.MinimumLogEventLevel,
- AutoRegisterTemplate = true,
- AutoRegisterTemplateVersion = AutoRegisterTemplateVersion.ESv6,
- IndexFormat = options.Elasticsearch.IndexFormat + "-{0:yyyy.MM.dd}",
- // BufferBaseFilename = Path.Combine(env.ContentRootPath, "logs", "buffer"),
- InlineFields = true,
- EmitEventFailure = EmitEventFailureHandling.WriteToFailureSink,
- FailureSink = new FileSink(Path.Combine(logsPath, "elasticsearch-failures.txt"), new JsonFormatter(), null),
- });
- }
-
Log.Logger = loggerConfiguration.CreateLogger();
}
}
diff --git a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingOptions.cs b/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingOptions.cs
index 4134acd2b..9c64bfdcd 100644
--- a/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingOptions.cs
+++ b/src/ModularMonolith/ClassifiedAds.Infrastructure/Logging/LoggingOptions.cs
@@ -8,8 +8,6 @@ public class LoggingOptions
public FileOptions File { get; set; }
- public ElasticsearchOptions Elasticsearch { get; set; }
-
public EventLogOptions EventLog { get; set; }
public ApplicationInsightsOptions ApplicationInsights { get; set; }
diff --git a/src/ModularMonolith/ClassifiedAds.WebAPI/appsettings.json b/src/ModularMonolith/ClassifiedAds.WebAPI/appsettings.json
index d641594c3..333ba32fb 100644
--- a/src/ModularMonolith/ClassifiedAds.WebAPI/appsettings.json
+++ b/src/ModularMonolith/ClassifiedAds.WebAPI/appsettings.json
@@ -26,12 +26,6 @@
"File": {
"MinimumLogEventLevel": "Information"
},
- "Elasticsearch": {
- "IsEnabled": false,
- "Host": "http://localhost:9200",
- "IndexFormat": "classifiedads",
- "MinimumLogEventLevel": "Information"
- },
"EventLog": {
"IsEnabled": false,
"LogName": "Application",