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
3 changes: 1 addition & 2 deletions src/Sail.Compass/RateLimiter/RateLimiterPolicyUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,4 @@ public static void UpdateRateLimiterPoliciesFailed(ILogger logger, Exception exc
_updateRateLimiterPoliciesFailed(logger, exception);
}
}
}

}
1 change: 1 addition & 0 deletions src/Sail.Core/Entities/Cluster.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public class Cluster
{
public Guid Id { get; set; }
public string? Name { get; set; }
public bool? Enabled { get; set; } = true;
public string? ServiceName { get; set; }
public ServiceDiscoveryType? ServiceDiscoveryType { get; set; }
public string? LoadBalancingPolicy { get; set; }
Expand Down
2 changes: 2 additions & 0 deletions src/Sail.Core/Entities/Route.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ public class Route
public Guid Id { get; set; }
public Guid? ClusterId { get; set; }
public string Name { get; set; } = string.Empty;
public bool? Enabled { get; set; } = true;
public RouteMatch Match { get; set; } = new();
public int Order { get; set; }
public string? AuthorizationPolicy { get; set; }
public string? RateLimiterPolicy { get; set; }
public string? CorsPolicy { get; set; }
public string? TimeoutPolicy { get; set; }
public string? RetryPolicy { get; set; }
public TimeSpan? Timeout { get; set; }
public long? MaxRequestBodySize { get; set; }
public bool? HttpsRedirect { get; set; }
Expand Down
33 changes: 16 additions & 17 deletions src/Sail.Core/Retry/SailRetryPolicyProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,6 @@ public SailRetryPolicyProvider(ILogger<SailRetryPolicyProvider> logger)
_logger = logger;
}

public RetryPipelineWrapper? GetPolicy(string key)
{
if (string.IsNullOrEmpty(key))
{
return null;
}

if (_policies.TryGetValue(key, out var policy))
{
Log.PolicyFound(_logger, key);
return policy;
}

Log.PolicyNotFound(_logger, key);
return null;
}

public Task UpdateAsync(IReadOnlyList<RetryPolicyConfig> configs, CancellationToken cancellationToken)
{
var newPolicies = new Dictionary<string, RetryPipelineWrapper>(StringComparer.OrdinalIgnoreCase);
Expand Down Expand Up @@ -87,6 +70,22 @@ private ResiliencePipeline BuildResiliencePipeline(RetryPolicyConfig config)

return new ResiliencePipelineBuilder().AddRetry(retryStrategyOptions).Build();
}
public RetryPipelineWrapper? GetPolicy(string key)
{
if (string.IsNullOrEmpty(key))
{
return null;
}

if (_policies.TryGetValue(key, out var policy))
{
Log.PolicyFound(_logger, key);
return policy;
}

Log.PolicyNotFound(_logger, key);
return null;
}

private static class Log
{
Expand Down
3 changes: 3 additions & 0 deletions src/Sail/Cluster/ClusterService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public async Task<ErrorOr<Updated>> UpdateAsync(Guid id, ClusterRequest request,
}

cluster.Name = request.Name;
cluster.Enabled = request.Enabled;
cluster.ServiceName = request.ServiceName;
cluster.ServiceDiscoveryType = request.ServiceDiscoveryType;
cluster.LoadBalancingPolicy = request.LoadBalancingPolicy;
Expand All @@ -62,6 +63,7 @@ private ClusterEntity CreateClusterFromRequest(ClusterRequest request)
var cluster = new ClusterEntity
{
Name = request.Name,
Enabled = request.Enabled,
LoadBalancingPolicy = request.LoadBalancingPolicy,
ServiceName = request.ServiceName,
ServiceDiscoveryType = request.ServiceDiscoveryType,
Expand Down Expand Up @@ -134,6 +136,7 @@ private ClusterResponse MapToCluster(ClusterEntity cluster)
{
Id = cluster.Id,
Name = cluster.Name,
Enabled = cluster.Enabled ?? true,
ServiceName = cluster.ServiceName,
ServiceDiscoveryType = cluster.ServiceDiscoveryType,
LoadBalancingPolicy = cluster.LoadBalancingPolicy,
Expand Down
1 change: 1 addition & 0 deletions src/Sail/Cluster/Models/ClusterRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ namespace Sail.Cluster.Models;

public record ClusterRequest(
string Name,
bool Enabled,
string? ServiceName,
ServiceDiscoveryType? ServiceDiscoveryType,
HealthCheckRequest? HealthCheck,
Expand Down
1 change: 1 addition & 0 deletions src/Sail/Cluster/Models/ClusterResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public record ClusterResponse
{
public Guid Id { get; init; }
public string? Name { get; init; }
public bool Enabled { get; init; }
public string? ServiceName { get; init; }
public ServiceDiscoveryType? ServiceDiscoveryType { get; init; }
public string? LoadBalancingPolicy { get; init; }
Expand Down
1 change: 1 addition & 0 deletions src/Sail/Extensions/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public static void AddApplicationServices(this IHostApplicationBuilder builder)
services.TryAddScoped<Certificate.CertificateService>();
services.TryAddScoped<Middleware.MiddlewareService>();
services.TryAddScoped<AuthenticationPolicy.AuthenticationPolicyService>();
services.TryAddScoped<Statistics.StatisticsService>();

services.AddValidatorsFromAssemblyContaining<Program>();

Expand Down
2 changes: 2 additions & 0 deletions src/Sail/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using Sail.Middleware.Http;
using Sail.AuthenticationPolicy.Grpc;
using Sail.AuthenticationPolicy.Http;
using Sail.Statistics.Http;

var builder = WebApplication.CreateBuilder(args);

Expand Down Expand Up @@ -46,6 +47,7 @@
endpoint.MapCertificateApiV1();
endpoint.MapMiddlewareApiV1();
endpoint.MapAuthenticationPolicyApi();
endpoint.MapStatisticsApiV1();

app.UseDefaultOpenApi();
app.MapGrpcService<RouteGrpcService>();
Expand Down
2 changes: 2 additions & 0 deletions src/Sail/Route/Models/RouteRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ public record RouteRequest
{
public Guid? ClusterId { get; init; }
public string Name { get; init; }
public bool Enabled { get; init; } = true;
public RouteMatchRequest Match { get; init; }
public int Order { get; init; }
public string? AuthorizationPolicy { get; init; }
public string? RateLimiterPolicy { get; init; }
public string? CorsPolicy { get; init; }
public string? TimeoutPolicy { get; init; }
public string? RetryPolicy { get; init; }
public TimeSpan? Timeout { get; init; }
public long? MaxRequestBodySize { get; init; }
public bool? HttpsRedirect { get; init; }
Expand Down
2 changes: 2 additions & 0 deletions src/Sail/Route/Models/RouteResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ public record RouteResponse
public Guid Id { get; init; }
public Guid? ClusterId { get; init; }
public string Name { get; init; }
public bool Enabled { get; init; }
public RouteMatchResponse Match { get; init; }
public int Order { get; init; }
public string? AuthorizationPolicy { get; init; }
public string? RateLimiterPolicy { get; init; }
public string? CorsPolicy { get; init; }
public string? TimeoutPolicy { get; init; }
public string? RetryPolicy { get; init; }
public TimeSpan? Timeout { get; init; }
public long? MaxRequestBodySize { get; init; }
public bool? HttpsRedirect { get; init; }
Expand Down
6 changes: 6 additions & 0 deletions src/Sail/Route/RouteService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,14 @@ public async Task<ErrorOr<Updated>> UpdateAsync(Guid id, RouteRequest request,
}

route.Name = request.Name;
route.Enabled = request.Enabled;
route.ClusterId = request.ClusterId;
route.Match = CreateRouteMatchFromRequest(request.Match);
route.AuthorizationPolicy = request.AuthorizationPolicy;
route.RateLimiterPolicy = request.RateLimiterPolicy;
route.CorsPolicy = request.CorsPolicy;
route.TimeoutPolicy = request.TimeoutPolicy;
route.RetryPolicy = request.RetryPolicy;
route.Timeout = request.Timeout;
route.MaxRequestBodySize = request.MaxRequestBodySize;
route.HttpsRedirect = request.HttpsRedirect;
Expand All @@ -102,13 +104,15 @@ private RouteEntity CreateRouteFromRequest(RouteRequest request)
var route = new RouteEntity
{
Name = request.Name,
Enabled = request.Enabled,
ClusterId = request.ClusterId,
Match = CreateRouteMatchFromRequest(request.Match),
Order = request.Order,
AuthorizationPolicy = request.AuthorizationPolicy,
RateLimiterPolicy = request.RateLimiterPolicy,
CorsPolicy = request.CorsPolicy,
TimeoutPolicy = request.TimeoutPolicy,
RetryPolicy = request.RetryPolicy,
Timeout = request.Timeout,
MaxRequestBodySize = request.MaxRequestBodySize,
HttpsRedirect = request.HttpsRedirect,
Expand Down Expand Up @@ -158,6 +162,7 @@ private RouteResponse MapToRoute(RouteEntity route)
Id = route.Id,
ClusterId = route.ClusterId,
Name = route.Name,
Enabled = route.Enabled ?? true,
Match = new RouteMatchResponse
{
Path = route.Match.Path,
Expand All @@ -184,6 +189,7 @@ private RouteResponse MapToRoute(RouteEntity route)
RateLimiterPolicy = route.RateLimiterPolicy,
CorsPolicy = route.CorsPolicy,
TimeoutPolicy = route.TimeoutPolicy,
RetryPolicy = route.RetryPolicy,
Timeout = route.Timeout,
MaxRequestBodySize = route.MaxRequestBodySize,
HttpsRedirect = route.HttpsRedirect,
Expand Down
88 changes: 88 additions & 0 deletions src/Sail/Statistics/Http/StatisticsHttpEndpointsBuilder.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
using Microsoft.AspNetCore.Http.HttpResults;
using Sail.Statistics.Models;

namespace Sail.Statistics.Http;

public static class StatisticsHttpEndpointsBuilder
{
public static RouteGroupBuilder MapStatisticsApiV1(this IEndpointRouteBuilder app)
{
var api = app.MapGroup("api/statistics").HasApiVersion(1.0);

api.MapGet("/resources/routes", GetRouteStatistics);
api.MapGet("/resources/clusters", GetClusterStatistics);
api.MapGet("/resources/certificates", GetCertificateStatistics);
api.MapGet("/resources/middlewares", GetMiddlewareStatistics);
api.MapGet("/resources/authentication-policies", GetAuthenticationPolicyStatistics);
api.MapGet("/recent/routes", GetRecentRoutes);
api.MapGet("/recent/clusters", GetRecentClusters);
api.MapGet("/recent/certificates", GetRecentCertificates);

return api;
}

private static async Task<Ok<RecentItemsResponse>> GetRecentRoutes(
StatisticsService service,
CancellationToken cancellationToken)
{
var items = await service.GetRecentRoutesAsync(cancellationToken);
return TypedResults.Ok(items);
}

private static async Task<Ok<RecentItemsResponse>> GetRecentClusters(
StatisticsService service,
CancellationToken cancellationToken)
{
var items = await service.GetRecentClustersAsync(cancellationToken);
return TypedResults.Ok(items);
}

private static async Task<Ok<RecentItemsResponse>> GetRecentCertificates(
StatisticsService service,
CancellationToken cancellationToken)
{
var items = await service.GetRecentCertificatesAsync(cancellationToken);
return TypedResults.Ok(items);
}

private static async Task<Ok<ResourceCountResponse>> GetRouteStatistics(
StatisticsService service,
CancellationToken cancellationToken)
{
var count = await service.GetRouteStatisticsAsync(cancellationToken);
return TypedResults.Ok(count);
}

private static async Task<Ok<ResourceCountResponse>> GetClusterStatistics(
StatisticsService service,
CancellationToken cancellationToken)
{
var count = await service.GetClusterStatisticsAsync(cancellationToken);
return TypedResults.Ok(count);
}

private static async Task<Ok<ResourceCountResponse>> GetCertificateStatistics(
StatisticsService service,
CancellationToken cancellationToken)
{
var count = await service.GetCertificateStatisticsAsync(cancellationToken);
return TypedResults.Ok(count);
}

private static async Task<Ok<ResourceCountResponse>> GetMiddlewareStatistics(
StatisticsService service,
CancellationToken cancellationToken)
{
var count = await service.GetMiddlewareStatisticsAsync(cancellationToken);
return TypedResults.Ok(count);
}

private static async Task<Ok<ResourceCountResponse>> GetAuthenticationPolicyStatistics(
StatisticsService service,
CancellationToken cancellationToken)
{
var count = await service.GetAuthenticationPolicyStatisticsAsync(cancellationToken);
return TypedResults.Ok(count);
}
}

20 changes: 20 additions & 0 deletions src/Sail/Statistics/Models/StatisticsResponse.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
namespace Sail.Statistics.Models;

public record ResourceCountResponse
{
public int Total { get; init; }
public int Enabled { get; init; }
}

public record RecentItemsResponse
{
public List<RecentItem> Items { get; init; } = [];
}

public record RecentItem
{
public Guid Id { get; init; }
public string Name { get; init; } = string.Empty;
public DateTimeOffset CreatedAt { get; init; }
}

Loading
Loading