Merge pull request #210 from datalust/dev

2021.3.0 Release

Author: nblumhardt

Build.ps1

@@ -26,7 +26,7 @@ function Create-ArtifactDir
 
 function Publish-Archives($version)
 {
-	$rids = @("linux-x64", "linux-musl-x64", "osx-x64", "win-x64")
+	$rids = @("linux-x64", "linux-musl-x64", "linux-arm64", "osx-x64", "win-x64")
 	foreach ($rid in $rids) {
 	    $tfm = $framework
 	    if ($rid -eq "win-x64") {
@@ -61,6 +61,15 @@ function Publish-DotNetTool($version)
 {	
 	# Tool packages have to target a single non-platform-specific TFM; doing this here is cleaner than attempting it in the CSPROJ directly
 	dotnet pack ./src/SeqCli/SeqCli.csproj -c Release --output ./artifacts /p:VersionPrefix=$version /p:TargetFramework=$framework /p:TargetFrameworks=
+    if($LASTEXITCODE -ne 0) { exit 7 }
+}
+
+function Publish-Docs($version)
+{
+    Write-Output "Generating markdown documentation"
+
+    & dotnet run --project ./src/SeqCli/SeqCli.csproj -f $framework -- help --markdown > ./artifacts/seqcli-$version.md
+    if($LASTEXITCODE -ne 0) { exit 8 }
 }
 
 Push-Location $PSScriptRoot
@@ -74,5 +83,6 @@ Restore-Packages
 Publish-Archives($version)
 Publish-DotNetTool($version)
 Execute-Tests
+Publish-Docs($version)
 
 Pop-Location

README.md

@@ -1,4 +1,4 @@
-version: 2021.2.{build}
+version: 2021.3.{build}
 skip_tags: true
 image:
 - Visual Studio 2019
@@ -13,6 +13,7 @@ artifacts:
 - path: artifacts/seqcli-*.zip
 - path: artifacts/seqcli-*.tar.gz
 - path: artifacts/seqcli.*.nupkg
+- path: artifacts/seqcli-*.md
 
 for:
 -

appveyor.yml

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "5.0.100"
+    "version": "5.0.400"
   }
-}
+}

global.json

@@ -4,6 +4,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=appinstances/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=BASEURI/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Camelize/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ceci/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cmds/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=command_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Datalust/@EntryIndexedValue">True</s:Boolean>
@@ -14,13 +15,15 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gravatar/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hackily/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=n_0027est/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=retentionpolicies/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=retentionpolicy/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=roastery/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=seqcli/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=serilogdt/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=sqlqueries/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=sqlquery/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=STDIN/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=STORAGEPATH/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=subcommand/@EntryIndexedValue">True</s:Boolean>

seqcli.sln.DotSettings

@@ -51,11 +51,16 @@ protected T Enable<T>(T t)
 
         public void PrintUsage()
         {
-            if (Options.Any())
+            var allOptions = new OptionSet();
+            foreach (var option in Options)
             {
-                Console.Error.WriteLine("Arguments:");
-                Options.WriteOptionDescriptions(Console.Error);
+                allOptions.Add(option);
             }
+
+            allOptions.Add("v|verbose", "Print verbose output to `STDERR`", _ => { });
+
+            Console.Error.WriteLine("Arguments:");
+            allOptions.WriteOptionDescriptions(Console.Error);
         }
 
         public async Task<int> Invoke(string[] args)

src/SeqCli/Cli/Command.cs

@@ -18,6 +18,10 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Autofac.Features.Metadata;
+using Serilog.Core;
+using Serilog.Events;
+
+#nullable enable
 
 namespace SeqCli.Cli
 {
@@ -30,10 +34,10 @@ public CommandLineHost(IEnumerable<Meta<Lazy<Command>, CommandMetadata>> availab
             _availableCommands = availableCommands.ToList();
         }
 
-        public async Task<int> Run(string[] args)
+        public async Task<int> Run(string[] args, LoggingLevelSwitch levelSwitch)
         {
             var ea = Assembly.GetEntryAssembly();
-            var name = ea.GetName().Name;
+            var name = ea!.GetName().Name;
 
             if (args.Length > 0)
             {
@@ -46,7 +50,16 @@ public async Task<int> Run(string[] args)
                 if (cmd != null)
                 {
                     var amountToSkip = cmd.Metadata.SubCommand == null ? 1 : 2;
-                    return await cmd.Value.Value.Invoke(args.Skip(amountToSkip).ToArray());
+                    var commandSpecificArgs = args.Skip(amountToSkip).ToArray();
+                    
+                    var verboseArg = commandSpecificArgs.FirstOrDefault(arg => arg is "-v" or "--verbose");
+                    if (verboseArg != null)
+                    {
+                        levelSwitch.MinimumLevel = LogEventLevel.Information;
+                        commandSpecificArgs = commandSpecificArgs.Where(arg => arg != verboseArg).ToArray();
+                    }
+
+                    return await cmd.Value.Value.Invoke(commandSpecificArgs);
                 }
             }
 

src/SeqCli/Cli/CommandLineHost.cs

@@ -16,7 +16,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Seq.Api;
-using Seq.Api.Model.Inputs;
 using Seq.Api.Model.LogEvents;
 using Seq.Api.Model.Security;
 using Seq.Api.Model.Shared;
@@ -108,7 +107,7 @@ protected override async Task<int> Run()
 
             apiKey.Title = _title;
             apiKey.InputSettings.AppliedProperties = _properties.Properties
-                .Select(kvp => new InputAppliedPropertyPart {Name = kvp.Key, Value = kvp.Value})
+                .Select(kvp => new EventPropertyPart(kvp.Key, kvp.Value))
                 .ToList();
             apiKey.InputSettings.UseServerTimestamps = _useServerTimestamps;
 

src/SeqCli/Cli/Commands/ApiKey/CreateCommand.cs

@@ -16,7 +16,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
-using Seq.Api.Model.Monitoring;
+using Seq.Api.Model.Dashboarding;
 using Seq.Api.Model.Signals;
 using SeqCli.Cli.Features;
 using SeqCli.Config;

src/SeqCli/Cli/Commands/Dashboard/RenderCommand.cs

@@ -46,7 +46,7 @@ class IngestCommand : Command
         public IngestCommand(SeqConnectionFactory connectionFactory)
         {
             _connectionFactory = connectionFactory;
-            _fileInputFeature = Enable(new FileInputFeature("File to ingest", supportsWildcard: true));
+            _fileInputFeature = Enable(new FileInputFeature("File(s) to ingest", supportsWildcard: true));
             _invalidDataHandlingFeature = Enable<InvalidDataHandlingFeature>();
             _properties = Enable<PropertiesFeature>();