diff --git a/README.md b/README.md index b412781..8e717aa 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,18 @@ log4stash log4stash is a [log4net](http://logging.apache.org/log4net/) appender to log messages to the [ElasticSearch](http://www.elasticsearch.org) document database. ElasticSearch offers robust full-text search engine and analyzation so that errors and messages can be indexed quickly and searched easily. -log4stash provide few logging filters similar to the filters on [logstash](http://logstash.net). +log4stash provides a few logging filters similar to the filters on [logstash](http://logstash.net). The origin of log4stash is [@jptoto](https://github.com/jptoto)'s [log4net.ElasticSearch](https://github.com/jptoto/log4net.ElasticSearch) repository. +log4stash is based on RestSharp and Newtonsoft.Json but uses ILRepack to avoid nuget dependencies. + +**log4stash is fully open source, MIT licensed.** + ### Features: -* Supports .NET 4.0+ and .NET Core +* Supports .NET 4.5.2+ and .NET Core 2.0+ * Easy installation and setup via [Nuget](https://nuget.org/packages/log4stash/) -* Ability to analyze the log event before sending it to elasticsearch using built-in filters and custom filters similar to [logstash](http://logstash.net/docs/1.4.2/). +* Ability to analyze the log event before sending it to ElasticSearch using built-in filters and custom filters similar to [logstash](http://logstash.net/docs/1.4.2/). ### Breaking Changes: Navigate to breaking changes page [here](https://github.com/urielha/log4stash/blob/master/docs/breaking.md). See also [Version notes](https://github.com/urielha/log4stash/blob/master/docs/version_notes.md) page. @@ -37,7 +41,7 @@ I do my best to reply to issues or questions ASAP. Please use the [ISSUES](https ### Configuration Examples: -Almost all the parameters are optional, to see the default values check the [c'tor](https://github.com/urielha/log4stash/blob/master/src/log4stash/ElasticSearchAppender.cs#L52) of the appender and the c'tor of every filter. +Almost all the parameters are optional, to see the default values check the [c'tor](https://github.com/urielha/log4stash/blob/master/src/log4stash/ElasticSearchAppender.cs#L86) of the appender and the c'tor of every filter. You can also set any public property in the appender/filter which didn't appear in the example. ##### Simple configuration: @@ -55,144 +59,142 @@ You can also set any public property in the appender/filter which didn't appear ##### (Almost) Full configuration: ```xml - localhost - 9200 - - /es5 - log_test_%{+yyyy-MM-dd} - + localhost + 9200 + + /es5 + log_test_%{+yyyy-MM-dd} + LogEvent - 2000 - 10000 - False - IdSource - - - True + True + + + 10000 - - 10000 + + False + False - - - - _routing - %{RoutingSource} - - - _id - %{IdSource} - - - key - value - - - - - Partial - - - - - - - - - Username - Password - - - - Secret - AccessKey - Region - - - - - - aWQ6YXBpa2V5 - - id - apikey - - - - - - - - @type - Special - - - - - SmartValue - the type is %{@type} - - - - @type - - - - - SmartValue - SmartValue2 - - - - - JsonRaw - false - - _ - - - - - XmlRaw - false - - - - - Message - := - , - - - - Message - the message is %{WORD:Message} and guid %{UUID:the_guid} - true - - - - - someIds - - , - - - - - shouldBeString - - - - anotherIds - - - + + + _id + %{IdSource} + + + key + value + + + + + Partial + + + + + + + + + Username + Password + + + + Secret + AccessKey + Region + + + + + aWQ6YXBpa2V5 + + id + apikey + + + + + + + @type + Special + + + + + SmartValue + the type is %{@type} + + + + @type + + + + + SmartValue + SmartValue2 + + + + + JsonRaw + false + + _ + + + + + XmlRaw + false + + + + + Message + := + , + + + + Message + the message is %{WORD:Message} and guid %{UUID:the_guid} + true + + + + + someIds + + , + + + + + shouldBeString + + + + anotherIds + + + ``` @@ -215,7 +217,8 @@ The inspiration to the filters and style had taken from [elasticsearch/logstash] ### Build status: -The CI will be soon to Azure DevOps and will be tested against ElasticSearch 5,6,7 every time. +The CI will be move soon to Azure DevOps and will be tested against ElasticSearch 5,6,7 every time. +Support for lower ElasticSearch versions is no longer maintained. | Status | Provider | | ------ | -------- | @@ -237,6 +240,6 @@ The CI will be soon to Azure DevOps and will be tested against ElasticSearch 5,6 [docs-filters-remove]:https://github.com/urielha/log4stash/blob/master/docs/Filters/Remove.md [docs-filters-rename]:https://github.com/urielha/log4stash/blob/master/docs/Filters/Rename.md +[erangil2]:https://github.com/erangil2 [ignasv]:https://github.com/ignasv -[erangil]:https://github.com/erangil2 [mfpalladino]:https://github.com/mfpalladino diff --git a/docs/breaking.md b/docs/breaking.md index 0ee0cd1..b89bd92 100644 --- a/docs/breaking.md +++ b/docs/breaking.md @@ -8,6 +8,11 @@ description: List of breaking changes redirect_from: "/breaking/" --- --> +### __Upgrading to 3.0.0__ +* BasicAuthUsername and BasicAuthPassword no longer exists as parameters and now needs to be configured through an authentication method. +* DocumentIdSource no longer exists as a parameter and now needs to be configured through IndexOperationParams +* Stopped support of .net 4.0 + ### __Upgrading to 2.0.4__ BasicAuthUsername and BasicAuthPassword moved under AuthenticationMethod. diff --git a/docs/version_notes.md b/docs/version_notes.md index 00e60b5..d208762 100644 --- a/docs/version_notes.md +++ b/docs/version_notes.md @@ -8,6 +8,9 @@ description: List of version notes redirect_from: "/version_notes/" --- --> +### Versions 3.* +* :green_book: log4stash 3.0.0 targets .net standard natively, removed RestSharp dependency and added API Key authentication + ### Versions 2.* * :green_book: log4stash 2.0.4 has new filters see [filters section][filters-section] for more information. Added support for AWS Version 4 authorization header thanks to [@Marcelo Palladino][mfpalladino]. Support configuring multiple elastic nodes. Add document id source so you can decide your own doc id (instead of getting generated one from the elastic). Add Timeout option for requests. Many thanks to [@eran gil][erangil] for the efforts and the pull requests. diff --git a/log4stash.nuspec b/log4stash.nuspec index 4a0c749..0f11cdf 100644 --- a/log4stash.nuspec +++ b/log4stash.nuspec @@ -16,34 +16,27 @@ * Added option for API Key authentication with Elasticsearch - + * Targets .net standard natively Thanks a lot to @erangil2 for his tremendous contributions :) - And thanks to: @zhengziying, @triarc, @prime8, @henkish, @mfpalladino, @ignasv, @wpgh, @Thecentury, @pnumainville and @Aleksandre for their contributions. + And thanks to: @zhengziying, @triarc, @prime8, @henkish, @mfpalladino, @ignasv, @wpgh, @Thecentury, @pnumainville, @Aleksandre and @dannyyy for their contributions. - Copyright 2019 + Copyright 2020 log logging exception elasticsearch log4net appender logstash filters - - - - - - - + - - - - - + + + + diff --git a/pack-nuget.bat b/pack-nuget.bat deleted file mode 100644 index e0e187a..0000000 --- a/pack-nuget.bat +++ /dev/null @@ -1,12 +0,0 @@ -rmdir /S /Y bin -%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe src\log4stash.sln /t:Clean,Rebuild /p:Configuration=Release /fileLogger - -cd %~dp0src\log4stash.Tests\bin\Release -%~dp0src\packages\NUnit.ConsoleRunner.3.7.0\tools\nunit3-console.exe --noresult --labels=On log4stash.Tests.dll - -cd %~dp0 - -copy LICENSE bin -copy readme.txt bin - -src\.nuget\NuGet.exe pack log4stash.nuspec -Basepath bin diff --git a/readme.txt b/readme.txt index 7054cb8..baa3526 100644 --- a/readme.txt +++ b/readme.txt @@ -1,14 +1,13 @@ log4stash ===================== -Breaking chagens on 2.0.4 version: -BasicAuthUsername and BasicAuthPassword moved under AuthenticationMethod, see config example for more information. - -Breaking chagens on 2.0.0 version: -"log4net.ElasticSearch" --> "log4stash" +Breaking changes on 3.0.0 version: +BasicAuthUsername and BasicAuthPassword no longer exist as parameters and now needs to be configured through an authentication method. +DocumentIdSource no longer exists as a parameter and now needs to be configured through IndexOperationParams +Stopped support of .net 4.0 -The namespace "log4net.ElasticSearch" has been changed to "log4stash", -Please make sure to change it in your log4net configuration file and any other references. +Breaking changes on 2.0.4 version: +BasicAuthUsername and BasicAuthPassword moved under AuthenticationMethod, see config example for more information. For full details please check log4stash github page: https://github.com/urielha/log4stash/blob/master/docs/breaking.md \ No newline at end of file diff --git a/src/.ci/RunTests.sh b/src/.ci/RunTests.sh deleted file mode 100644 index 77d4589..0000000 --- a/src/.ci/RunTests.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - - -runTest(){ - mono src/packages/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe $@ - if [ $? -ne 0 ] - then - exit 1 - fi -} - -runTest src/log4stash.IntegrationTests/bin/Debug/log4stash.IntegrationTests.dll -runTest src/log4stash.UnitTests/bin/Debug/log4stash.UnitTests.dll - -exit $? diff --git a/src/.nuget/NuGet.Config b/src/.nuget/NuGet.Config index 6a318ad..3f0e003 100644 --- a/src/.nuget/NuGet.Config +++ b/src/.nuget/NuGet.Config @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe deleted file mode 100644 index ec1309c..0000000 Binary files a/src/.nuget/NuGet.exe and /dev/null differ diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets deleted file mode 100644 index 428c8da..0000000 --- a/src/.nuget/NuGet.targets +++ /dev/null @@ -1,144 +0,0 @@ - - - - $(MSBuildProjectDirectory)\..\ - - - false - - - false - - - true - - - false - - - - - - - - - - - $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) - - - - - $(SolutionDir).nuget - - - - $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config - $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config - - - - $(MSBuildProjectDirectory)\packages.config - $(PackagesProjectConfig) - - - - - $(NuGetToolsPath)\NuGet.exe - @(PackageSource) - - "$(NuGetExePath)" - mono --runtime=v4.0.30319 "$(NuGetExePath)" - - $(TargetDir.Trim('\\')) - - -RequireConsent - -NonInteractive - - "$(SolutionDir) " - "$(SolutionDir)" - - - $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) - $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols - - - - RestorePackages; - $(BuildDependsOn); - - - - - $(BuildDependsOn); - BuildPackage; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config deleted file mode 100644 index f4cdab0..0000000 --- a/src/.nuget/packages.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/es7_settings.runsettings b/src/es7_settings.runsettings new file mode 100644 index 0000000..7142b70 --- /dev/null +++ b/src/es7_settings.runsettings @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/log4stash.IntegrationTests.Es7/Properties/AssemblyInfo.cs b/src/log4stash.IntegrationTests.Es7/Properties/AssemblyInfo.cs deleted file mode 100644 index cf2c85f..0000000 --- a/src/log4stash.IntegrationTests.Es7/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using log4net.Config; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("log4stash.IntegrationTests.Es7")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("log4stash.IntegrationTests.Es7")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a3697ae9-8abf-43f7-b7ca-56292f50e143")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: XmlConfigurator(ConfigFile = "logConfig.xml", Watch = true)] diff --git a/src/log4stash.IntegrationTests.Es7/app.config b/src/log4stash.IntegrationTests.Es7/app.config deleted file mode 100644 index 7a071af..0000000 --- a/src/log4stash.IntegrationTests.Es7/app.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/log4stash.IntegrationTests.Es7/log4stash.IntegrationTests.Es7.csproj b/src/log4stash.IntegrationTests.Es7/log4stash.IntegrationTests.Es7.csproj deleted file mode 100644 index 68c67e5..0000000 --- a/src/log4stash.IntegrationTests.Es7/log4stash.IntegrationTests.Es7.csproj +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - Debug - AnyCPU - {A3697AE9-8ABF-43F7-B7CA-56292F50E143} - Library - Properties - log4stash.IntegrationTests.Es7 - log4stash.IntegrationTests.Es7 - v4.7 - 512 - true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Elasticsearch.Net.7.6.1\lib\net461\Elasticsearch.Net.dll - - - ..\packages\FluentAssertions.5.10.3\lib\net47\FluentAssertions.dll - - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\packages\NEST.7.6.1\lib\net461\Nest.dll - - - ..\packages\NEST.JsonNetSerializer.7.6.1\lib\net461\Nest.JsonNetSerializer.dll - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll - - - - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - - - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - - - - - - - - - - - - - PreserveNewest - - - - PreserveNewest - - - - - PreserveNewest - - - - - {22964cb0-8a39-41ea-807d-b5216d27df70} - log4stash - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/log4stash.IntegrationTests.Es7/packages.config b/src/log4stash.IntegrationTests.Es7/packages.config deleted file mode 100644 index a9e50e8..0000000 --- a/src/log4stash.IntegrationTests.Es7/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash.IntegrationTests.Es7/template.json b/src/log4stash.IntegrationTests.Es7/template.json deleted file mode 100644 index 422733d..0000000 --- a/src/log4stash.IntegrationTests.Es7/template.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "template" : "log_test_*", - "settings" : { - "number_of_shards" : 1 - }, - "mappings" : { - "_default_" : { - "_source" : { "enabled" : true }, - "dynamic_templates" : [ - { - "strings_match" : { - "match" : "*", - "match_mapping_type" : "string", - "mapping" : { - "type" : "string", - "index" : "not_analyzed" - } - } - } - ] - }, - - "LogEvent" : { - "_timestamp": { - "enabled": true, - "path": "@timestamp" - }, - - "properties" : { - "Message" : { - "type":"string", - "index": "analyzed" - }, - "@timestamp" : { - "type":"date" - } - } - } - } -} diff --git a/src/log4stash.IntegrationTests/ElasticSearchAppenderTests.cs b/src/log4stash.IntegrationTests/ElasticSearchAppenderTests.cs index 56b26c2..2f4c770 100644 --- a/src/log4stash.IntegrationTests/ElasticSearchAppenderTests.cs +++ b/src/log4stash.IntegrationTests/ElasticSearchAppenderTests.cs @@ -28,7 +28,8 @@ public void Can_create_an_event_from_log4net() Client.Indices.Refresh(TestIndex); - var searchResults = Client.Search(s => s.AllIndices().Query(q => q.Term("Message", "loggingtest"))); + var searchResults = + Client.Search(s => s.AllIndices().Query(q => q.Term("Message", "loggingtest"))); Assert.AreEqual(1, searchResults.Total); } @@ -37,24 +38,35 @@ public void Can_create_an_event_from_log4net() public void Log_With_Custom_Id() { string oldDocId = null; + const string idSource = "IdSource"; + const string idKey = "_id"; + const string idValue = "TEST_ID"; QueryConfiguration(appender => { - if(!appender.IndexOperationParams.TryGetValue("_id", out oldDocId)) + if (!appender.IndexOperationParams.TryGetValue(idKey, out oldDocId)) { oldDocId = null; } - appender.DocumentIdSource = "IdSource"; + + appender.IndexOperationParams.AddOrSetParameter(new IndexOperationParam(idKey, "%{" + idSource + "}")); }); - ThreadContext.Properties["IdSource"] = "TEST_ID"; + ThreadContext.Properties[idSource] = idValue; _log.Info("loggingtest"); Client.Indices.Refresh(TestIndex); - var searchResults = Client.Search(s => s.AllIndices().Query(q => q.Ids(descriptor => descriptor.Values("TEST_ID")))); - + var searchResults = Client.Search(s => + s.AllIndices().Query(q => q.Ids(descriptor => descriptor.Values(idValue)))); QueryConfiguration(appender => { - appender.DocumentIdSource = oldDocId; + if (oldDocId == null) + { + appender.IndexOperationParams.Remove(idKey); + } + else + { + appender.IndexOperationParams.AddOrSetParameter(new IndexOperationParam(idKey, oldDocId)); + } }); Assert.AreEqual(1, searchResults.Total); @@ -84,15 +96,13 @@ public void log_async_message() { break; } + Thread.Sleep(100); } - Assert.AreEqual(1, searchResults.Total); - QueryConfiguration(appender => - { - appender.IndexAsync = originIndexAsync; - }); + Assert.AreEqual(1, searchResults.Total); + QueryConfiguration(appender => { appender.IndexAsync = originIndexAsync; }); } [Test] @@ -105,7 +115,7 @@ public void Log_exception_string_without_object() ExceptionString = exceptionString, Level = Level.Error, Message = "loggingtest", - TimeStamp = DateTime.Now, + TimeStampUtc = DateTime.UtcNow, Domain = "Domain", }; var loggingEvent = new LoggingEvent(eventData); @@ -114,7 +124,8 @@ public void Log_exception_string_without_object() Client.Indices.Refresh(TestIndex); - var searchResults = Client.Search(s => s.AllIndices().Query(q => q.Term("Message", "loggingtest"))); + var searchResults = + Client.Search(s => s.AllIndices().Query(q => q.Term("Message", "loggingtest"))); Assert.AreEqual(1, searchResults.Total); var doc = searchResults.Documents.First(); @@ -128,7 +139,8 @@ public void Can_add_and_remove_smart_values() Client.Indices.Refresh(TestIndex); - var searchResults = Client.Search(s => s.AllIndices().Query(q => q.Term("Message", "loggingtest"))); + var searchResults = + Client.Search(s => s.AllIndices().Query(q => q.Term("Message", "loggingtest"))); Assert.AreEqual(1, searchResults.Total); var doc = searchResults.Documents.First(); @@ -146,7 +158,8 @@ public void Can_read_properties() _log.Info("loggingtest"); Client.Indices.Refresh(TestIndex); - var searchResults = Client.Search(s => s.AllIndices().Query(q => q.Term("Message", "loggingtest"))); + var searchResults = + Client.Search(s => s.AllIndices().Query(q => q.Term("Message", "loggingtest"))); Assert.AreEqual(1, searchResults.Total); var firstEntry = searchResults.Documents.First(); @@ -194,7 +207,7 @@ public void Property_with_null_value() [TestCase(new[] {";"}, new[] {"="}, "", true, TestName = "Can_read_KvFilter_properties: No whiteSpace on fieldSplit causes the 'another ' key and raise spaces issue" - )] + )] [TestCase(new[] {";"}, new[] {"="}, " ", false, TestName = "Can_read_KvFilter_properties: No whiteSpace but with trimming, fix the 'another' key")] [TestCase(new[] {"\\|", " "}, new[] {"\\>"}, "", false, @@ -208,7 +221,7 @@ public void Can_read_KvFilter_properties(string[] fieldSplit, string[] valueSpli { oldFilters = appender.ElasticFilters; var newFilters = new ElasticAppenderFilters(); - + newFilters.AddFilter(new KvFilter() { FieldSplit = string.Join("", fieldSplit), @@ -303,7 +316,7 @@ public void can_parse_log4net_context_stacks() var convert = new ConvertFilter(); convert.AddToString(sourceKey); - var toArray = new ConvertToArrayFilter { SourceKey = sourceKey }; + var toArray = new ConvertToArrayFilter {SourceKey = sourceKey}; convert.AddToArray(toArray); newFilters.AddConvert(convert); appender.ElasticFilters = newFilters; @@ -322,10 +335,7 @@ public void can_parse_log4net_context_stacks() Assert.AreEqual("name1", usrName[0].Value()); Assert.AreEqual("name2", usrName[1].Value()); - QueryConfiguration(appender => - { - appender.ElasticFilters = oldFilters; - }); + QueryConfiguration(appender => { appender.ElasticFilters = oldFilters; }); } [Test] @@ -340,13 +350,17 @@ public void parse_json_string_as_object(bool flatten, string separator = "_") { oldFilters = appender.ElasticFilters; var newFilters = new ElasticAppenderFilters(); - newFilters.AddFilter(new JsonFilter() { FlattenJson = flatten, Separator = separator, SourceKey = sourceKey }); + newFilters.AddFilter(new JsonFilter() + {FlattenJson = flatten, Separator = separator, SourceKey = sourceKey}); appender.ElasticFilters = newFilters; }); var jObject = new JObject { - { "key", "value\r\nnewline" }, - { "Data", new JObject{{"Type","Url"}, {"Host","localhost"}, { "Array", new JArray(Enumerable.Range(0, 5)) }} } + {"key", "value\r\nnewline"}, + { + "Data", + new JObject {{"Type", "Url"}, {"Host", "localhost"}, {"Array", new JArray(Enumerable.Range(0, 5))}} + } }; log4net.LogicalThreadContext.Properties[sourceKey] = jObject.ToString(); _log.Info("logging jsonObject"); @@ -355,10 +369,7 @@ public void parse_json_string_as_object(bool flatten, string separator = "_") var res = Client.Search(s => s.AllIndices().Take(1)); var doc = res.Documents.First(); - QueryConfiguration(appender => - { - appender.ElasticFilters = oldFilters; - }); + QueryConfiguration(appender => { appender.ElasticFilters = oldFilters; }); JToken actualObj; string key; @@ -384,6 +395,7 @@ public void parse_json_string_as_object(bool flatten, string separator = "_") dataArrayFirst = actualObj["Data"]["Array"][0].ToString(); dataArrayLast = actualObj["Data"]["Array"][4].ToString(); } + Assert.IsNotNull(actualObj); Assert.AreEqual("value\r\nnewline", key); Assert.AreEqual("Url", dataType); @@ -405,7 +417,8 @@ public void parse_xml_string_as_object(bool flatten) { oldFilters = appender.ElasticFilters; var newFilters = new ElasticAppenderFilters(); - newFilters.AddFilter(new XmlFilter { SourceKey = sourceKey, FlattenXml = flatten, Separator = separator }); + newFilters.AddFilter(new XmlFilter + {SourceKey = sourceKey, FlattenXml = flatten, Separator = separator}); appender.ElasticFilters = newFilters; }); @@ -433,17 +446,16 @@ public void parse_xml_string_as_object(bool flatten) var res = Client.Search(s => s.AllIndices().Take(1)); var doc = res.Documents.First(); - QueryConfiguration(appender => - { - appender.ElasticFilters = oldFilters; - }); + QueryConfiguration(appender => { appender.ElasticFilters = oldFilters; }); if (flatten) { Assert.NotNull(doc); Assert.AreEqual(doc["Parent" + separator + "@key"].ToString(), "value\r\nnewline"); - Assert.AreEqual(doc["Parent" + separator + "Child" + separator + "0" + separator + "@id"].ToString(), "0"); - Assert.AreEqual(doc["Parent" + separator + "Child" + separator + "1" + separator + "@id"].ToString(), "1"); + Assert.AreEqual(doc["Parent" + separator + "Child" + separator + "0" + separator + "@id"].ToString(), + "0"); + Assert.AreEqual(doc["Parent" + separator + "Child" + separator + "1" + separator + "@id"].ToString(), + "1"); } else { @@ -495,7 +507,7 @@ public void DropEventsOverBulkLimit() [Test] [NUnit.Framework.Ignore("the build agent have problems on running performance")] - public static void Performance() + public void Performance() { ElasticAppenderFilters oldFilters = null; QueryConfiguration(appender => @@ -504,7 +516,8 @@ public static void Performance() appender.BulkIdleTimeout = -1; oldFilters = appender.ElasticFilters; var newFilters = new ElasticAppenderFilters(); - newFilters.AddFilter(new GrokFilter() { Pattern = "testNum: {INT:testNum}, name is {WORD:name} and guid {UUID:guid}" }); + newFilters.AddFilter(new GrokFilter() + {Pattern = "testNum: {INT:testNum}, name is {WORD:name} and guid {UUID:guid}"}); appender.ElasticFilters = newFilters; }); @@ -539,6 +552,7 @@ public static void Test(int numberOfTasks, int numberOfCycles) int i1 = i; tasks.Add(Task.Run(() => Runner(i1, numberOfCycles))); } + Task.WaitAll(tasks.ToArray()); } @@ -550,10 +564,11 @@ private static void Runner(int t, int numberOfCycles) { Logger.InfoFormat("testNum: {0}, name is someName and guid {1}", i, Guid.NewGuid()); } + sw.Stop(); Console.WriteLine("Ellapsed: {0}, numPerSec: {1}", - sw.ElapsedMilliseconds, numberOfCycles / (sw.ElapsedMilliseconds / (double)1000)); + sw.ElapsedMilliseconds, numberOfCycles / (sw.ElapsedMilliseconds / (double) 1000)); } } @@ -576,4 +591,4 @@ public override string ToString() return _guid; } } -} +} \ No newline at end of file diff --git a/src/log4stash.IntegrationTests/Program.cs b/src/log4stash.IntegrationTests/Program.cs deleted file mode 100644 index cb3a1df..0000000 --- a/src/log4stash.IntegrationTests/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace log4stash.IntegrationTests -{ - public static class Program - { - public static void Main() - { - ElasticsearchAppenderTests.Performance(); - Console.ReadLine(); - } - } -} diff --git a/src/log4stash.IntegrationTests/Properties/AssemblyInfo.cs b/src/log4stash.IntegrationTests/Properties/AssemblyInfo.cs deleted file mode 100644 index a520cbe..0000000 --- a/src/log4stash.IntegrationTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using log4net.Config; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("log4stash.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("log4stash.Tests")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5b0b6737-b33b-436e-aeab-33f32554855b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: XmlConfigurator(ConfigFile = "logConfig.xml", Watch = true)] diff --git a/src/log4stash.IntegrationTests/README.txt b/src/log4stash.IntegrationTests/README.txt deleted file mode 100644 index dd322f9..0000000 --- a/src/log4stash.IntegrationTests/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -The log4stash test suite is a set of integration tests, meaning you should -have an instance of ElasticSearch installed in order to run them. - -You can always find the latest version at https://www.elastic.co/downloads/elasticsearch - diff --git a/src/log4stash.IntegrationTests/TestsSetup.cs b/src/log4stash.IntegrationTests/TestsSetup.cs index 4e2190d..085c81f 100644 --- a/src/log4stash.IntegrationTests/TestsSetup.cs +++ b/src/log4stash.IntegrationTests/TestsSetup.cs @@ -1,8 +1,10 @@ using System; +using System.IO; +using System.Reflection; using Elasticsearch.Net; using log4net; -using log4net.Appender; -using log4net.Repository.Hierarchy; +using log4net.Config; +using log4net.Repository; using Nest; using Nest.JsonNetSerializer; using NUnit.Framework; @@ -12,12 +14,17 @@ namespace log4stash.IntegrationTests public class TestsSetup { public IElasticClient Client; - public readonly string TestIndex = "log_test_" + DateTime.Now.ToString("yyyy-MM-dd"); + public readonly string TestIndex = "log_test_" + DateTime.Now.ToString("yyyy.MM.dd"); + private ILoggerRepository _repository; + [OneTimeSetUp] public void FixtureSetup() { + var configFile = TestContext.Parameters["configFile"]; + _repository = LogManager.GetRepository(Assembly.GetCallingAssembly()); + XmlConfigurator.Configure(_repository, new FileInfo(configFile)); string host = null; - int port = 0; + var port = 0; string path = null; QueryConfiguration(appender => { @@ -41,7 +48,8 @@ private IElasticsearchSerializer SourceSerializer(IElasticsearchSerializer built { return new JsonNetSerializer(builtin, values); } - + + [OneTimeTearDown] public void FixtureTearDown() { if (Client == null) return; @@ -57,7 +65,6 @@ public void FixtureTearDown() public void TestSetup() { FixtureTearDown(); - FixtureSetup(); QueryConfiguration(appender => { appender.BulkSize = 1; @@ -65,21 +72,17 @@ public void TestSetup() }); } - protected static void QueryConfiguration(Action action) + protected void QueryConfiguration(Action action) { - var hierarchy = LogManager.GetRepository() as Hierarchy; - if (hierarchy != null) + + if (_repository == null) return; + var appenders = _repository.GetAppenders(); + foreach (var appender in appenders) { - IAppender[] appenders = hierarchy.GetAppenders(); - foreach (IAppender appender in appenders) - { - var elsAppender = appender as ElasticSearchAppender; - if (elsAppender != null && action != null) - { - action(elsAppender); - elsAppender.ActivateOptions(); - } - } + var elsAppender = appender as ElasticSearchAppender; + if (elsAppender == null || action == null) continue; + action(elsAppender); + elsAppender.ActivateOptions(); } } } diff --git a/src/log4stash.IntegrationTests/app.config b/src/log4stash.IntegrationTests/app.config deleted file mode 100644 index 7a071af..0000000 --- a/src/log4stash.IntegrationTests/app.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/log4stash.IntegrationTests/log4stash.IntegrationTests.csproj b/src/log4stash.IntegrationTests/log4stash.IntegrationTests.csproj index 4a72875..e162385 100644 --- a/src/log4stash.IntegrationTests/log4stash.IntegrationTests.csproj +++ b/src/log4stash.IntegrationTests/log4stash.IntegrationTests.csproj @@ -1,145 +1,42 @@ - - - - + + - Debug - AnyCPU - {2F7D7AD4-2DA0-430A-9E90-9D0E398D590C} - Library - Properties - log4stash.IntegrationTests - log4stash.IntegrationTests - v4.7 - 512 - - - - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + netcoreapp2.1 + + false + + true + - - + bin + AnyCPU + - - ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - - ..\packages\Elasticsearch.Net.7.6.1\lib\net461\Elasticsearch.Net.dll - - - ..\packages\FluentAssertions.5.10.3\lib\net47\FluentAssertions.dll - - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\packages\NEST.7.6.1\lib\net461\Nest.dll - - - ..\packages\NEST.JsonNetSerializer.7.6.1\lib\net461\Nest.JsonNetSerializer.dll - - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NSubstitute.4.2.1\lib\net46\NSubstitute.dll - - - ..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll - - - ..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll - - - - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - - - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll - True - True - - - - - - + + + + + + + + - - - - + + - - PreserveNewest + + Always - - - - - PreserveNewest - - - - PreserveNewest + + Always + + + Always - - - - - - {22964cb0-8a39-41ea-807d-b5216d27df70} - log4stash - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - \ No newline at end of file + + diff --git a/src/log4stash.IntegrationTests/log4stash.IntegrationTests.props b/src/log4stash.IntegrationTests/log4stash.IntegrationTests.props deleted file mode 100644 index 16deb86..0000000 --- a/src/log4stash.IntegrationTests/log4stash.IntegrationTests.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/log4stash.IntegrationTests.Es7/logConfig.xml b/src/log4stash.IntegrationTests/logConfig.es7.xml similarity index 93% rename from src/log4stash.IntegrationTests.Es7/logConfig.xml rename to src/log4stash.IntegrationTests/logConfig.es7.xml index d65d56a..5b6382e 100644 --- a/src/log4stash.IntegrationTests.Es7/logConfig.xml +++ b/src/log4stash.IntegrationTests/logConfig.es7.xml @@ -10,7 +10,7 @@ -
localhost
+
127.0.0.1
9200 @@ -20,10 +20,6 @@ False <_fixedFields>Partial 5 - @type diff --git a/src/log4stash.IntegrationTests/logConfig.xml b/src/log4stash.IntegrationTests/logConfig.xml index 6215c44..51f7743 100644 --- a/src/log4stash.IntegrationTests/logConfig.xml +++ b/src/log4stash.IntegrationTests/logConfig.xml @@ -1,4 +1,4 @@ - +
@@ -10,7 +10,7 @@ -
localhost
+
127.0.0.1
9200 diff --git a/src/log4stash.IntegrationTests/packages.config b/src/log4stash.IntegrationTests/packages.config deleted file mode 100644 index e721b81..0000000 --- a/src/log4stash.IntegrationTests/packages.config +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash.IntegrationTests/template.json b/src/log4stash.IntegrationTests/template.json index 422733d..a34bd24 100644 --- a/src/log4stash.IntegrationTests/template.json +++ b/src/log4stash.IntegrationTests/template.json @@ -12,8 +12,7 @@ "match" : "*", "match_mapping_type" : "string", "mapping" : { - "type" : "string", - "index" : "not_analyzed" + "type" : "text" } } } @@ -21,15 +20,11 @@ }, "LogEvent" : { - "_timestamp": { - "enabled": true, - "path": "@timestamp" - }, + "properties" : { "Message" : { - "type":"string", - "index": "analyzed" + "type":"text" }, "@timestamp" : { "type":"date" diff --git a/src/log4stash.UnitTests/App.config b/src/log4stash.UnitTests/App.config deleted file mode 100644 index 8e15646..0000000 --- a/src/log4stash.UnitTests/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/log4stash.UnitTests/Program.cs b/src/log4stash.UnitTests/Program.cs deleted file mode 100644 index 7f962e2..0000000 --- a/src/log4stash.UnitTests/Program.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace log4stash.UnitTests -{ - class Program - { - static void Main(string[] args) - { - } - } -} diff --git a/src/log4stash.UnitTests/Properties/AssemblyInfo.cs b/src/log4stash.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 43886f8..0000000 --- a/src/log4stash.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("log4stash.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("log4stash.UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("14a81f04-bb13-490c-9cc0-b9ea8fcd8850")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/log4stash.UnitTests/log4stash.UnitTests.csproj b/src/log4stash.UnitTests/log4stash.UnitTests.csproj index 03f7004..9ac3ebd 100644 --- a/src/log4stash.UnitTests/log4stash.UnitTests.csproj +++ b/src/log4stash.UnitTests/log4stash.UnitTests.csproj @@ -1,110 +1,29 @@ - - - - + + - Debug - AnyCPU - {14A81F04-BB13-490C-9CC0-B9EA8FCD8850} - Library - log4stash.UnitTests - log4stash.UnitTests - v4.5 - 512 - true - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + netcoreapp2.1 + + false + - + bin + - - ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll - - - ..\packages\FluentAssertions.5.10.3\lib\net45\FluentAssertions.dll - - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NSubstitute.4.2.1\lib\net45\NSubstitute.dll - - - ..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll - - - ..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll - - - - - - ..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - + + + + + + + + + + - - {22964CB0-8A39-41EA-807D-B5216D27DF70} - log4stash - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file + + diff --git a/src/log4stash.UnitTests/packages.config b/src/log4stash.UnitTests/packages.config deleted file mode 100644 index e29f720..0000000 --- a/src/log4stash.UnitTests/packages.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash.net40/Properties/AssemblyInfo.cs b/src/log4stash.net40/Properties/AssemblyInfo.cs deleted file mode 100644 index b4aa277..0000000 --- a/src/log4stash.net40/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("log4stash.net40")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("log4stash.net40")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b203eca7-08ea-464d-bce0-ec2e526d8ad5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -//[assembly: AssemblyVersion("1.0.0.0")] -//[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/log4stash.net40/app.config b/src/log4stash.net40/app.config deleted file mode 100644 index 3c73782..0000000 --- a/src/log4stash.net40/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash.net40/log4stash.net40.csproj b/src/log4stash.net40/log4stash.net40.csproj deleted file mode 100644 index e957312..0000000 --- a/src/log4stash.net40/log4stash.net40.csproj +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - Debug - AnyCPU - {055FD962-C4DC-4E3C-BE56-E1E0EAA4ACCA} - Library - Properties - log4stash - log4stash - v4.0 - 512 - - ..\ - true - 8e6c23d3 - - - true - full - false - ..\..\bin\lib\net40\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\bin\lib\net40\ - TRACE - prompt - 4 - - - - ..\packages\log4net.2.0.8\lib\net40-full\log4net.dll - True - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll - - - ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll - - - - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll - - - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll - - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash.net40/packages.config b/src/log4stash.net40/packages.config deleted file mode 100644 index 22ed648..0000000 --- a/src/log4stash.net40/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash.netstandard/Properties/AssemblyInfo.cs b/src/log4stash.netstandard/Properties/AssemblyInfo.cs deleted file mode 100644 index b4aa277..0000000 --- a/src/log4stash.netstandard/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("log4stash.net40")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("log4stash.net40")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b203eca7-08ea-464d-bce0-ec2e526d8ad5")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -//[assembly: AssemblyVersion("1.0.0.0")] -//[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/log4stash.netstandard/app.config b/src/log4stash.netstandard/app.config deleted file mode 100644 index 3c73782..0000000 --- a/src/log4stash.netstandard/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash.netstandard/log4stash.netstandard.csproj b/src/log4stash.netstandard/log4stash.netstandard.csproj deleted file mode 100644 index fabcf79..0000000 --- a/src/log4stash.netstandard/log4stash.netstandard.csproj +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - Debug - AnyCPU - {F9DD323A-1EB7-404A-81FE-EE4FA711A483} - Library - Properties - log4stash - log4stash - netstandard2.0 - 512 - - ..\ - true - 8e6c23d3 - - - true - full - false - ..\..\bin\lib\netstandard2.0\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\bin\lib\netstandard2.0\ - TRACE - prompt - 4 - - - - ..\packages\log4net.2.0.8\lib\net40-full\log4net.dll - True - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - ..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll - True - - - ..\packages\RestSharp.105.2.3\lib\net4\RestSharp.dll - - - - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll - - - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll - - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash.netstandard/packages.config b/src/log4stash.netstandard/packages.config deleted file mode 100644 index 5240f4c..0000000 --- a/src/log4stash.netstandard/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash.sln b/src/log4stash.sln index 1569ff3..499d075 100644 --- a/src/log4stash.sln +++ b/src/log4stash.sln @@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29911.84 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4stash", "log4stash\log4stash.csproj", "{22964CB0-8A39-41EA-807D-B5216D27DF70}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4stash.IntegrationTests", "log4stash.IntegrationTests\log4stash.IntegrationTests.csproj", "{2F7D7AD4-2DA0-430A-9E90-9D0E398D590C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{462F257B-5EDE-4409-9982-AFA7B17BDFF8}" ProjectSection(SolutionItems) = preProject ..\log4stash.nuspec = ..\log4stash.nuspec @@ -17,20 +13,13 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A113BBCF-B1A1-4597-B7AD-0A58C882598A}" ProjectSection(SolutionItems) = preProject .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4stash.net40", "log4stash.net40\log4stash.net40.csproj", "{055FD962-C4DC-4E3C-BE56-E1E0EAA4ACCA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".ci", ".ci", "{DB38FCDE-D40E-4280-91D2-F46099B430F8}" - ProjectSection(SolutionItems) = preProject - .ci\RunTests.sh = .ci\RunTests.sh - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "log4stash", "log4stash\log4stash.csproj", "{4BFF06CA-BEF8-4EFD-845D-F3C6DDBE29D2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4stash.UnitTests", "log4stash.UnitTests\log4stash.UnitTests.csproj", "{14A81F04-BB13-490C-9CC0-B9EA8FCD8850}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "log4stash.UnitTests", "log4stash.UnitTests\log4stash.UnitTests.csproj", "{8DA5CE12-AFF2-4FEC-9A9B-3461A4655F41}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4stash.IntegrationTests.Es7", "log4stash.IntegrationTests.Es7\log4stash.IntegrationTests.Es7.csproj", "{A3697AE9-8ABF-43F7-B7CA-56292F50E143}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "log4stash.IntegrationTests", "log4stash.IntegrationTests\log4stash.IntegrationTests.csproj", "{8FBCBE4C-E840-45C3-A308-B3FD429FD8A6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -38,23 +27,16 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {22964CB0-8A39-41EA-807D-B5216D27DF70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22964CB0-8A39-41EA-807D-B5216D27DF70}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22964CB0-8A39-41EA-807D-B5216D27DF70}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22964CB0-8A39-41EA-807D-B5216D27DF70}.Release|Any CPU.Build.0 = Release|Any CPU - {2F7D7AD4-2DA0-430A-9E90-9D0E398D590C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F7D7AD4-2DA0-430A-9E90-9D0E398D590C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F7D7AD4-2DA0-430A-9E90-9D0E398D590C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {055FD962-C4DC-4E3C-BE56-E1E0EAA4ACCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {055FD962-C4DC-4E3C-BE56-E1E0EAA4ACCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {055FD962-C4DC-4E3C-BE56-E1E0EAA4ACCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {055FD962-C4DC-4E3C-BE56-E1E0EAA4ACCA}.Release|Any CPU.Build.0 = Release|Any CPU - {14A81F04-BB13-490C-9CC0-B9EA8FCD8850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14A81F04-BB13-490C-9CC0-B9EA8FCD8850}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14A81F04-BB13-490C-9CC0-B9EA8FCD8850}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3697AE9-8ABF-43F7-B7CA-56292F50E143}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3697AE9-8ABF-43F7-B7CA-56292F50E143}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3697AE9-8ABF-43F7-B7CA-56292F50E143}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4BFF06CA-BEF8-4EFD-845D-F3C6DDBE29D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4BFF06CA-BEF8-4EFD-845D-F3C6DDBE29D2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4BFF06CA-BEF8-4EFD-845D-F3C6DDBE29D2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4BFF06CA-BEF8-4EFD-845D-F3C6DDBE29D2}.Release|Any CPU.Build.0 = Release|Any CPU + {8DA5CE12-AFF2-4FEC-9A9B-3461A4655F41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8DA5CE12-AFF2-4FEC-9A9B-3461A4655F41}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8DA5CE12-AFF2-4FEC-9A9B-3461A4655F41}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8FBCBE4C-E840-45C3-A308-B3FD429FD8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8FBCBE4C-E840-45C3-A308-B3FD429FD8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8FBCBE4C-E840-45C3-A308-B3FD429FD8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/log4stash/AssemblyVersionInfo.cs b/src/log4stash/AssemblyVersionInfo.cs deleted file mode 100644 index aca56d6..0000000 --- a/src/log4stash/AssemblyVersionInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyVersion("1.0.0")] -[assembly: AssemblyFileVersion("2.2.0")] \ No newline at end of file diff --git a/src/log4stash/Configuration/IndexOperationParamsDictionary.cs b/src/log4stash/Configuration/IndexOperationParamsDictionary.cs index 9e5113b..853c879 100644 --- a/src/log4stash/Configuration/IndexOperationParamsDictionary.cs +++ b/src/log4stash/Configuration/IndexOperationParamsDictionary.cs @@ -13,7 +13,7 @@ public IndexOperationParamsDictionary() _parametersDictionary = new Dictionary(); } - public void AddParameter(IndexOperationParam parameter) + public void AddOrSetParameter(IndexOperationParam parameter) { _parametersDictionary[parameter.Key] = parameter.Value; } diff --git a/src/log4stash/ElasticSearchAppender.cs b/src/log4stash/ElasticSearchAppender.cs index ce6bf57..67da0d0 100644 --- a/src/log4stash/ElasticSearchAppender.cs +++ b/src/log4stash/ElasticSearchAppender.cs @@ -33,15 +33,6 @@ public class ElasticSearchAppender : AppenderSkeleton private readonly ITolerateCallsFactory _tolerateCallsFactory; - - [Obsolete] - public string DocumentIdSource - { - set - { - IndexOperationParams.AddParameter(new IndexOperationParam("_id", string.Format("{0}{1}{2}", "%{", value, "}" ))); - } - } public FixFlags FixedFields { get; set; } public bool SerializeObjects { get; set; } public IndexOperationParamsDictionary IndexOperationParams { get; set; } @@ -70,10 +61,6 @@ public int TolerateLogLogInSec public TemplateInfo Template { get; set; } public ElasticAppenderFilters ElasticFilters { get; set; } public bool DropEventsOverBulkLimit { get; set; } - [Obsolete] - public string BasicAuthUsername { get; set; } - [Obsolete] - public string BasicAuthPassword { get; set; } public string IndexName { @@ -133,8 +120,6 @@ public ElasticSearchAppender(IElasticClientFactory clientFactory, LogEventSmartF public override void ActivateOptions() { AddOptionalServer(); - CheckObsoleteAuth(); - _client = _elasticClientFactory.CreateClient(Servers, ElasticSearchTimeout, Ssl, AllowSelfSignedServerCert, AuthenticationMethod); _logEventConverter = _logEventConverterFactory.Create(FixedFields, SerializeObjects); @@ -164,15 +149,6 @@ private void AddOptionalServer() Servers.Add(serverData); } } - private void CheckObsoleteAuth() - { - if(!string.IsNullOrEmpty(BasicAuthUsername) && !string.IsNullOrEmpty(BasicAuthPassword)) - { - _eventWriter.Warn(GetType(), "BasicAuthUsername & BasicAuthPassword tags are obsolete, Please use AuthenticationMethod new tag"); - var auth = new BasicAuthenticationMethod { Username = BasicAuthUsername, Password = BasicAuthPassword }; - AuthenticationMethod.AddBasic(auth); - } - } /// /// On case of error or when the appender is closed before loading configuration change. diff --git a/src/log4stash/LogEvent/JsonSerializableExceptionFactory.cs b/src/log4stash/LogEvent/JsonSerializableExceptionFactory.cs index ca6decc..4bf6951 100644 --- a/src/log4stash/LogEvent/JsonSerializableExceptionFactory.cs +++ b/src/log4stash/LogEvent/JsonSerializableExceptionFactory.cs @@ -11,9 +11,7 @@ public JsonSerializableException Create(Exception exception) var serializable = new JsonSerializableException { -#if NET45 HResult = exception.HResult, -#endif Type = exception.GetType().FullName, Message = exception.Message, HelpLink = exception.HelpLink, diff --git a/src/log4stash/Properties/AssemblyInfo.cs b/src/log4stash/Properties/AssemblyInfo.cs deleted file mode 100644 index 0e829d1..0000000 --- a/src/log4stash/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("log4stash")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("log4stash")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ce605d60-aee6-4bd3-9843-5004e761969e")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -//[assembly: AssemblyVersion("0.3.1.0")] -//[assembly: AssemblyFileVersion("0.3.1.0")] diff --git a/src/log4stash/log4stash.csproj b/src/log4stash/log4stash.csproj index 0b622d9..3eaf758 100644 --- a/src/log4stash/log4stash.csproj +++ b/src/log4stash/log4stash.csproj @@ -1,155 +1,38 @@ - - - - + + - Debug - AnyCPU - {22964CB0-8A39-41EA-807D-B5216D27DF70} - Library - Properties - log4stash - log4stash - v4.5 - 512 - - ..\ - true - 2ba16708 + netstandard2.0;net452 + true - - true - full - false - ..\..\bin\lib\net45\ - TRACE;DEBUG;NET45 - prompt - 4 - false - - - pdbonly - true - ..\..\bin\lib\net45\ - TRACE - prompt - 4 - false - - - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - True - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + ..\..\bin\lib\ + 4 + AnyCPU - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file + + + + + + + + + + + + $(OutputPath) + + + + + + + + + + + + + + diff --git a/src/log4stash/log4stash.ilRepack.targets b/src/log4stash/log4stash.ilRepack.targets deleted file mode 100644 index 2efc7aa..0000000 --- a/src/log4stash/log4stash.ilRepack.targets +++ /dev/null @@ -1,24 +0,0 @@ - - - - - $(AssemblyName).dll - - - - - - - - - - - - "$(ILRepack)" -internalize -out:"$(OutputPath)$(PackedAssemblyName)" @(InputAssemblies->'"%(FullPath)"', ' ') - - - - - - - \ No newline at end of file diff --git a/src/log4stash/log4stash.props b/src/log4stash/log4stash.props deleted file mode 100644 index d7656ab..0000000 --- a/src/log4stash/log4stash.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/log4stash/packages.config b/src/log4stash/packages.config deleted file mode 100644 index 59a54ef..0000000 --- a/src/log4stash/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/regular_settings.runsettings b/src/regular_settings.runsettings new file mode 100644 index 0000000..ef7761d --- /dev/null +++ b/src/regular_settings.runsettings @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file