From 41b8a6a192501c3563d6811fc538be7d576c1f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bahad=C4=B1r=20Yard=C4=B1m?= Date: Mon, 29 Nov 2021 13:01:30 +0300 Subject: [PATCH] Vault.Name renamed as Vault.TenantId in appsettings files and Logstash url typo fixed. --- src/Services/Basket/Basket.API/Program.cs | 2 +- src/Services/Basket/Basket.API/appsettings.json | 6 +++--- src/Services/Catalog/Catalog.API/Program.cs | 2 +- .../Catalog/Catalog.API/Properties/launchSettings.json | 2 +- src/Services/Catalog/Catalog.API/appsettings.json | 6 +++--- src/Services/Catalog/Catalog.API/web.config | 2 +- src/Services/Identity/Identity.API/Program.cs | 2 +- src/Services/Identity/Identity.API/appsettings.json | 4 ++-- src/Services/Ordering/Ordering.API/Program.cs | 2 +- src/Services/Ordering/Ordering.API/appsettings.json | 6 +++--- .../Extensions/CustomExtensionMethods.cs | 2 +- .../Ordering/Ordering.BackgroundTasks/appsettings.json | 2 +- src/Services/Ordering/Ordering.SignalrHub/Program.cs | 2 +- src/Services/Ordering/Ordering.SignalrHub/appsettings.json | 2 +- src/Services/Payment/Payment.API/Program.cs | 2 +- src/Services/Payment/Payment.API/appsettings.json | 2 +- src/Web/WebMVC/Program.cs | 2 +- src/Web/WebMVC/appsettings.json | 2 +- src/Web/WebStatus/Program.cs | 2 +- src/Web/WebStatus/appsettings.json | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index fd57afc82..88a827fa1 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -53,7 +53,7 @@ IWebHost BuildWebHost(IConfiguration configuration, string[] args) => Serilog.ILogger CreateSerilogLogger(IConfiguration configuration) { var seqServerUrl = configuration["Serilog:SeqServerUrl"]; - var logstashUrl = configuration["Serilog:LogstashgUrl"]; + var logstashUrl = configuration["Serilog:LogstashUrl"]; return new LoggerConfiguration() .MinimumLevel.Verbose() .Enrich.WithProperty("ApplicationContext", Program.AppName) diff --git a/src/Services/Basket/Basket.API/appsettings.json b/src/Services/Basket/Basket.API/appsettings.json index a5b723116..7432d0b91 100644 --- a/src/Services/Basket/Basket.API/appsettings.json +++ b/src/Services/Basket/Basket.API/appsettings.json @@ -1,7 +1,7 @@ { "Serilog": { "SeqServerUrl": null, - "LogstashgUrl": null, + "LogstashUrl": null, "MinimumLevel": { "Default": "Information", "Override": { @@ -23,8 +23,8 @@ "EventBusRetryCount": 5, "UseVault": false, "Vault": { - "Name": "eshop", - "ClientId": "your-clien-id", + "TenantId": "eshop", + "ClientId": "your-client-id", "ClientSecret": "your-client-secret" } } \ No newline at end of file diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs index e5ef82aff..7cfe269b9 100644 --- a/src/Services/Catalog/Catalog.API/Program.cs +++ b/src/Services/Catalog/Catalog.API/Program.cs @@ -59,7 +59,7 @@ IWebHost CreateHostBuilder(IConfiguration configuration, string[] args) => Serilog.ILogger CreateSerilogLogger(IConfiguration configuration) { var seqServerUrl = configuration["Serilog:SeqServerUrl"]; - var logstashUrl = configuration["Serilog:LogstashgUrl"]; + var logstashUrl = configuration["Serilog:LogstashUrl"]; return new LoggerConfiguration() .MinimumLevel.Verbose() .Enrich.WithProperty("ApplicationContext", Program.AppName) diff --git a/src/Services/Catalog/Catalog.API/Properties/launchSettings.json b/src/Services/Catalog/Catalog.API/Properties/launchSettings.json index a29630269..be83d8f0b 100644 --- a/src/Services/Catalog/Catalog.API/Properties/launchSettings.json +++ b/src/Services/Catalog/Catalog.API/Properties/launchSettings.json @@ -14,7 +14,7 @@ "launchUrl": "/swagger", "environmentVariables": { "ConnectionString": "server=localhost,5433;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word", - "Serilog:LogstashgUrl": "http://locahost:8080", + "Serilog:LogstashUrl": "http://locahost:8080", "ASPNETCORE_ENVIRONMENT": "Development", "EventBusConnection": "localhost", "Serilog:SeqServerUrl": "http://locahost:5340" diff --git a/src/Services/Catalog/Catalog.API/appsettings.json b/src/Services/Catalog/Catalog.API/appsettings.json index e9103c7a6..955600ead 100644 --- a/src/Services/Catalog/Catalog.API/appsettings.json +++ b/src/Services/Catalog/Catalog.API/appsettings.json @@ -2,7 +2,7 @@ "UseCustomizationData": false, "Serilog": { "SeqServerUrl": null, - "LogstashgUrl": null, + "LogstashUrl": null, "MinimumLevel": { "Default": "Information", "Override": { @@ -21,8 +21,8 @@ "EventBusRetryCount": 5, "UseVault": false, "Vault": { - "Name": "eshop", - "ClientId": "your-clien-id", + "TenantId": "eshop", + "ClientId": "your-client-id", "ClientSecret": "your-client-secret" } diff --git a/src/Services/Catalog/Catalog.API/web.config b/src/Services/Catalog/Catalog.API/web.config index 6da4550d8..8eb75a73a 100644 --- a/src/Services/Catalog/Catalog.API/web.config +++ b/src/Services/Catalog/Catalog.API/web.config @@ -8,7 +8,7 @@ - + diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index 7c021c7a4..a3d3ebf32 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -56,7 +56,7 @@ IWebHost BuildWebHost(IConfiguration configuration, string[] args) => Serilog.ILogger CreateSerilogLogger(IConfiguration configuration) { var seqServerUrl = configuration["Serilog:SeqServerUrl"]; - var logstashUrl = configuration["Serilog:LogstashgUrl"]; + var logstashUrl = configuration["Serilog:LogstashUrl"]; return new LoggerConfiguration() .MinimumLevel.Verbose() .Enrich.WithProperty("ApplicationContext", AppName) diff --git a/src/Services/Identity/Identity.API/appsettings.json b/src/Services/Identity/Identity.API/appsettings.json index 2c66caece..8da79fd0b 100644 --- a/src/Services/Identity/Identity.API/appsettings.json +++ b/src/Services/Identity/Identity.API/appsettings.json @@ -7,7 +7,7 @@ "UseCustomizationData": false, "Serilog": { "SeqServerUrl": null, - "LogstashgUrl": null, + "LogstashUrl": null, "MinimumLevel": { "Default": "Information", "Override": { @@ -22,7 +22,7 @@ }, "UseVault": false, "Vault": { - "Name": "eshop", + "TenantId": "eshop", "ClientId": "your-client-id", "ClientSecret": "your-client-secret" }, diff --git a/src/Services/Ordering/Ordering.API/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs index bc5223a24..0f8150ff5 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -61,7 +61,7 @@ IWebHost BuildWebHost(IConfiguration configuration, string[] args) => Serilog.ILogger CreateSerilogLogger(IConfiguration configuration) { var seqServerUrl = configuration["Serilog:SeqServerUrl"]; - var logstashUrl = configuration["Serilog:LogstashgUrl"]; + var logstashUrl = configuration["Serilog:LogstashUrl"]; return new LoggerConfiguration() .MinimumLevel.Verbose() .Enrich.WithProperty("ApplicationContext", Program.AppName) diff --git a/src/Services/Ordering/Ordering.API/appsettings.json b/src/Services/Ordering/Ordering.API/appsettings.json index 4ef8f6ac4..6c8ed19d6 100644 --- a/src/Services/Ordering/Ordering.API/appsettings.json +++ b/src/Services/Ordering/Ordering.API/appsettings.json @@ -4,7 +4,7 @@ "UseCustomizationData": false, "Serilog": { "SeqServerUrl": null, - "LogstashgUrl": null, + "LogstashUrl": null, "MinimumLevel": { "Default": "Information", "Override": { @@ -25,8 +25,8 @@ "EventBusConnection": "localhost", "UseVault": false, "Vault": { - "Name": "eshop", - "ClientId": "your-clien-id", + "TenantId": "eshop", + "ClientId": "your-client-id", "ClientSecret": "your-client-secret" } } diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs b/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs index b7164734e..b0c0a5de4 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs @@ -127,7 +127,7 @@ namespace Ordering.BackgroundTasks.Extensions public static ILoggingBuilder UseSerilog(this ILoggingBuilder builder, IConfiguration configuration) { var seqServerUrl = configuration["Serilog:SeqServerUrl"]; - var logstashUrl = configuration["Serilog:LogstashgUrl"]; + var logstashUrl = configuration["Serilog:LogstashUrl"]; Log.Logger = new LoggerConfiguration() .MinimumLevel.Verbose() diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/appsettings.json b/src/Services/Ordering/Ordering.BackgroundTasks/appsettings.json index 88e5d6858..a73abf5f5 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/appsettings.json +++ b/src/Services/Ordering/Ordering.BackgroundTasks/appsettings.json @@ -2,7 +2,7 @@ "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", "Serilog": { "SeqServerUrl": null, - "LogstashgUrl": null, + "LogstashUrl": null, "MinimumLevel": { "Default": "Information", "Override": { diff --git a/src/Services/Ordering/Ordering.SignalrHub/Program.cs b/src/Services/Ordering/Ordering.SignalrHub/Program.cs index b2ee22ff2..ae06d799e 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Program.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/Program.cs @@ -34,7 +34,7 @@ static IWebHost BuildWebHost(IConfiguration configuration, string[] args) => static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration) { var seqServerUrl = configuration["Serilog:SeqServerUrl"]; - var logstashUrl = configuration["Serilog:LogstashgUrl"]; + var logstashUrl = configuration["Serilog:LogstashUrl"]; return new LoggerConfiguration() .MinimumLevel.Verbose() .Enrich.WithProperty("ApplicationContext", Program.AppName) diff --git a/src/Services/Ordering/Ordering.SignalrHub/appsettings.json b/src/Services/Ordering/Ordering.SignalrHub/appsettings.json index e43c354a3..d952900fb 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/appsettings.json +++ b/src/Services/Ordering/Ordering.SignalrHub/appsettings.json @@ -2,7 +2,7 @@ "IdentityUrl": "http://localhost:5105", "Serilog": { "SeqServerUrl": null, - "LogstashgUrl": null, + "LogstashUrl": null, "MinimumLevel": { "Default": "Information", "Override": { diff --git a/src/Services/Payment/Payment.API/Program.cs b/src/Services/Payment/Payment.API/Program.cs index 6211f5d2f..f1554d0b7 100644 --- a/src/Services/Payment/Payment.API/Program.cs +++ b/src/Services/Payment/Payment.API/Program.cs @@ -35,7 +35,7 @@ IWebHost BuildWebHost(IConfiguration configuration, string[] args) => Serilog.ILogger CreateSerilogLogger(IConfiguration configuration) { var seqServerUrl = configuration["Serilog:SeqServerUrl"]; - var logstashUrl = configuration["Serilog:LogstashgUrl"]; + var logstashUrl = configuration["Serilog:LogstashUrl"]; return new LoggerConfiguration() .MinimumLevel.Verbose() .Enrich.WithProperty("ApplicationContext", Program.AppName) diff --git a/src/Services/Payment/Payment.API/appsettings.json b/src/Services/Payment/Payment.API/appsettings.json index 9964a8bd2..2b7a52756 100644 --- a/src/Services/Payment/Payment.API/appsettings.json +++ b/src/Services/Payment/Payment.API/appsettings.json @@ -1,7 +1,7 @@ { "Serilog": { "SeqServerUrl": null, - "LogstashgUrl": null, + "LogstashUrl": null, "MinimumLevel": { "Default": "Information", "Override": { diff --git a/src/Web/WebMVC/Program.cs b/src/Web/WebMVC/Program.cs index b5aad7856..cb8b43619 100644 --- a/src/Web/WebMVC/Program.cs +++ b/src/Web/WebMVC/Program.cs @@ -33,7 +33,7 @@ IWebHost BuildWebHost(IConfiguration configuration, string[] args) => Serilog.ILogger CreateSerilogLogger(IConfiguration configuration) { var seqServerUrl = configuration["Serilog:SeqServerUrl"]; - var logstashUrl = configuration["Serilog:LogstashgUrl"]; + var logstashUrl = configuration["Serilog:LogstashUrl"]; var cfg = new LoggerConfiguration() .ReadFrom.Configuration(configuration) .Enrich.WithProperty("ApplicationContext", Program.AppName) diff --git a/src/Web/WebMVC/appsettings.json b/src/Web/WebMVC/appsettings.json index 7c169c27c..41e5b5588 100644 --- a/src/Web/WebMVC/appsettings.json +++ b/src/Web/WebMVC/appsettings.json @@ -11,7 +11,7 @@ "UseCustomizationData": false, "Serilog": { "SeqServerUrl": null, - "LogstashgUrl": null, + "LogstashUrl": null, "MinimumLevel": { "Default": "Information" } diff --git a/src/Web/WebStatus/Program.cs b/src/Web/WebStatus/Program.cs index fdc5177b3..0f9c04730 100644 --- a/src/Web/WebStatus/Program.cs +++ b/src/Web/WebStatus/Program.cs @@ -36,7 +36,7 @@ IWebHost BuildWebHost(IConfiguration configuration, string[] args) => Serilog.ILogger CreateSerilogLogger(IConfiguration configuration) { var seqServerUrl = configuration["Serilog:SeqServerUrl"]; - var logstashUrl = configuration["Serilog:LogstashgUrl"]; + var logstashUrl = configuration["Serilog:LogstashUrl"]; return new LoggerConfiguration() .MinimumLevel.Verbose() .Enrich.WithProperty("ApplicationContext", Program.AppName) diff --git a/src/Web/WebStatus/appsettings.json b/src/Web/WebStatus/appsettings.json index a7b130e1a..12a54459d 100644 --- a/src/Web/WebStatus/appsettings.json +++ b/src/Web/WebStatus/appsettings.json @@ -1,7 +1,7 @@ { "Serilog": { "SeqServerUrl": null, - "LogstashgUrl": null, + "LogstashUrl": null, "MinimumLevel": { "Default": "Information", "Override": {