Skip to content
This repository was archived by the owner on Jun 1, 2024. It is now read-only.

Commit dc39b86

Browse files
mivanomivano
committed
Merged dev
2 parents 069083a + 6b63825 commit dc39b86

File tree

57 files changed

+1414
-563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1414
-563
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ root=true
22

33
[*]
44
indent_style = space
5-
indent_size = 4
5+
indent_size = 4
6+
7+
[*.csproj]
8+
indent_size = 2

‎Build.ps1‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ echo "In directory: $PSScriptRoot"
22

33
$solution = "serilog-sinks-elasticsearch.sln"
44
$test = "test\\Serilog.Sinks.Elasticsearch.Tests\\Serilog.Sinks.Elasticsearch.Tests.csproj"
5+
$testIntegration = "test\\Serilog.Sinks.Elasticsearch.IntegrationTests\\Serilog.Sinks.Elasticsearch.IntegrationTests.csproj"
56
[string[]]$projects = @(
67
("src\\Serilog.Sinks.Elasticsearch\\Serilog.Sinks.Elasticsearch.csproj"),
78
("src\\Serilog.Formatting.Elasticsearch\\Serilog.Formatting.Elasticsearch.csproj")
@@ -22,6 +23,16 @@ function Invoke-Build()
2223
Write-Output "The tests failed"
2324
exit 1
2425
}
26+
27+
Write-Output "Running integration tests"
28+
# Tee-Object forces console redirection on vstest which magically makes Console.WriteLine works again.
29+
# This allows you to see the console out of Elastic.Xunit while its running
30+
& dotnet test $testIntegration -c Release | Tee-Object -Variable integ
31+
if($LASTEXITCODE -ne 0)
32+
{
33+
Write-Output "The integration tests failed"
34+
exit 1
35+
}
2536

2637
Write-Output "Creating packages"
2738
foreach ($project in $projects)

‎CHANGES.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## Changelog
22

3+
8.0
4+
* Adds Elasticsearch 7.0 support #256
5+
* Adds DetectElasticsearchVersion to the sink that will detect the running cluster version. Something we now use to support sending Esv6 templates to Elasticsearch 7.x and Esv7 templates to Elasticsearch 6.x which should simplify upgrades.
6+
* Adds an integration test project. Spins up a 6.x and 7.x elasticsearch single node cluster in succession and asserts the default and the mixed mode through DetectElasticsearchVersion works.
7+
* Dropped support for net45 and netstandard 1.3
8+
39
7.1
410
* DurableElasticsearchSink is rewritten to use the same base code as the sink for Serilog.Sinks.Seq. Nuget Serilog.Sinks.File is now used instead of deprecated Serilog.Sinks.RollingFile. Lots of new fintuning options for file storage is added in ElasticsearchSinkOptions. Updated Serilog.Sinks.Elasticsearch.Sample.Main with SetupLoggerWithPersistantStorage with all available options for durable mode.
511
* Changed datatype on singleEventSizePostingLimit from int to long? with default value null. to make it possible ro reuse code from Sinks.Seq .

‎GitVersion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
next-version: 7.0.0
1+
next-version: 8.0.0
22
branches: {}
33
ignore:
44
sha: []

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ The Serilog Elasticsearch sink project is a sink (basically a writer) for the Se
2929
* Automatically create the right mappings for the best usage of the log events in ES or automatically upload your own custom mapping.
3030
* Starting from version 3, compatible with Elasticsearch 2.
3131
* Version 6.x supports the new Elasticsearch.net version 6.x library.
32+
* From version 8.x there is support for Elasticsearch.net version 7.
33+
3234

3335
## Quick start
3436

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ only_commits:
1919
deploy:
2020
- provider: NuGet
2121
api_key:
22-
secure: bd9z4P73oltOXudAjPehwp9iDKsPtC+HbgshOrSgoyQKr5xVK+bxJQngrDJkHdY8
22+
secure: N59tiJECUYpip6tEn0xvdmDAEiP9SIzyLEFLpwiigm/8WhJvBNs13QxzT1/3/JW/
2323
on:
2424
branch: /^(master|dev)$/
2525
- provider: GitHub

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.4"
3+
"version": "2.1.500"
44
}
55
}

‎nuget.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@
1111
<clear />
1212
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
1313
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
14+
<add key="Elastic Abstractions CI" value="https://ci.appveyor.com/nuget/elasticsearch-net-abstractions" />
15+
<add key="Elastic Clients CI" value="https://ci.appveyor.com/nuget/elasticsearch-net" />
1416
</packageSources>
1517
</configuration>

‎sample/Serilog.Sinks.Elasticsearch.Sample/Serilog.Sinks.Elasticsearch.Sample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
1212
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
13-
<PackageReference Include="Serilog" Version="2.6.0" />
13+
<PackageReference Include="Serilog" Version="2.8.0" />
1414
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
1515
</ItemGroup>
1616

‎serilog-sinks-elasticsearch.sln‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{148431F6-5BA9-4987-80CF-DF9F23F54947}"
66
ProjectSection(SolutionItems) = preProject
77
.editorconfig = .editorconfig
8-
.gitattributes = .gitattributes
8+
.gitattributes = .gitattributes
99
.gitignore = .gitignore
1010
appveyor.yml = appveyor.yml
1111
Build.ps1 = Build.ps1
@@ -24,6 +24,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Elasticsearch
2424
EndProject
2525
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Formatting.Elasticsearch", "src\Serilog.Formatting.Elasticsearch\Serilog.Formatting.Elasticsearch.csproj", "{0E6D34BF-322A-4803-94D1-355F6D5024BE}"
2626
EndProject
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.Elasticsearch.IntegrationTests", "test\Serilog.Sinks.Elasticsearch.IntegrationTests\Serilog.Sinks.Elasticsearch.IntegrationTests.csproj", "{23BC3821-E028-48B4-8F2C-83BB1B8B5525}"
28+
EndProject
2729
Global
2830
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2931
Debug|Any CPU = Debug|Any CPU
@@ -46,6 +48,10 @@ Global
4648
{0E6D34BF-322A-4803-94D1-355F6D5024BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
4749
{0E6D34BF-322A-4803-94D1-355F6D5024BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
4850
{0E6D34BF-322A-4803-94D1-355F6D5024BE}.Release|Any CPU.Build.0 = Release|Any CPU
51+
{23BC3821-E028-48B4-8F2C-83BB1B8B5525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52+
{23BC3821-E028-48B4-8F2C-83BB1B8B5525}.Debug|Any CPU.Build.0 = Debug|Any CPU
53+
{23BC3821-E028-48B4-8F2C-83BB1B8B5525}.Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{23BC3821-E028-48B4-8F2C-83BB1B8B5525}.Release|Any CPU.Build.0 = Release|Any CPU
4955
EndGlobalSection
5056
GlobalSection(SolutionProperties) = preSolution
5157
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)