Merge pull request #110 from datalust/dev

2022.1 Release

Author: nblumhardt

appveyor.yml

@@ -1,6 +1,6 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2019
+image: Visual Studio 2022
 build_script:
 - ps: ./Build.ps1
 test: off

src/Seq.Api/Client/SeqApiClient.cs

@@ -35,20 +35,22 @@ namespace Seq.Api.Client
     /// <summary>
     /// A low-level client that provides navigation over the linked resource structure of the Seq HTTP API.
     /// </summary>
-    public class SeqApiClient : IDisposable
+    public sealed class SeqApiClient : IDisposable
     {
         readonly string _apiKey;
 
-        // Future versions of Seq may not completely support v1 features, however
+        // Future versions of Seq may not completely support vN-1 features, however
         // providing this as an Accept header will ensure what compatibility is available
         // can be utilized.
-        const string SeqApiV8MediaType = "application/vnd.datalust.seq.v8+json";
+        const string SeqApiV9MediaType = "application/vnd.datalust.seq.v9+json";
 
-        readonly CookieContainer _cookies = new CookieContainer();
+        readonly CookieContainer _cookies = new();
         readonly JsonSerializer _serializer = JsonSerializer.Create(
             new JsonSerializerSettings
             {
-                Converters = { new StringEnumConverter(), new LinkCollectionConverter() }
+                Converters = { new StringEnumConverter(), new LinkCollectionConverter() },
+                DateParseHandling = DateParseHandling.None,
+                FloatParseHandling = FloatParseHandling.Decimal
             });
 
         /// <summary>
@@ -89,7 +91,7 @@ public SeqApiClient(string serverUrl, string apiKey = null, Action<HttpClientHan
                 baseAddress += "/";
 
             HttpClient = new HttpClient(handler) { BaseAddress = new Uri(baseAddress) };
-            HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(SeqApiV8MediaType));
+            HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(SeqApiV9MediaType));
 
             if (_apiKey != null)
                 HttpClient.DefaultRequestHeaders.Add("X-Seq-ApiKey", _apiKey);
@@ -175,8 +177,8 @@ public async Task PostAsync<TEntity>(ILinked entity, string link, TEntity conten
             var linkUri = ResolveLink(entity, link, parameters);
             var request = new HttpRequestMessage(HttpMethod.Post, linkUri) { Content = MakeJsonContent(content) };
             var stream = await HttpSendAsync(request, cancellationToken).ConfigureAwait(false);
-            using (var reader = new StreamReader(stream))
-                reader.ReadToEnd();
+            using var reader = new StreamReader(stream);
+            await reader.ReadToEndAsync();
         }
 
         /// <summary>
@@ -213,8 +215,8 @@ public async Task<string> PostReadStringAsync<TEntity>(ILinked entity, string li
             var linkUri = ResolveLink(entity, link, parameters);
             var request = new HttpRequestMessage(HttpMethod.Post, linkUri) { Content = MakeJsonContent(content) };
             var stream = await HttpSendAsync(request, cancellationToken).ConfigureAwait(false);
-            using (var reader = new StreamReader(stream))
-                return await reader.ReadToEndAsync();
+            using var reader = new StreamReader(stream);
+            return await reader.ReadToEndAsync();
         }
 
         /// <summary>

src/Seq.Api/Model/Alerting/AlertEntity.cs

@@ -42,7 +42,7 @@ public class AlertEntity : Entity
         public string OwnerId { get; set; }
 
         /// <summary>
-        /// If <c>true</c>, the alert can only be modified by users with the <see cref="Permission.Setup"/> permission.
+        /// If <c>true</c>, the alert can only be modified by users with the <see cref="Permission.Project"/> permission.
         /// </summary>
         public bool IsProtected { get; set; }
 

src/Seq.Api/Model/AppInstances/AppInstanceEntity.cs

@@ -20,6 +20,8 @@
 using Seq.Api.Model.Signals;
 using Seq.Api.ResourceGroups;
 
+#nullable enable
+
 namespace Seq.Api.Model.AppInstances
 {
     /// <summary>
@@ -49,17 +51,17 @@ public AppInstanceEntity()
         /// <summary>
         /// The id of the <see cref="AppEntity"/> that this is an instance of.
         /// </summary>
-        public string AppId { get; set; }
+        public string? AppId { get; set; }
 
         /// <summary>
         /// The user-friendly title of the app instance.
         /// </summary>
-        public string Title { get; set; }
+        public string? Title { get; set; }
 
         /// <summary>
         /// Values for the settings exposed by the app.
         /// </summary>
-        public Dictionary<string, string> Settings { get; set; }
+        public Dictionary<string, string>? Settings { get; set; }
 
         /// <summary>
         /// If <c>true</c>, administrative users may invoke the app manually or through alerts.
@@ -77,13 +79,13 @@ public AppInstanceEntity()
         /// The settings that can be overridden at invocation time (when an event is sent to
         /// the instance).
         /// </summary>
-        public List<string> InvocationOverridableSettings { get; set; }
+        public List<string>? InvocationOverridableSettings { get; set; }
 
         /// <summary>
         /// Metadata describing the overridable settings. This field is provided by the server
         /// and cannot be modified.
         /// </summary>
-        public List<AppSettingPart> InvocationOverridableSettingDefinitions { get; set; }
+        public List<AppSettingPart>? InvocationOverridableSettingDefinitions { get; set; }
 
         /// <summary>
         /// If <c>true</c>, events will be streamed to the app. Otherwise, events will be
@@ -95,7 +97,7 @@ public AppInstanceEntity()
         /// The signal expression describing which events will be sent to the app; if <c>null</c>,
         /// all events will reach the app.
         /// </summary>
-        public SignalExpressionPart StreamedSignalExpression { get; set; }
+        public SignalExpressionPart? StreamedSignalExpression { get; set; }
 
         /// <summary>
         /// If a value is specified, events will be buffered to disk and sorted by timestamp-order
@@ -121,31 +123,31 @@ public AppInstanceEntity()
         /// Settings that control how events are ingested through the app.
         /// </summary>
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public InputSettingsPart InputSettings { get; set; }
+        public InputSettingsPart? InputSettings { get; set; }
 
         /// <summary>
         /// Metrics describing the state and activity of the app process.
         /// </summary>
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public AppInstanceProcessMetricsPart ProcessMetrics { get; set; }
+        public AppInstanceProcessMetricsPart? ProcessMetrics { get; set; }
 
         /// <summary>
         /// Information about ingestion activity through this app.
         /// </summary>
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public InputMetricsPart InputMetrics { get; set; }
+        public InputMetricsPart? InputMetrics { get; set; }
 
         /// <summary>
         /// Information about the app's diagnostic input.
         /// </summary>
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public InputMetricsPart DiagnosticInputMetrics { get; set; }
+        public InputMetricsPart? DiagnosticInputMetrics { get; set; }
 
         /// <summary>
         /// Information about events output through the app.
         /// </summary>
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public AppInstanceOutputMetricsPart OutputMetrics { get; set; }
+        public AppInstanceOutputMetricsPart? OutputMetrics { get; set; }
 
         /// <summary>
         /// Obsolete.
@@ -160,5 +162,17 @@ public AppInstanceEntity()
         [Obsolete("Use !AcceptDirectInvocation instead.")]
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public bool? DisallowManualInput { get; set; }
+
+        /// <summary>
+        /// The name of the app.
+        /// </summary>
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string? AppName { get; set; }
+
+        /// <summary>
+        /// If <c>true</c>, then the app is able to write events to the log.
+        /// </summary>
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public bool? IsInput { get; set; }
     }
 }

src/Seq.Api/Model/Apps/AppSettingPart.cs

@@ -54,5 +54,16 @@ public class AppSettingPart
         /// for the setting.
         /// </summary>
         public List<AppSettingValuePart> AllowedValues { get; set; } = new List<AppSettingValuePart>();
+
+        /// <summary>
+        /// If the setting value contains code in a programming or markup language, the
+        /// language name.
+        /// </summary>
+        /// <remarks>Valid names are a subset of the names and aliases recognized by
+        /// <a href="https://github.com/github/linguist/blob/master/lib/linguist/languages.yml">GitHub
+        /// Linguist</a>. The generic value <c>code</c> will be specified if the language is non-specific but
+        /// the value should be displayed in fixed-width font. Seq also recognizes the special Seq-specific
+        /// <c>template</c> and <c>expression</c> syntaxes.</remarks>
+        public string Syntax { get; set; }
     }
 }

src/Seq.Api/Model/Dashboarding/DashboardEntity.cs

@@ -34,7 +34,7 @@ public class DashboardEntity : Entity
         public string Title { get; set; }
 
         /// <summary>
-        /// If <c>true</c>, only users with <see cref="Permission.Setup"/> can modify the dashboard.
+        /// If <c>true</c>, only users with <see cref="Permission.Project"/> can modify the dashboard.
         /// </summary>
         public bool IsProtected { get; set; }
 

src/Seq.Api/Model/Data/QueryResultPart.cs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Seq.Api.Model.Data
@@ -50,6 +51,12 @@ public class QueryResultPart
         /// </summary>
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public TimeseriesPart[] Series { get; set; }
+        
+        /// <summary>
+        /// Result variables.
+        /// </summary>
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public Dictionary<string, object> Variables { get; set; }
 
         /// <summary>
         /// On error only, a description of the error.

src/Seq.Api/Model/Link.cs

@@ -26,7 +26,7 @@ namespace Seq.Api.Model
     /// parameterized in order to produce a complete URI (if the template contains no
     /// parameters then it may also be a literal URI).
     /// </summary>
-    public struct Link
+    public readonly struct Link
     {
         /// <summary>
         /// An empty link.

src/Seq.Api/Model/Security/Permission.cs

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System;
+
 namespace Seq.Api.Model.Security
 {
     /// <summary>
@@ -46,10 +48,29 @@ public enum Permission
         /// Write-access to signals, alerts, preferences etc.
         /// </summary>
         Write,
-        
+
         /// <summary>
         /// Access to administrative features of Seq, management of other users, app installation, backups.
         /// </summary>
+        [Obsolete("The `Setup` permission has been replaced by `Project` and `System`.")]
         Setup,
+
+        /// <summary>
+        /// Access to settings that control data ingestion, storage, dashboarding and alerting.
+        /// </summary>
+        Project,
+        
+        /// <summary>
+        /// Access to settings and features that interact with, or provide access to, the underlying host server,
+        /// such as app (plug-in) installation, backup settings, cluster configuration, diagnostics, and features
+        /// relying on outbound network access like package feeds and update checks. This permission is required for
+        /// configuration of the authentication provider and related settings.
+        /// </summary>
+        System,
+        
+        /// <summary>
+        /// Create, edit, and delete user accounts, reset local user passwords.
+        /// </summary>
+        Organization
     }
 }

src/Seq.Api/Model/Security/RoleEntity.cs

@@ -29,6 +29,11 @@ public class RoleEntity : Entity
         /// <summary>
         /// Permissions granted to users in the role.
         /// </summary>
-        public HashSet<Permission> Permissions { get; set; } = new HashSet<Permission>();
+        public HashSet<Permission> Permissions { get; set; } = new();
+        
+        /// <summary>
+        /// Optionally, an extended description of the role.
+        /// </summary>
+        public string Description { get; set; }
     }
 }