Skip to content

Commit 55a033d

Browse files
committed
merge 2024.1 changes from seq
1 parent d586359 commit 55a033d

File tree

5 files changed

+90
-3
lines changed

5 files changed

+90
-3
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
namespace Seq.Api.Model.Diagnostics
2+
{
3+
/// <summary>
4+
/// Metrics related to cluster activity.
5+
/// </summary>
6+
public class ClusterMetricsPart
7+
{
8+
/// <summary>
9+
/// Construct a <see cref="ClusterMetricsPart"/>.
10+
/// </summary>
11+
public ClusterMetricsPart()
12+
{
13+
}
14+
15+
/// <summary>
16+
/// A connection to the leader node was accepted.
17+
/// </summary>
18+
public ulong ConnectionAccepted { get; set; }
19+
20+
/// <summary>
21+
/// A connection to the leader node was rejected due to an invalid authentication key.
22+
/// </summary>
23+
public ulong ConnectionInvalidKey { get; set; }
24+
25+
/// <summary>
26+
/// A connection to the leader node was successfully authenticated and established.
27+
/// </summary>
28+
public ulong ConnectionEstablished { get; set; }
29+
30+
/// <summary>
31+
/// A connection to the leader node was could not be established.
32+
/// </summary>
33+
public ulong ConnectionNotEstablished { get; set; }
34+
}
35+
}

src/Seq.Api/Model/Events/EventEntity.cs

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
using System;
1516
using System.Collections.Generic;
1617
using Newtonsoft.Json;
1718
using Seq.Api.Model.Shared;
@@ -30,6 +31,12 @@ public class EventEntity : Entity
3031
/// </summary>
3132
public string Timestamp { get; set; }
3233

34+
/// <summary>
35+
/// If the event represents a span, the ISO-8601 timestamp at which the span started.
36+
/// </summary>
37+
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
38+
public string Start { get; set; }
39+
3340
/// <summary>
3441
/// Properties associated with the event.
3542
/// </summary>
@@ -75,11 +82,31 @@ public class EventEntity : Entity
7582
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
7683
public string SpanId { get; set; }
7784

85+
/// <summary>
86+
/// The id of the event's parent span, if any.
87+
/// </summary>
88+
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
89+
public string ParentId { get; set; }
90+
7891
/// <summary>
7992
/// A collection of properties describing the origin of the event, if any. These correspond to resource
80-
/// attributes in the OpenTelemetry spec.
93+
/// attributes in the OpenTelemetry protocol.
8194
/// </summary>
8295
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
8396
public List<EventPropertyPart> Resource { get; set; }
97+
98+
/// <summary>
99+
/// A collection of properties describing the instrumentation that produced an event, if any. These correspond
100+
/// to instrumentation scope attributes in the OpenTelemetry protocol, and may include the OpenTelemetry scope name
101+
/// in a well-known <c>name</c> property.
102+
/// </summary>
103+
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
104+
public List<EventPropertyPart> Scope { get; set; }
105+
106+
/// <summary>
107+
/// If the event is a span, the elapsed time between the start and end of the span.
108+
/// </summary>
109+
[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
110+
public TimeSpan? Elapsed { get; set; }
84111
}
85112
}

src/Seq.Api/Model/Settings/SettingName.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ public enum SettingName
165165
/// list. For example, <c>openid, profile, email</c>.
166166
/// </summary>
167167
OpenIdConnectScopes,
168+
169+
/// <summary>
170+
/// If using OpenID Connect, overrides the URI of the provider's metadata endpoint.
171+
/// </summary>
172+
OpenIdConnectMetadataAddress,
168173

169174
/// <summary>
170175
/// If <c>true</c>, ingestion requests incoming via HTTP must be authenticated using an API key or

src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,25 @@ public async Task<StorageConsumptionPart> GetStorageConsumptionAsync(
101101
};
102102
return await GroupGetAsync<StorageConsumptionPart>("Storage", parameters, cancellationToken);
103103
}
104+
105+
/// <summary>
106+
/// Retrieve the cluster log.
107+
/// </summary>
108+
/// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
109+
/// <returns>The cluster log.</returns>
110+
public async Task<string> GetClusterLogAsync(CancellationToken cancellationToken = default)
111+
{
112+
return await GroupGetStringAsync("ClusterLog", cancellationToken: cancellationToken);
113+
}
114+
115+
/// <summary>
116+
/// Retrieve metrics about cluster connections.
117+
/// </summary>
118+
/// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
119+
/// <returns>A set of metrics relating to cluster network activity.</returns>
120+
public async Task<ClusterMetricsPart> GetClusterMetricsAsync(CancellationToken cancellationToken = default)
121+
{
122+
return await GroupGetAsync<ClusterMetricsPart>("ClusterMetrics", cancellationToken: cancellationToken);
123+
}
104124
}
105125
}

src/Seq.Api/Seq.Api.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Client library for the Seq HTTP API.</Description>
4-
<VersionPrefix>2023.4.0</VersionPrefix>
4+
<VersionPrefix>2024.1.0</VersionPrefix>
55
<Authors>Datalust;Contributors</Authors>
66
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
27-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
27+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
2828
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all">
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
</PackageReference>

0 commit comments

Comments
 (0)