diff --git a/.gitignore b/.gitignore index 832b9e4c..39c514f0 100644 --- a/.gitignore +++ b/.gitignore @@ -189,3 +189,7 @@ FakesAssemblies/ project.lock.json .vs + +# JetBrains Rider +.idea/ +*.sln.iml diff --git a/serilog-sinks-elasticsearch.sln b/serilog-sinks-elasticsearch.sln index a6711c5a..f88f093a 100644 --- a/serilog-sinks-elasticsearch.sln +++ b/serilog-sinks-elasticsearch.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26730.3 MinimumVisualStudioVersion = 10.0.40219.1 @@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.Elasticsearch EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Elasticsearch.Sample", "sample\Serilog.Sinks.Elasticsearch.Sample\Serilog.Sinks.Elasticsearch.Sample.csproj", "{253B37AB-D82E-4A5F-BA16-F1BE398818C8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Formatting.Elasticsearch", "src\Serilog.Formatting.Elasticsearch\Serilog.Formatting.Elasticsearch.csproj", "{0E6D34BF-322A-4803-94D1-355F6D5024BE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +41,10 @@ Global {253B37AB-D82E-4A5F-BA16-F1BE398818C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {253B37AB-D82E-4A5F-BA16-F1BE398818C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {253B37AB-D82E-4A5F-BA16-F1BE398818C8}.Release|Any CPU.Build.0 = Release|Any CPU + {0E6D34BF-322A-4803-94D1-355F6D5024BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E6D34BF-322A-4803-94D1-355F6D5024BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E6D34BF-322A-4803-94D1-355F6D5024BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E6D34BF-322A-4803-94D1-355F6D5024BE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/DefaultJsonFormatter.cs b/src/Serilog.Formatting.Elasticsearch/DefaultJsonFormatter.cs similarity index 99% rename from src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/DefaultJsonFormatter.cs rename to src/Serilog.Formatting.Elasticsearch/DefaultJsonFormatter.cs index 11301de6..d8cd8e3b 100644 --- a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/DefaultJsonFormatter.cs +++ b/src/Serilog.Formatting.Elasticsearch/DefaultJsonFormatter.cs @@ -1,4 +1,4 @@ -// Copyright 2013-2016 Serilog Contributors +// Copyright 2013-2016 Serilog Contributors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ using Serilog.Formatting.Json; using Serilog.Parsing; -namespace Serilog.Sinks.Elasticsearch +namespace Serilog.Formatting.Elasticsearch { /// /// Formats log events in a simple JSON structure. Instances of this class diff --git a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchJsonFormatter.cs b/src/Serilog.Formatting.Elasticsearch/ElasticsearchJsonFormatter.cs similarity index 99% rename from src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchJsonFormatter.cs rename to src/Serilog.Formatting.Elasticsearch/ElasticsearchJsonFormatter.cs index bd16bff9..1cbbed58 100644 --- a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchJsonFormatter.cs +++ b/src/Serilog.Formatting.Elasticsearch/ElasticsearchJsonFormatter.cs @@ -1,4 +1,4 @@ -// Copyright 2014 Serilog Contributors +// Copyright 2014 Serilog Contributors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ using Serilog.Events; using Serilog.Parsing; -namespace Serilog.Sinks.Elasticsearch +namespace Serilog.Formatting.Elasticsearch { /// /// Custom Json formatter that respects the configured property name handling and forces 'Timestamp' to @timestamp diff --git a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ExceptionAsObjectJsonFormatter.cs b/src/Serilog.Formatting.Elasticsearch/ExceptionAsObjectJsonFormatter.cs similarity index 97% rename from src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ExceptionAsObjectJsonFormatter.cs rename to src/Serilog.Formatting.Elasticsearch/ExceptionAsObjectJsonFormatter.cs index 770fb4da..6941a7b7 100644 --- a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ExceptionAsObjectJsonFormatter.cs +++ b/src/Serilog.Formatting.Elasticsearch/ExceptionAsObjectJsonFormatter.cs @@ -1,4 +1,4 @@ -// Copyright 2016 Serilog Contributors +// Copyright 2016 Serilog Contributors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ using System.IO; using Elasticsearch.Net; -namespace Serilog.Sinks.Elasticsearch +namespace Serilog.Formatting.Elasticsearch { /// /// A JSON formatter which plays nice with Kibana, diff --git a/src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.ElasticSearch.Symbols.nuspec b/src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.ElasticSearch.Symbols.nuspec new file mode 100644 index 00000000..7474618e --- /dev/null +++ b/src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.ElasticSearch.Symbols.nuspec @@ -0,0 +1,23 @@ + + + + Serilog.Formatting.Elasticsearch + $version$ + Michiel van Oudheusden, Martijn Laarman, Mogens Heller Grabe + The perfect way for .NET apps formatting structured log events to Elasticsearch JSON. + en-US + http://serilog.net + http://www.apache.org/licenses/LICENSE-2.0 + http://serilog.net/images/serilog-sink-nuget.png + serilog logging elasticsearch + + + + + + + + + + + diff --git a/src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.ElasticSearch.nuspec b/src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.ElasticSearch.nuspec new file mode 100644 index 00000000..85058759 --- /dev/null +++ b/src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.ElasticSearch.nuspec @@ -0,0 +1,21 @@ + + + + Serilog.Formatting.Elasticsearch + $version$ + Michiel van Oudheusden, Martijn Laarman, Mogens Heller Grabe, Konstantin Erman + The perfect way for .NET apps formatting structured log events to Elasticsearch JSON. + en-US + http://serilog.net + http://www.apache.org/licenses/LICENSE-2.0 + http://serilog.net/images/serilog-sink-nuget.png + + serilog logging elasticsearch + + + + + + + + diff --git a/src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.Elasticsearch.csproj b/src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.Elasticsearch.csproj new file mode 100644 index 00000000..a035170f --- /dev/null +++ b/src/Serilog.Formatting.Elasticsearch/Serilog.Formatting.Elasticsearch.csproj @@ -0,0 +1,45 @@ + + + + 6.0.0 + alpha + Michiel van Oudheusden, Martijn Laarman, Mogens Heller Grabe, Serilog Contributors + net45;netstandard1.3 + true + true + Serilog.Formatting.Elasticsearch + ../../assets/Serilog.snk + true + true + Serilog.Formatting.Elasticsearch + serilog;elasticsearch;logging;event;formatting + https://github.com/serilog/serilog-sinks-elasticsearch/blob/master/CHANGES.md + http://serilog.net/images/serilog-sink-nuget.png + https://github.com/serilog/serilog-sinks-elasticsearch + http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/serilog/serilog-sinks-elasticsearch + git + 1.6.0 + false + false + false + false + false + false + Serilog.Formatting.ElasticSearch + + + + + + + + + $(DefineConstants);DOTNETCORE;NO_SERIALIZATION + + + + + + + diff --git a/src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.Elasticsearch.csproj b/src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.Elasticsearch.csproj index d3418bbb..98baf4ff 100644 --- a/src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.Elasticsearch.csproj +++ b/src/Serilog.Sinks.Elasticsearch/Serilog.Sinks.Elasticsearch.csproj @@ -49,4 +49,8 @@ + + + + diff --git a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchSinkState.cs b/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchSinkState.cs index 2b277186..b011d3a5 100644 --- a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchSinkState.cs +++ b/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchSinkState.cs @@ -20,6 +20,7 @@ using Serilog.Debugging; using Serilog.Events; using Serilog.Formatting; +using Serilog.Formatting.ElasticSearch; namespace Serilog.Sinks.Elasticsearch { diff --git a/test/Serilog.Sinks.Elasticsearch.Tests/ElasticsearchJsonFormatterTests.cs b/test/Serilog.Sinks.Elasticsearch.Tests/ElasticsearchJsonFormatterTests.cs index 7b225884..d6a4026e 100644 --- a/test/Serilog.Sinks.Elasticsearch.Tests/ElasticsearchJsonFormatterTests.cs +++ b/test/Serilog.Sinks.Elasticsearch.Tests/ElasticsearchJsonFormatterTests.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using System.Text; +using Serilog.Formatting.ElasticSearch; using Xunit; namespace Serilog.Sinks.Elasticsearch.Tests diff --git a/test/Serilog.Sinks.Elasticsearch.Tests/ExceptionAsJsonObjectFormatterTests.cs b/test/Serilog.Sinks.Elasticsearch.Tests/ExceptionAsJsonObjectFormatterTests.cs index abdace81..00f07d99 100644 --- a/test/Serilog.Sinks.Elasticsearch.Tests/ExceptionAsJsonObjectFormatterTests.cs +++ b/test/Serilog.Sinks.Elasticsearch.Tests/ExceptionAsJsonObjectFormatterTests.cs @@ -6,6 +6,7 @@ using Newtonsoft.Json.Converters; using Xunit; using Serilog.Events; +using Serilog.Formatting.ElasticSearch; using Serilog.Parsing; using Serilog.Sinks.Elasticsearch.Tests.Domain; diff --git a/test/Serilog.Sinks.Elasticsearch.Tests/Serilog.Sinks.Elasticsearch.Tests.csproj b/test/Serilog.Sinks.Elasticsearch.Tests/Serilog.Sinks.Elasticsearch.Tests.csproj index 41920be0..4d04a29c 100644 --- a/test/Serilog.Sinks.Elasticsearch.Tests/Serilog.Sinks.Elasticsearch.Tests.csproj +++ b/test/Serilog.Sinks.Elasticsearch.Tests/Serilog.Sinks.Elasticsearch.Tests.csproj @@ -34,6 +34,7 @@ +