Merge pull request #103 from serilog/dev

3.0 Release

Author: merbla

.dockerignore

@@ -0,0 +1,2 @@
+bin\
+obj\

.gitignore

@@ -234,3 +234,9 @@ _Pvt_Extensions
 
 # FAKE - F# Make
 .fake/
+
+.vscode/
+
+sample/Sample/out/
+
+.DS_Store

CHANGES.md

@@ -1,3 +1,15 @@
+## 3.0.0
+- [#76](https://github.com/serilog/serilog-sinks-splunk/issues/76) Add strong naming/signing to `Serilog.Sinks.Splunk`.
+- [#88](https://github.com/serilog/serilog-sinks-splunk/issues/88) Split Sinks into separate packages for maintainability.
+- *NOTE* Breaking changes.  TCP & UDP Sinks moved to new packages
+    - Serilog.Sinks.Splunk (3.0.x)
+    - Serilog.Sinks.Splunk.TCP (1.0.x)
+    - Serilog.Sinks.Splunk.UDP (1.0.x)
+
+## 2.5.0
+- [#78](https://github.com/serilog/serilog-sinks-splunk/issues/78) Update `System.Net.Http` references to match other similar sinks.
+- [#79](https://github.com/serilog/serilog-sinks-splunk/issues/79) Addition of optional `LoggingLevelSwitch` param to EventCollector sink.
+
 ## 2.4.0
 - [#62](https://github.com/serilog/serilog-sinks-splunk/issues/62) Default fields added by Serilog to splunk
 - [#63](https://github.com/serilog/serilog-sinks-splunk/issues/63) Possible thread leak when ILogger instances are disposed

Dockerfile

@@ -0,0 +1,10 @@
+FROM microsoft/dotnet:2.1-sdk AS build
+ADD . / 
+WORKDIR /sample/Sample
+RUN dotnet restore
+RUN dotnet publish -c Release -o out -f netcoreapp2.0
+
+FROM microsoft/dotnet:2.1-runtime AS runtime
+WORKDIR /sample/Sample
+COPY --from=build /sample/Sample/out ./
+ENTRYPOINT ["dotnet", "Sample.dll"]

README.md

@@ -1,33 +1,67 @@
 # Serilog.Sinks.Splunk
 
-[![Build status](https://ci.appveyor.com/api/projects/status/yt40wg34t8oj61al?svg=true)](https://ci.appveyor.com/project/serilog/serilog-sinks-splunk) 
-[![NuGet Version](http://img.shields.io/nuget/v/Serilog.Sinks.Splunk.svg?style=flat)](https://www.nuget.org/packages/Serilog.Sinks.Splunk/)
+[![Build status](https://ci.appveyor.com/api/projects/status/yt40wg34t8oj61al?svg=true)](https://ci.appveyor.com/project/serilog/serilog-sinks-splunk) ![NuGet Version](https://buildstats.info/nuget/Serilog.Sinks.Splunk) 
  [![Join the chat at https://gitter.im/serilog/serilog](https://img.shields.io/gitter/room/serilog/serilog.svg)](https://gitter.im/serilog/serilog)
 
 A Serilog sink that writes events to the [Splunk](https://splunk.com). Supports .NET 4.5+, .NET Core, and platforms compatible with the [.NET Platform Standard](https://github.com/dotnet/corefx/blob/master/Documentation/architecture/net-platform-standard.md) 1.1 including Windows 8 & UWP, Windows Phone and Xamarin.
 
-[![Package Logo](http://serilog.net/images/serilog-sink-nuget.png)](http://nuget.org/packages/serilog.sinks.splunk)
+[![Package Logo](https://serilog.net/images/serilog-sink-nuget.png)](https://nuget.org/packages/serilog.sinks.splunk)
 
-**Package** - [Serilog.Sinks.Splunk](http://nuget.org/packages/serilog.sinks.splunk)
+**Package** - [Serilog.Sinks.Splunk](https://nuget.org/packages/serilog.sinks.splunk)
 
 ## Getting started
 
-To get started install the *Serilog.Sinks.Splunk* package from Visual Studio's *NuGet* console:
+To get started install the *Serilog.Sinks.Splunk* package:
 
 ```powershell
 PM> Install-Package Serilog.Sinks.Splunk
 ```
 
-Using the Event Collector (Splunk 6.3 and above)
+OR
 
-```csharp 
+```bash
+$ dotnet add package Serilog.Sinks.Splunk
+```
+
+If using the `TCP` or `UDP` sinks install the following packages
+
+* TCP: `Serilog.Sinks.Splunk.TCP`
+* UDP: `Serilog.Sinks.Splunk.UDP`
+
+To start using the Splunk Event Collector (Splunk 6.3 and above), logging can be setup as follows.
+
+```csharp
 var log = new LoggerConfiguration()
-     .WriteTo.EventCollector("https://mysplunk:8088/services/collector", "myeventcollectortoken")
+    .WriteTo.EventCollector("https://mysplunk:8088/services/collector", "myeventcollectortoken")
     .CreateLogger();
 ```
 
-More information is available on the [wiki](https://github.com/serilog/serilog-sinks-splunk/wiki).
+If using `appsettings.json` for configuration the following example illustrates using the Event Collector and Console sinks.
+
+```javascript
+{
+    "Serilog": {
+        "Using": ["Serilog.Sinks.Console", "Serilog.Sinks.Splunk"],
+        "MinimumLevel": "Information",
+        "WriteTo": [{
+                "Name": "Console"
+            },
+            {
+                "Name": "EventCollector",
+                "Args": {
+                    "splunkHost": "http://splunk:8088",
+                    "eventCollectorToken": "00112233-4455-6677-8899-AABBCCDDEEFF"
+                }
+            }
+        ],
+        "Properties": {
+            "Application": "Serilog Splunk Console Sample"
+        }
+    }
+}
+```
 
+More information about Serilog is available on the [wiki](https://github.com/serilog/serilog-sinks-splunk/wiki).
 ### Build status
 
 Branch  | AppVeyor | Travis

appveyor.yml

@@ -10,7 +10,7 @@ artifacts:
 deploy:
 - provider: NuGet
   api_key:
-    secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
+    secure: bd9z4P73oltOXudAjPehwp9iDKsPtC+HbgshOrSgoyQKr5xVK+bxJQngrDJkHdY8
   skip_symbols: true
   on:
     branch: /^(master|dev)$/

assets/CommonAssemblyInfo.cs

@@ -3,7 +3,8 @@ set -e
 dotnet --info
 dotnet restore
 
-for path in src/**/*.csproj; do
+# Until # 65 is addressed build only core package.  When available move to netstandard for all packages
+for path in src/**/Serilog.Sinks.Splunk.csproj; do
     dotnet build -f netstandard1.1 -c Release ${path}
     dotnet build -f netstandard1.3 -c Release ${path}
 done

build.sh

@@ -0,0 +1,17 @@
+version: '2'
+services:
+  splunk:
+    build: ./sample/splunk 
+    image: serilog-splunk
+    ports:
+      - 8000:8000
+      - 8088:8088
+      - 8089:8089
+    environment:
+      SPLUNK_START_ARGS: "--accept-license --answer-yes --seed-passwd changeme"
+      SPLUNK_USER: "root"
+  sampleconsoleapp:
+    depends_on:
+      - "splunk"
+    build: .
+    image: serilog-console-sample

docker-compose.yml

@@ -1,6 +1,2 @@
 #!/bin/bash
-sh build.sh
-
-cd sample
-dotnet run 15
-cd ..
+docker-compose up --build