Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# If this file is renamed, the incrementing run attempt number will be reset.

name: CI

on:
push:
branches: [ "dev", "main" ]
pull_request:
branches: [ "dev", "main" ]

env:
CI_BUILD_NUMBER_BASE: ${{ github.run_number }}
CI_TARGET_BRANCH: ${{ github.head_ref || github.ref_name }}

jobs:
build:

runs-on: ubuntu-24.04

permissions:
contents: write

steps:
- uses: actions/checkout@v4
- name: Setup
uses: actions/setup-dotnet@v4
with:
dotnet-version: 10.0.x
- name: Compute build number
run: |
echo "CI_BUILD_NUMBER=$(($CI_BUILD_NUMBER_BASE+200))" >> $GITHUB_ENV
- name: Build and Publish
env:
DOTNET_CLI_TELEMETRY_OPTOUT: true
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: pwsh
run: |
./Build.ps1
80 changes: 44 additions & 36 deletions Build.ps1
Original file line number Diff line number Diff line change
@@ -1,69 +1,77 @@
# This script originally (c) 2016 Serilog Contributors - license Apache 2.0

echo "build: Build started"
Write-Output "build: Build started"

Push-Location $PSScriptRoot

Write-Output "build: Tool versions follow"

dotnet --version
dotnet --list-sdks

if(Test-Path .\artifacts) {
echo "build: Cleaning .\artifacts"
Remove-Item .\artifacts -Force -Recurse
Write-Output "build: Cleaning ./artifacts"
Remove-Item ./artifacts -Force -Recurse
}

& dotnet restore --no-cache
if($LASTEXITCODE -ne 0) { exit 1 }

$branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL];
$revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "main" -and $revision -ne "local"]
$dbp = [Xml] (Get-Content .\Directory.Build.props)
$versionPrefix = $dbp.Project.PropertyGroup.VersionPrefix

Write-Output "build: Package version prefix is $versionPrefix"

$branch = @{ $true = $env:CI_TARGET_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$NULL -ne $env:CI_TARGET_BRANCH];
$revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:CI_BUILD_NUMBER, 10); $false = "local" }[$NULL -ne $env:CI_BUILD_NUMBER];
$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)) -replace '([^a-zA-Z0-9\-]*)', '')-$revision"}[$branch -eq "main" -and $revision -ne "local"]

echo "build: Version suffix is $suffix"
Write-Output "build: Package version suffix is $suffix"

foreach ($src in ls src/*) {
foreach ($src in Get-ChildItem src/*) {
Push-Location $src

echo "build: Packaging project in $src"
Write-Output "build: Packaging project in $src"

if ($suffix) {
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix
& dotnet pack -c Release -o ../../artifacts --version-suffix=$suffix
} else {
& dotnet pack -c Release -o ..\..\artifacts
& dotnet pack -c Release -o ../../artifacts
}
if($LASTEXITCODE -ne 0) { exit 1 }
if($LASTEXITCODE -ne 0) { throw "Packaging failed" }

Pop-Location
}

foreach ($test in ls test/*.Tests) {
Push-Location $test

echo "build: Testing project in $test"

& dotnet test -c Release
if($LASTEXITCODE -ne 0) { exit 3 }
Write-Output "build: Checking complete solution builds"
& dotnet build
if($LASTEXITCODE -ne 0) { throw "Solution build failed" }

Pop-Location
}

foreach ($test in ls test/*.Benchmarks) {
foreach ($test in Get-ChildItem test/*.Tests) {
Push-Location $test

echo "build: Building performance test project in $test"
Write-Output "build: Testing project in $test"

& dotnet build -c Release
if($LASTEXITCODE -ne 0) { exit 2 }
& dotnet test -c Release
if($LASTEXITCODE -ne 0) { throw "Testing failed" }

Pop-Location
}

foreach ($sample in ls example/*) {
Push-Location $sample
Pop-Location

echo "build: Building sample project in $sample"
if ($env:NUGET_API_KEY) {
# GitHub Actions will only supply this to branch builds and not PRs. We publish
# builds from any branch this action targets (i.e. main and dev).

Write-Output "build: Publishing NuGet packages"

foreach ($nupkg in Get-ChildItem artifacts/*.nupkg) {
& dotnet nuget push -k $env:NUGET_API_KEY -s https://api.nuget.org/v3/index.json "$nupkg"
if($LASTEXITCODE -ne 0) { throw "Publishing failed" }
}

& dotnet build -c Release
if($LASTEXITCODE -ne 0) { exit 2 }
if (!($suffix)) {
Write-Output "build: Creating release for version $versionPrefix"

Pop-Location
iex "gh release create v$versionPrefix --title v$versionPrefix --generate-notes $(get-item ./artifacts/*.nupkg) $(get-item ./artifacts/*.snupkg)"
}
}

Pop-Location
15 changes: 10 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
</PropertyGroup>
</Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<VersionPrefix>2026.1.0</VersionPrefix>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<NoWarn>NETSDK1138</NoWarn>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Seq HTTP API Client [![Build status](https://ci.appveyor.com/api/projects/status/bhtx25hyqmmdqhvt?svg=true)](https://ci.appveyor.com/project/datalust/seq-api) [![NuGet Pre Release](https://img.shields.io/nuget/vpre/Seq.Api.svg)](https://nuget.org/packages/seq.api)
# Seq HTTP API Client [![NuGet Pre Release](https://img.shields.io/nuget/vpre/Seq.Api.svg)](https://nuget.org/packages/seq.api)

This library includes:

Expand Down
1 change: 0 additions & 1 deletion seq-api.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{1C66
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{7DCED657-7E83-4E6F-AB14-5753E044304D}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
Build.ps1 = Build.ps1
LICENSE = LICENSE
README.md = README.md
Expand Down
27 changes: 23 additions & 4 deletions src/Seq.Api/Client/SeqApiClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public sealed class SeqApiClient : IDisposable
// 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 SeqApiVersionedMediaType = "application/vnd.datalust.seq.v13+json";
const string SeqApiVersionedMediaType = "application/vnd.datalust.seq.v14+json";
const string ApiKeyHeaderName = "X-Seq-ApiKey";
const string CsrfTokenHeaderName = "X-Seq-CsrfToken";

Expand Down Expand Up @@ -191,6 +191,14 @@ public async Task<TResponse> PostAsync<TEntity, TResponse>(ILinked entity, strin
return _serializer.Deserialize<TResponse>(new JsonTextReader(new StreamReader(stream)));
}

// Callers are expected to derive 400 error information from the response stream. All other result status codes throw.
internal async Task<TResponse> TryPostAsync<TEntity, TResponse>(ILinked entity, string link, TEntity content, IDictionary<string, object> parameters = null, CancellationToken cancellationToken = default)
{
var linkUri = ResolveLink(entity, link, parameters);
var request = new HttpRequestMessage(HttpMethod.Post, linkUri) { Content = MakeJsonContent(content) };
var stream = await HttpTrySendAsync(request, cancellationToken).ConfigureAwait(false);
return _serializer.Deserialize<TResponse>(new JsonTextReader(new StreamReader(stream)));
}
/// <summary>
/// Issue a <c>POST</c> request accepting a serialized <typeparamref name="TEntity"/> and returning a string by following <paramref name="link"/> from <paramref name="entity"/>.
/// </summary>
Expand Down Expand Up @@ -452,8 +460,19 @@ async Task<string> HttpGetStringAsync(string url, CancellationToken cancellation
#endif
).ConfigureAwait(false);
}


// Throws on 5xx errors; callers are expected to derive 400 error information from the response stream.
async Task<Stream> HttpTrySendAsync(HttpRequestMessage request, CancellationToken cancellationToken = default)
{
return await HttpSendAsyncCore(request, throwOn400: false, cancellationToken);
}

async Task<Stream> HttpSendAsync(HttpRequestMessage request, CancellationToken cancellationToken = default)
{
return await HttpSendAsyncCore(request, throwOn400: true, cancellationToken);
}

async Task<Stream> HttpSendAsyncCore(HttpRequestMessage request, bool throwOn400, CancellationToken cancellationToken)
{
var response = await HttpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
var stream = await response.Content.ReadAsStreamAsync(
Expand All @@ -462,7 +481,7 @@ async Task<Stream> HttpSendAsync(HttpRequestMessage request, CancellationToken c
#endif
).ConfigureAwait(false);

if (response.IsSuccessStatusCode)
if (response.IsSuccessStatusCode || (!throwOn400 && response.StatusCode == HttpStatusCode.BadRequest))
{
return stream;
}
Expand Down Expand Up @@ -531,7 +550,7 @@ static string EnsureAbsoluteWebSocketUri(string target, Uri apiBaseAddress)
absoluteUnknownScheme.Scheme = absoluteUnknownScheme.Scheme.Equals("http", StringComparison.OrdinalIgnoreCase) ||
absoluteUnknownScheme.Scheme.Equals("ws", StringComparison.OrdinalIgnoreCase) ?
"ws" : "wss";

return absoluteUnknownScheme.ToString();
}

Expand Down
4 changes: 2 additions & 2 deletions src/Seq.Api/Model/Alerting/AlertActivityPart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ public class AlertActivityPart
/// <summary>
/// The most recent occurrences of the alert that triggered notifications.
/// </summary>
public List<AlertOccurrencePart> RecentOccurrences { get; set; } = new List<AlertOccurrencePart>();
public List<AlertOccurrencePart> RecentOccurrences { get; set; } = new();

/// <summary>
/// Minimal metrics for the most recent occurrences of the alert that triggered notifications.
/// The metrics in this list are a superset of <see cref="RecentOccurrences"/>.
/// </summary>
public List<AlertOccurrenceRangePart> RecentOccurrenceRanges { get; set; } =
new List<AlertOccurrenceRangePart>();
new();

/// <summary>
/// The number of times this alert has been triggered since its creation.
Expand Down
14 changes: 12 additions & 2 deletions src/Seq.Api/Model/Alerting/AlertEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,21 @@ public class AlertEntity : Entity
/// </summary>
public bool IsDisabled { get; set; }

/// <summary>
/// The source of the data for the query.
/// </summary>
public DataSource DataSource { get; set; } = DataSource.Stream;

/// <summary>
/// Lateral joins applied to the data source.
/// </summary>
public List<JoinPart> Joins { get; set; } = [];

/// <summary>
/// An optional <see cref="SignalExpressionPart"/> limiting the data source that triggers the alert.
/// </summary>
public SignalExpressionPart SignalExpression { get; set; }

/// <summary>
/// An optional <c>where</c> clause limiting the data source that triggers the alert.
/// </summary>
Expand All @@ -75,7 +85,7 @@ public class AlertEntity : Entity
/// <summary>
/// The individual measurements that will be tested by the alert condition.
/// </summary>
public List<ColumnPart> Select { get; set; } = new List<ColumnPart>();
public List<ColumnPart> Select { get; set; } = [];

/// <summary>
/// The alert condition. This is a <c>having</c> clause over the grouped results
Expand Down
2 changes: 1 addition & 1 deletion src/Seq.Api/Model/Alerting/AlertOccurrencePart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ public class AlertOccurrencePart
/// <summary>
/// The <see cref="NotificationChannelPart">NotificationChannelParts</see> that were alerted.
/// </summary>
public List<AlertNotificationPart> Notifications { get; set; } = new List<AlertNotificationPart>();
public List<AlertNotificationPart> Notifications { get; set; } = new();
}
}
2 changes: 1 addition & 1 deletion src/Seq.Api/Model/Alerting/NotificationChannelPart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ public class NotificationChannelPart
/// by the alert.
/// </summary>
public Dictionary<string, string> NotificationAppSettingOverrides { get; set; } =
new Dictionary<string, string>();
new();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,12 @@ public class AppInstanceOutputMetricsPart
/// it being processed by the app.
/// </summary>
public int DispatchedEventsPerMinute { get; set; }

/// <summary>
/// The number of events per minute that failed to reach the app from Seq. Includes streamed events (if enabled),
/// manual invocations, and alert notifications. This value doesn't track events the app may have internally
/// failed to process.
/// </summary>
public int FailedEventsPerMinute { get; set; }
}
}
18 changes: 14 additions & 4 deletions src/Seq.Api/Model/Dashboarding/ChartQueryPart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,20 @@ public class ChartQueryPart
/// </summary>
public string Id { get; set; }

/// <summary>
/// The source of the data displayed by the chart.
/// </summary>
public DataSource DataSource { get; set; } = DataSource.Stream;

/// <summary>
/// Lateral joins applied to the data source.
/// </summary>
public List<JoinPart> Joins { get; set; } = [];

/// <summary>
/// Individual measurements included in the query. These are effectively projected columns.
/// </summary>
public List<ColumnPart> Measurements { get; set; } = new List<ColumnPart>();
public List<ColumnPart> Measurements { get; set; } = [];

/// <summary>
/// An optional filtering <c>where</c> clause limiting the data that contributes to the chart.
Expand All @@ -46,12 +56,12 @@ public class ChartQueryPart
/// <summary>
/// A series of expressions used to group data returned by the query.
/// </summary>
public List<string> GroupBy { get; set; } = new List<string>();
public List<string> GroupBy { get; set; } = [];

/// <summary>
/// How measurements included in the chart will be displayed.
/// </summary>
public MeasurementDisplayStylePart DisplayStyle { get; set; } = new MeasurementDisplayStylePart();
public MeasurementDisplayStylePart DisplayStyle { get; set; } = new();

/// <summary>
/// A filter that limits which groups will be displayed on the chart. Not supported by all chart types.
Expand All @@ -61,7 +71,7 @@ public class ChartQueryPart
/// <summary>
/// An ordering applied to the results of the query; not supported by all chart types.
/// </summary>
public List<string> OrderBy { get; set; } = new List<string>();
public List<string> OrderBy { get; set; } = [];

/// <summary>
/// The row limit used for the query. By default, a server-determined limit will be applied.
Expand Down
2 changes: 2 additions & 0 deletions src/Seq.Api/Model/Data/QueryResultPart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class QueryResultPart
/// <summary>
/// The columns within the result set (at various levels of the hierarchy).
/// </summary>
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
public string[] Columns { get; set; }

/// <summary>
Expand All @@ -43,6 +44,7 @@ public class QueryResultPart
/// <summary>
/// Metadata for the time grouping column.
/// </summary>
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
public ColumnMetadataPart TimeColumnMetadata { get; set; }

/// <summary>
Expand Down
Loading
Loading