diff --git a/global.json b/global.json
index 6d57b5872f..bf8e47c004 100644
--- a/global.json
+++ b/global.json
@@ -1,10 +1,10 @@
{
"sdk": {
- "version": "10.0.100",
+ "version": "10.0.302",
"allowPrerelease": false,
- "rollForward": "latestFeature"
+ "rollForward": "disable"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.134"
}
-}
\ No newline at end of file
+}
diff --git a/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/20260731054116_AddCustomChecks.Designer.cs b/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/20260731054116_AddCustomChecks.Designer.cs
new file mode 100644
index 0000000000..fe0e431c3c
--- /dev/null
+++ b/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/20260731054116_AddCustomChecks.Designer.cs
@@ -0,0 +1,481 @@
+//
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using ServiceControl.Persistence.EFCore.PostgreSql;
+
+#nullable disable
+
+namespace ServiceControl.Persistence.EFCore.PostgreSql.Migrations
+{
+ [DbContext(typeof(PostgreSqlServiceControlDbContext))]
+ [Migration("20260731054116_AddCustomChecks")]
+ partial class AddCustomChecks
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "10.0.10")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.CustomCheckEntity", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("Category")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("category");
+
+ b.Property("CustomCheckId")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("custom_check_id");
+
+ b.Property("FailureReason")
+ .HasColumnType("text")
+ .HasColumnName("failure_reason");
+
+ b.Property("OriginatingEndpointHost")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("originating_endpoint_host");
+
+ b.Property("OriginatingEndpointHostId")
+ .HasColumnType("uuid")
+ .HasColumnName("originating_endpoint_host_id");
+
+ b.Property("OriginatingEndpointName")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("originating_endpoint_name");
+
+ b.Property("ReportedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("reported_at");
+
+ b.Property("Status")
+ .HasColumnType("integer")
+ .HasColumnName("status");
+
+ b.HasKey("Id")
+ .HasName("pk_custom_checks");
+
+ b.ToTable("custom_checks", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.EndpointSettingsEntity", b =>
+ {
+ b.Property("Name")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("name");
+
+ b.Property("TrackInstances")
+ .HasColumnType("boolean")
+ .HasColumnName("track_instances");
+
+ b.HasKey("Name")
+ .HasName("pk_endpoint_settings");
+
+ b.ToTable("endpoint_settings", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.EventLogItemEntity", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("Category")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("category");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("description");
+
+ b.Property("EventType")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("event_type");
+
+ b.Property("RaisedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("raised_at");
+
+ b.PrimitiveCollection>("RelatedTo")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("related_to");
+
+ b.Property("Severity")
+ .HasColumnType("integer")
+ .HasColumnName("severity");
+
+ b.HasKey("Id")
+ .HasName("pk_event_log_items");
+
+ b.HasIndex("RaisedAt", "Id")
+ .IsDescending()
+ .HasDatabaseName("ix_event_log_items_raised_at_id");
+
+ b.ToTable("EventLogItems", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedErrorImportEntity", b =>
+ {
+ b.Property("UniqueMessageId")
+ .HasColumnType("uuid")
+ .HasColumnName("unique_message_id");
+
+ b.Property("Body")
+ .IsRequired()
+ .HasColumnType("bytea")
+ .HasColumnName("body");
+
+ b.Property("BodyStoredExternally")
+ .HasColumnType("boolean")
+ .HasColumnName("body_stored_externally");
+
+ b.Property("ExceptionInfo")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("exception_info");
+
+ b.Property("FailedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("failed_at");
+
+ b.Property("HeadersJson")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("headers_json");
+
+ b.Property("MessageId")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("message_id");
+
+ b.HasKey("UniqueMessageId")
+ .HasName("pk_failed_error_imports");
+
+ b.HasIndex("FailedAt")
+ .HasDatabaseName("ix_failed_error_imports_failed_at");
+
+ b.ToTable("failed_error_imports", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedMessageEntity", b =>
+ {
+ b.Property("UniqueMessageId")
+ .HasColumnType("uuid")
+ .HasColumnName("unique_message_id");
+
+ b.Property("BodyContentType")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("body_content_type");
+
+ b.Property("BodySize")
+ .HasColumnType("integer")
+ .HasColumnName("body_size");
+
+ b.Property("BodyStoredExternally")
+ .HasColumnType("boolean")
+ .HasColumnName("body_stored_externally");
+
+ b.Property("BodyText")
+ .HasColumnType("text")
+ .HasColumnName("body_text");
+
+ b.Property("ConversationId")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("conversation_id");
+
+ b.Property("ExceptionMessage")
+ .HasColumnType("text")
+ .HasColumnName("exception_message");
+
+ b.Property("ExceptionType")
+ .HasColumnType("text")
+ .HasColumnName("exception_type");
+
+ b.Property("FailingEndpointAddress")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("failing_endpoint_address");
+
+ b.Property("FirstTimeOfFailure")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("first_time_of_failure");
+
+ b.Property("HeadersJson")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("headers_json");
+
+ b.Property("IsSystemMessage")
+ .HasColumnType("boolean")
+ .HasColumnName("is_system_message");
+
+ b.Property("LastAttemptedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("last_attempted_at");
+
+ b.Property("LastModified")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("last_modified");
+
+ b.Property("LastTimeOfFailure")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("last_time_of_failure");
+
+ b.Property("MessageId")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("message_id");
+
+ b.Property("MessageType")
+ .HasColumnType("text")
+ .HasColumnName("message_type");
+
+ b.Property("NumberOfProcessingAttempts")
+ .HasColumnType("integer")
+ .HasColumnName("number_of_processing_attempts");
+
+ b.Property("QueueAddress")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("queue_address");
+
+ b.Property("ReceivingEndpointHost")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("receiving_endpoint_host");
+
+ b.Property("ReceivingEndpointHostId")
+ .HasColumnType("uuid")
+ .HasColumnName("receiving_endpoint_host_id");
+
+ b.Property("ReceivingEndpointName")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("receiving_endpoint_name");
+
+ b.Property("SendingEndpointHost")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("sending_endpoint_host");
+
+ b.Property("SendingEndpointHostId")
+ .HasColumnType("uuid")
+ .HasColumnName("sending_endpoint_host_id");
+
+ b.Property("SendingEndpointName")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("sending_endpoint_name");
+
+ b.Property("Status")
+ .HasColumnType("integer")
+ .HasColumnName("status");
+
+ b.Property("StatusChangedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("status_changed_at");
+
+ b.Property("TimeSent")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("time_sent");
+
+ b.HasKey("UniqueMessageId")
+ .HasName("pk_failed_messages");
+
+ b.HasIndex("ConversationId")
+ .HasDatabaseName("ix_failed_messages_conversation_id");
+
+ b.HasIndex("FailingEndpointAddress")
+ .HasDatabaseName("ix_failed_messages_failing_endpoint_address");
+
+ b.HasIndex("QueueAddress")
+ .HasDatabaseName("ix_failed_messages_queue_address");
+
+ b.HasIndex("ReceivingEndpointName")
+ .HasDatabaseName("ix_failed_messages_receiving_endpoint_name");
+
+ b.HasIndex("StatusChangedAt")
+ .HasDatabaseName("ix_failed_messages_status_changed_at")
+ .HasFilter("status IN (2, 4)");
+
+ b.HasIndex("TimeSent")
+ .HasDatabaseName("ix_failed_messages_time_sent");
+
+ b.HasIndex("Status", "LastModified")
+ .HasDatabaseName("ix_failed_messages_status_last_modified");
+
+ b.ToTable("failed_messages", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedMessageGroupEntity", b =>
+ {
+ b.Property("FailedMessageUniqueId")
+ .HasColumnType("uuid")
+ .HasColumnName("failed_message_unique_id");
+
+ b.Property("GroupId")
+ .HasMaxLength(64)
+ .HasColumnType("character varying(64)")
+ .HasColumnName("group_id");
+
+ b.Property("Title")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("title");
+
+ b.Property("Type")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("character varying(255)")
+ .HasColumnName("type");
+
+ b.HasKey("FailedMessageUniqueId", "GroupId")
+ .HasName("pk_failed_message_groups");
+
+ b.HasIndex("GroupId")
+ .HasDatabaseName("ix_failed_message_groups_group_id");
+
+ b.ToTable("failed_message_groups", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedMessageRetryEntity", b =>
+ {
+ b.Property("UniqueMessageId")
+ .HasColumnType("uuid")
+ .HasColumnName("unique_message_id");
+
+ b.Property("RetryId")
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("retry_id");
+
+ b.HasKey("UniqueMessageId")
+ .HasName("pk_failed_message_retries");
+
+ b.ToTable("failed_message_retries", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.KnownEndpointEntity", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("Host")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("host");
+
+ b.Property("HostId")
+ .HasColumnType("uuid")
+ .HasColumnName("host_id");
+
+ b.Property("Monitored")
+ .HasColumnType("boolean")
+ .HasColumnName("monitored");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("name");
+
+ b.HasKey("Id")
+ .HasName("pk_known_endpoints");
+
+ b.ToTable("known_endpoints", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.SubscriptionEntity", b =>
+ {
+ b.Property("MessageType")
+ .HasMaxLength(200)
+ .HasColumnType("character varying(200)")
+ .HasColumnName("message_type");
+
+ b.Property("TransportAddress")
+ .HasMaxLength(200)
+ .HasColumnType("character varying(200)")
+ .HasColumnName("transport_address");
+
+ b.Property("Endpoint")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("character varying(450)")
+ .HasColumnName("endpoint");
+
+ b.HasKey("MessageType", "TransportAddress")
+ .HasName("pk_subscriptions");
+
+ b.ToTable("subscriptions", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.TrialMetadataEntity", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer")
+ .HasColumnName("id");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("TrialEndDate")
+ .HasColumnType("date")
+ .HasColumnName("trial_end_date");
+
+ b.HasKey("Id")
+ .HasName("pk_trial_metadata");
+
+ b.ToTable("trial_metadata", (string)null);
+
+ b.HasData(
+ new
+ {
+ Id = 1
+ });
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedMessageGroupEntity", b =>
+ {
+ b.HasOne("ServiceControl.Persistence.EFCore.Entities.FailedMessageEntity", null)
+ .WithMany()
+ .HasForeignKey("FailedMessageUniqueId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_failed_message_groups_failed_messages_failed_message_unique");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/20260731054116_AddCustomChecks.cs b/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/20260731054116_AddCustomChecks.cs
new file mode 100644
index 0000000000..ca9ae83816
--- /dev/null
+++ b/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/20260731054116_AddCustomChecks.cs
@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ServiceControl.Persistence.EFCore.PostgreSql.Migrations
+{
+ ///
+ public partial class AddCustomChecks : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.CreateTable(
+ name: "custom_checks",
+ columns: table => new
+ {
+ id = table.Column(type: "uuid", nullable: false),
+ custom_check_id = table.Column(type: "text", nullable: false),
+ category = table.Column(type: "text", nullable: false),
+ status = table.Column(type: "integer", nullable: false),
+ reported_at = table.Column(type: "timestamp with time zone", nullable: false),
+ failure_reason = table.Column(type: "text", nullable: true),
+ originating_endpoint_name = table.Column(type: "text", nullable: false),
+ originating_endpoint_host_id = table.Column(type: "uuid", nullable: false),
+ originating_endpoint_host = table.Column(type: "text", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("pk_custom_checks", x => x.id);
+ });
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropTable(
+ name: "custom_checks");
+ }
+ }
+}
diff --git a/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/PostgreSqlServiceControlDbContextModelSnapshot.cs b/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/PostgreSqlServiceControlDbContextModelSnapshot.cs
index c62889ba93..437c8633d6 100644
--- a/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/PostgreSqlServiceControlDbContextModelSnapshot.cs
+++ b/src/ServiceControl.Persistence.EFCore.PostgreSql/Migrations/PostgreSqlServiceControlDbContextModelSnapshot.cs
@@ -23,6 +23,54 @@ protected override void BuildModel(ModelBuilder modelBuilder)
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.CustomCheckEntity", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("Category")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("category");
+
+ b.Property("CustomCheckId")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("custom_check_id");
+
+ b.Property("FailureReason")
+ .HasColumnType("text")
+ .HasColumnName("failure_reason");
+
+ b.Property("OriginatingEndpointHost")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("originating_endpoint_host");
+
+ b.Property("OriginatingEndpointHostId")
+ .HasColumnType("uuid")
+ .HasColumnName("originating_endpoint_host_id");
+
+ b.Property("OriginatingEndpointName")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("originating_endpoint_name");
+
+ b.Property("ReportedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("reported_at");
+
+ b.Property("Status")
+ .HasColumnType("integer")
+ .HasColumnName("status");
+
+ b.HasKey("Id")
+ .HasName("pk_custom_checks");
+
+ b.ToTable("custom_checks", (string)null);
+ });
+
modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.EndpointSettingsEntity", b =>
{
b.Property("Name")
diff --git a/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/20260731054124_AddCustomChecks.Designer.cs b/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/20260731054124_AddCustomChecks.Designer.cs
new file mode 100644
index 0000000000..5f80c501d1
--- /dev/null
+++ b/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/20260731054124_AddCustomChecks.Designer.cs
@@ -0,0 +1,390 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using ServiceControl.Persistence.EFCore.SqlServer;
+
+#nullable disable
+
+namespace ServiceControl.Persistence.EFCore.SqlServer.Migrations
+{
+ [DbContext(typeof(SqlServerServiceControlDbContext))]
+ [Migration("20260731054124_AddCustomChecks")]
+ partial class AddCustomChecks
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "10.0.10")
+ .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+ SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.CustomCheckEntity", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Category")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("CustomCheckId")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("FailureReason")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("OriginatingEndpointHost")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("OriginatingEndpointHostId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("OriginatingEndpointName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ReportedAt")
+ .HasColumnType("datetime2");
+
+ b.Property("Status")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("CustomChecks");
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.EndpointSettingsEntity", b =>
+ {
+ b.Property("Name")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("TrackInstances")
+ .HasColumnType("bit");
+
+ b.HasKey("Name");
+
+ b.ToTable("EndpointSettings");
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.EventLogItemEntity", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("Category")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("EventType")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("RaisedAt")
+ .HasColumnType("datetime2");
+
+ b.PrimitiveCollection("RelatedTo")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Severity")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("RaisedAt", "Id")
+ .IsDescending();
+
+ b.ToTable("EventLogItems", (string)null);
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedErrorImportEntity", b =>
+ {
+ b.Property("UniqueMessageId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Body")
+ .IsRequired()
+ .HasColumnType("varbinary(max)");
+
+ b.Property("BodyStoredExternally")
+ .HasColumnType("bit");
+
+ b.Property("ExceptionInfo")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("FailedAt")
+ .HasColumnType("datetime2");
+
+ b.Property("HeadersJson")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("MessageId")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.HasKey("UniqueMessageId");
+
+ b.HasIndex("FailedAt");
+
+ b.ToTable("FailedErrorImports");
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedMessageEntity", b =>
+ {
+ b.Property("UniqueMessageId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BodyContentType")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("BodySize")
+ .HasColumnType("int");
+
+ b.Property("BodyStoredExternally")
+ .HasColumnType("bit");
+
+ b.Property("BodyText")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ConversationId")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("ExceptionMessage")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ExceptionType")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("FailingEndpointAddress")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("FirstTimeOfFailure")
+ .HasColumnType("datetime2");
+
+ b.Property("HeadersJson")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("IsSystemMessage")
+ .HasColumnType("bit");
+
+ b.Property("LastAttemptedAt")
+ .HasColumnType("datetime2");
+
+ b.Property("LastModified")
+ .HasColumnType("datetime2");
+
+ b.Property("LastTimeOfFailure")
+ .HasColumnType("datetime2");
+
+ b.Property("MessageId")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("MessageType")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("NumberOfProcessingAttempts")
+ .HasColumnType("int");
+
+ b.Property("QueueAddress")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("ReceivingEndpointHost")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("ReceivingEndpointHostId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ReceivingEndpointName")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("SendingEndpointHost")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("SendingEndpointHostId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("SendingEndpointName")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("Status")
+ .HasColumnType("int");
+
+ b.Property("StatusChangedAt")
+ .HasColumnType("datetime2");
+
+ b.Property("TimeSent")
+ .HasColumnType("datetime2");
+
+ b.HasKey("UniqueMessageId");
+
+ b.HasIndex("ConversationId");
+
+ b.HasIndex("FailingEndpointAddress");
+
+ b.HasIndex("QueueAddress");
+
+ b.HasIndex("ReceivingEndpointName");
+
+ b.HasIndex("StatusChangedAt")
+ .HasFilter("[Status] IN (2, 4)");
+
+ b.HasIndex("TimeSent");
+
+ b.HasIndex("Status", "LastModified");
+
+ b.ToTable("FailedMessages");
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedMessageGroupEntity", b =>
+ {
+ b.Property("FailedMessageUniqueId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("GroupId")
+ .HasMaxLength(64)
+ .HasColumnType("nvarchar(64)");
+
+ b.Property("Title")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Type")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("nvarchar(255)");
+
+ b.HasKey("FailedMessageUniqueId", "GroupId");
+
+ b.HasIndex("GroupId");
+
+ b.ToTable("FailedMessageGroups");
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedMessageRetryEntity", b =>
+ {
+ b.Property("UniqueMessageId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("RetryId")
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.HasKey("UniqueMessageId");
+
+ b.ToTable("FailedMessageRetries");
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.KnownEndpointEntity", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Host")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("HostId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Monitored")
+ .HasColumnType("bit");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.HasKey("Id");
+
+ b.ToTable("KnownEndpoints");
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.SubscriptionEntity", b =>
+ {
+ b.Property("MessageType")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("TransportAddress")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("Endpoint")
+ .IsRequired()
+ .HasMaxLength(450)
+ .HasColumnType("nvarchar(450)");
+
+ b.HasKey("MessageType", "TransportAddress");
+
+ b.ToTable("Subscriptions");
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.TrialMetadataEntity", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("TrialEndDate")
+ .HasColumnType("date");
+
+ b.HasKey("Id");
+
+ b.ToTable("TrialMetadata");
+
+ b.HasData(
+ new
+ {
+ Id = 1
+ });
+ });
+
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.FailedMessageGroupEntity", b =>
+ {
+ b.HasOne("ServiceControl.Persistence.EFCore.Entities.FailedMessageEntity", null)
+ .WithMany()
+ .HasForeignKey("FailedMessageUniqueId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/20260731054124_AddCustomChecks.cs b/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/20260731054124_AddCustomChecks.cs
new file mode 100644
index 0000000000..aa225357ad
--- /dev/null
+++ b/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/20260731054124_AddCustomChecks.cs
@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ServiceControl.Persistence.EFCore.SqlServer.Migrations
+{
+ ///
+ public partial class AddCustomChecks : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.CreateTable(
+ name: "CustomChecks",
+ columns: table => new
+ {
+ Id = table.Column(type: "uniqueidentifier", nullable: false),
+ CustomCheckId = table.Column(type: "nvarchar(max)", nullable: false),
+ Category = table.Column(type: "nvarchar(max)", nullable: false),
+ Status = table.Column(type: "int", nullable: false),
+ ReportedAt = table.Column(type: "datetime2", nullable: false),
+ FailureReason = table.Column(type: "nvarchar(max)", nullable: true),
+ OriginatingEndpointName = table.Column(type: "nvarchar(max)", nullable: false),
+ OriginatingEndpointHostId = table.Column(type: "uniqueidentifier", nullable: false),
+ OriginatingEndpointHost = table.Column(type: "nvarchar(max)", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_CustomChecks", x => x.Id);
+ });
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropTable(
+ name: "CustomChecks");
+ }
+ }
+}
diff --git a/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/SqlServerServiceControlDbContextModelSnapshot.cs b/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/SqlServerServiceControlDbContextModelSnapshot.cs
index b8140a169f..5a73373e8d 100644
--- a/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/SqlServerServiceControlDbContextModelSnapshot.cs
+++ b/src/ServiceControl.Persistence.EFCore.SqlServer/Migrations/SqlServerServiceControlDbContextModelSnapshot.cs
@@ -22,6 +22,44 @@ protected override void BuildModel(ModelBuilder modelBuilder)
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+ modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.CustomCheckEntity", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Category")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("CustomCheckId")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("FailureReason")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("OriginatingEndpointHost")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("OriginatingEndpointHostId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("OriginatingEndpointName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ReportedAt")
+ .HasColumnType("datetime2");
+
+ b.Property("Status")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("CustomChecks");
+ });
+
modelBuilder.Entity("ServiceControl.Persistence.EFCore.Entities.EndpointSettingsEntity", b =>
{
b.Property("Name")
diff --git a/src/ServiceControl.Persistence.EFCore.SqlServer/SqlServerPersistenceConfiguration.cs b/src/ServiceControl.Persistence.EFCore.SqlServer/SqlServerPersistenceConfiguration.cs
index eb1d9e3d18..d61cab607b 100644
--- a/src/ServiceControl.Persistence.EFCore.SqlServer/SqlServerPersistenceConfiguration.cs
+++ b/src/ServiceControl.Persistence.EFCore.SqlServer/SqlServerPersistenceConfiguration.cs
@@ -1,5 +1,6 @@
namespace ServiceControl.Persistence.EFCore.SqlServer;
+using CustomChecks;
using Microsoft.Extensions.Logging;
using ServiceControl.Infrastructure;
using ServiceControl.Persistence.EFCore.Abstractions;
@@ -12,7 +13,9 @@ public override IPersistence Create(PersistenceSettings settings)
LoggerUtil.CreateStaticLogger()
.LogError("The SQL Server persistence is still under development and is not ready for use");
- return new SqlServerPersistence((SqlServerPersisterSettings)settings);
+ var sqlSettings = (SqlServerPersisterSettings)settings;
+
+ return new SqlServerPersistence(sqlSettings);
}
protected override EFPersisterSettings CreateSettings(string connectionString, BodyStorageSettings bodyStorage) =>
diff --git a/src/ServiceControl.Persistence.EFCore/Abstractions/EFPersistenceConfigurationBase.cs b/src/ServiceControl.Persistence.EFCore/Abstractions/EFPersistenceConfigurationBase.cs
index eb936c24bb..9dda44ea66 100644
--- a/src/ServiceControl.Persistence.EFCore/Abstractions/EFPersistenceConfigurationBase.cs
+++ b/src/ServiceControl.Persistence.EFCore/Abstractions/EFPersistenceConfigurationBase.cs
@@ -4,7 +4,7 @@ namespace ServiceControl.Persistence.EFCore.Abstractions;
using ServiceControl.Configuration;
using ServiceControl.Infrastructure;
-public abstract class EFPersistenceConfigurationBase : IPersistenceConfiguration
+public abstract class EFPersistenceConfigurationBase : PersistenceConfiguration, IPersistenceConfiguration
{
const string ConnectionStringKey = "Database/ConnectionString";
const string CommandTimeoutKey = "Database/CommandTimeout";
@@ -192,14 +192,4 @@ static int ReadMaxBodySizeToStore(SettingsRootNamespace settingsRootNamespace)
return maxBodySizeToStore;
}
-
- static T GetRequiredSetting(SettingsRootNamespace settingsRootNamespace, string key)
- {
- if (SettingsReader.TryRead(settingsRootNamespace, key, out var value))
- {
- return value;
- }
-
- throw new Exception($"Setting {key} of type {typeof(T)} is required");
- }
}
diff --git a/src/ServiceControl.Persistence.EFCore/DbContexts/ServiceControlDbContext.cs b/src/ServiceControl.Persistence.EFCore/DbContexts/ServiceControlDbContext.cs
index b6153edd23..29d545d585 100644
--- a/src/ServiceControl.Persistence.EFCore/DbContexts/ServiceControlDbContext.cs
+++ b/src/ServiceControl.Persistence.EFCore/DbContexts/ServiceControlDbContext.cs
@@ -6,6 +6,7 @@ namespace ServiceControl.Persistence.EFCore.DbContexts;
public abstract class ServiceControlDbContext(DbContextOptions options) : DbContext(options)
{
+ public DbSet CustomChecks { get; set; }
public DbSet EndpointSettings { get; set; }
public DbSet KnownEndpoints { get; set; }
public DbSet FailedMessages { get; set; }
@@ -23,6 +24,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
+ modelBuilder.ApplyConfiguration(new CustomCheckConfiguration());
modelBuilder.ApplyConfiguration(new EndpointSettingsConfiguration());
modelBuilder.ApplyConfiguration(new FailedErrorImportConfiguration());
modelBuilder.ApplyConfiguration(new FailedMessageConfiguration());
diff --git a/src/ServiceControl.Persistence.EFCore/Entities/CustomCheckEntity.cs b/src/ServiceControl.Persistence.EFCore/Entities/CustomCheckEntity.cs
new file mode 100644
index 0000000000..4b25aa1467
--- /dev/null
+++ b/src/ServiceControl.Persistence.EFCore/Entities/CustomCheckEntity.cs
@@ -0,0 +1,17 @@
+namespace ServiceControl.Persistence.EFCore.Entities;
+
+public class CustomCheckEntity
+{
+ public required Guid Id { get; set; }
+ public required string CustomCheckId { get; set; }
+ public required string Category { get; set; }
+ public Status Status { get; set; }
+ public DateTime ReportedAt { get; set; }
+ public string? FailureReason { get; set; }
+
+ public required string OriginatingEndpointName { get; set; }
+
+ public Guid OriginatingEndpointHostId { get; set; }
+
+ public required string OriginatingEndpointHost { get; set; }
+}
\ No newline at end of file
diff --git a/src/ServiceControl.Persistence.EFCore/EntityConfigurations/CustomCheckConfiguration.cs b/src/ServiceControl.Persistence.EFCore/EntityConfigurations/CustomCheckConfiguration.cs
new file mode 100644
index 0000000000..53bc67ff9b
--- /dev/null
+++ b/src/ServiceControl.Persistence.EFCore/EntityConfigurations/CustomCheckConfiguration.cs
@@ -0,0 +1,22 @@
+namespace ServiceControl.Persistence.EFCore.EntityConfigurations;
+
+using Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+public class CustomCheckConfiguration : IEntityTypeConfiguration
+{
+ public void Configure(EntityTypeBuilder builder)
+ {
+ builder.HasKey(e => e.Id);
+ builder.Property(e => e.Id).ValueGeneratedNever();
+ builder.Property(e => e.CustomCheckId).IsRequired();
+ builder.Property(e => e.Category).IsRequired();
+ builder.Property(e => e.Status).IsRequired();
+ builder.Property(e => e.ReportedAt).IsRequired();
+ builder.Property(e => e.FailureReason);
+ builder.Property(e => e.OriginatingEndpointName).IsRequired();
+ builder.Property(e => e.OriginatingEndpointHostId).IsRequired();
+ builder.Property(e => e.OriginatingEndpointHost).IsRequired();
+ }
+}
\ No newline at end of file
diff --git a/src/ServiceControl.Persistence.EFCore/Implementation/CustomCheckDataStore.cs b/src/ServiceControl.Persistence.EFCore/Implementation/CustomCheckDataStore.cs
index 9a16177f3d..97e73c929e 100644
--- a/src/ServiceControl.Persistence.EFCore/Implementation/CustomCheckDataStore.cs
+++ b/src/ServiceControl.Persistence.EFCore/Implementation/CustomCheckDataStore.cs
@@ -1,19 +1,88 @@
namespace ServiceControl.Persistence.EFCore.Implementation;
+using System.Text;
+using Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
using ServiceControl.Contracts.CustomChecks;
using ServiceControl.Persistence.Infrastructure;
-public class CustomCheckDataStore : ICustomChecksDataStore
+public class CustomCheckDataStore(IServiceScopeFactory scopeFactory) : DataStoreBase(scopeFactory), ICustomChecksDataStore
{
- public Task UpdateCustomCheckStatus(CustomCheckDetail detail) =>
- throw new NotImplementedException();
+ public Task UpdateCustomCheckStatus(CustomCheckDetail detail) => ExecuteWithDbContext(async context =>
+ {
+ var status = CheckStateChange.Unchanged;
+ var customCheck = await context.CustomChecks.FindAsync(detail.GetDeterministicId());
- public Task>> GetStats(PagingInfo paging, string? status = null) =>
- throw new NotImplementedException();
+ if (customCheck == null ||
+ (customCheck.Status == Status.Fail && !detail.HasFailed) ||
+ (customCheck.Status == Status.Pass && detail.HasFailed))
+ {
+ if (customCheck == null)
+ {
+ customCheck = new CustomCheckEntity
+ {
+ Id = detail.GetDeterministicId(),
+ CustomCheckId = detail.CustomCheckId,
+ Category = detail.Category,
+ OriginatingEndpointName = detail.OriginatingEndpoint.Name,
+ OriginatingEndpointHost = detail.OriginatingEndpoint.Host
+ };
+ context.CustomChecks.Add(customCheck);
+ }
- public Task DeleteCustomCheck(Guid id) =>
- throw new NotImplementedException();
+ status = CheckStateChange.Changed;
+ }
- public Task GetNumberOfFailedChecks() =>
- throw new NotImplementedException();
+ customCheck.CustomCheckId = detail.CustomCheckId;
+ customCheck.Category = detail.Category;
+ customCheck.Status = detail.HasFailed ? Status.Fail : Status.Pass;
+ customCheck.ReportedAt = detail.ReportedAt;
+ customCheck.FailureReason = detail.FailureReason;
+ customCheck.OriginatingEndpointHost = detail.OriginatingEndpoint.Host;
+ customCheck.OriginatingEndpointHostId = detail.OriginatingEndpoint.HostId;
+ customCheck.OriginatingEndpointName = detail.OriginatingEndpoint.Name;
+ await context.SaveChangesAsync();
+ return status;
+ });
+
+ public Task>> GetStats(PagingInfo paging, string? status = null) => ExecuteWithDbContext(async context =>
+ {
+ var query = context.CustomChecks.AsQueryable();
+
+ query = status switch
+ {
+ "pass" => query.Where(c => c.Status == Status.Pass),
+ "fail" => query.Where(c => c.Status == Status.Fail),
+ _ => query
+ };
+
+ var page = await query
+ .OrderBy(c => c.ReportedAt)
+ .Skip(paging.Offset)
+ .Take(paging.PageSize)
+ .ToListAsync();
+
+ return new QueryResult>(page.Select(c => new CustomCheck
+ {
+ Id = c.Id.ToString(),
+ CustomCheckId = c.CustomCheckId,
+ Category = c.Category,
+ Status = c.Status,
+ ReportedAt = c.ReportedAt,
+ FailureReason = c.FailureReason
+ }).ToList(), new QueryStatsInfo("", page.Count, false));
+ });
+
+ public Task DeleteCustomCheck(Guid id) => ExecuteWithDbContext(async context =>
+ {
+ var customCheck = await context.CustomChecks.FindAsync(id);
+ if (customCheck != null)
+ {
+ context.CustomChecks.Remove(customCheck);
+ await context.SaveChangesAsync();
+ }
+ });
+
+ public Task GetNumberOfFailedChecks() => ExecuteWithDbContext(async context => await context.CustomChecks.CountAsync(p => p.Status == Status.Fail));
}
diff --git a/src/ServiceControl.Persistence.RavenDB/RavenPersistenceConfiguration.cs b/src/ServiceControl.Persistence.RavenDB/RavenPersistenceConfiguration.cs
index c9d03685e7..284be4e6d4 100644
--- a/src/ServiceControl.Persistence.RavenDB/RavenPersistenceConfiguration.cs
+++ b/src/ServiceControl.Persistence.RavenDB/RavenPersistenceConfiguration.cs
@@ -8,7 +8,7 @@
using Particular.LicensingComponent.Contracts;
using ServiceControl.Infrastructure;
- class RavenPersistenceConfiguration : IPersistenceConfiguration
+ class RavenPersistenceConfiguration : PersistenceConfiguration, IPersistenceConfiguration
{
public const string DataSpaceRemainingThresholdKey = "DataSpaceRemainingThreshold";
const string AuditRetentionPeriodKey = "AuditRetentionPeriod";
@@ -19,16 +19,6 @@ class RavenPersistenceConfiguration : IPersistenceConfiguration
public PersistenceSettings CreateSettings(SettingsRootNamespace settingsRootNamespace)
{
- static T GetRequiredSetting(SettingsRootNamespace settingsRootNamespace, string key)
- {
- if (SettingsReader.TryRead(settingsRootNamespace, key, out var value))
- {
- return value;
- }
-
- throw new Exception($"Setting {key} of type {typeof(T)} is required");
- }
-
var ravenDbLogLevel = SettingsReader.Read(settingsRootNamespace, RavenBootstrapper.RavenDbLogLevelKey, "Warn");
var logsMode = RavenDbLogLevelToLogsModeMapper.Map(ravenDbLogLevel, LoggerUtil.CreateStaticLogger());
diff --git a/src/ServiceControl.Persistence.Tests.PostgreSql/ApprovalFiles/CustomCheckTests.VerifyCustomChecks.approved.txt b/src/ServiceControl.Persistence.Tests.PostgreSql/ApprovalFiles/CustomCheckTests.VerifyCustomChecks.approved.txt
new file mode 100644
index 0000000000..f3b0cc7462
--- /dev/null
+++ b/src/ServiceControl.Persistence.Tests.PostgreSql/ApprovalFiles/CustomCheckTests.VerifyCustomChecks.approved.txt
@@ -0,0 +1 @@
+Storage space: ServiceControl body storage
\ No newline at end of file
diff --git a/src/ServiceControl.Persistence.Tests.PostgreSql/ServiceControl.Persistence.Tests.PostgreSql.csproj b/src/ServiceControl.Persistence.Tests.PostgreSql/ServiceControl.Persistence.Tests.PostgreSql.csproj
index f236877629..a8cd23fb3c 100644
--- a/src/ServiceControl.Persistence.Tests.PostgreSql/ServiceControl.Persistence.Tests.PostgreSql.csproj
+++ b/src/ServiceControl.Persistence.Tests.PostgreSql/ServiceControl.Persistence.Tests.PostgreSql.csproj
@@ -39,7 +39,6 @@
-
diff --git a/src/ServiceControl.Persistence.Tests.SqlServer/ApprovalFiles/CustomCheckTests.VerifyCustomChecks.approved.txt b/src/ServiceControl.Persistence.Tests.SqlServer/ApprovalFiles/CustomCheckTests.VerifyCustomChecks.approved.txt
new file mode 100644
index 0000000000..f3b0cc7462
--- /dev/null
+++ b/src/ServiceControl.Persistence.Tests.SqlServer/ApprovalFiles/CustomCheckTests.VerifyCustomChecks.approved.txt
@@ -0,0 +1 @@
+Storage space: ServiceControl body storage
\ No newline at end of file
diff --git a/src/ServiceControl.Persistence.Tests.SqlServer/ServiceControl.Persistence.Tests.SqlServer.csproj b/src/ServiceControl.Persistence.Tests.SqlServer/ServiceControl.Persistence.Tests.SqlServer.csproj
index 4301efc8a4..af49f36dcd 100644
--- a/src/ServiceControl.Persistence.Tests.SqlServer/ServiceControl.Persistence.Tests.SqlServer.csproj
+++ b/src/ServiceControl.Persistence.Tests.SqlServer/ServiceControl.Persistence.Tests.SqlServer.csproj
@@ -39,7 +39,6 @@
-
diff --git a/src/ServiceControl.Persistence.Tests.RavenDB/CustomCheckTests.cs b/src/ServiceControl.Persistence.Tests/CustomCheckTests.cs
similarity index 94%
rename from src/ServiceControl.Persistence.Tests.RavenDB/CustomCheckTests.cs
rename to src/ServiceControl.Persistence.Tests/CustomCheckTests.cs
index 31572a7855..34fd2ece69 100644
--- a/src/ServiceControl.Persistence.Tests.RavenDB/CustomCheckTests.cs
+++ b/src/ServiceControl.Persistence.Tests/CustomCheckTests.cs
@@ -1,4 +1,4 @@
-namespace ServiceControl.Persistence.Tests.RavenDB
+namespace ServiceControl.Persistence.Tests
{
using System;
using System.Linq;
diff --git a/src/ServiceControl.Persistence/PersistenceConfiguration.cs b/src/ServiceControl.Persistence/PersistenceConfiguration.cs
new file mode 100644
index 0000000000..e095843cfd
--- /dev/null
+++ b/src/ServiceControl.Persistence/PersistenceConfiguration.cs
@@ -0,0 +1,17 @@
+namespace ServiceControl.Persistence;
+
+using System;
+using Configuration;
+
+public abstract class PersistenceConfiguration
+{
+ protected static T GetRequiredSetting(SettingsRootNamespace settingsRootNamespace, string key)
+ {
+ if (SettingsReader.TryRead(settingsRootNamespace, key, out var value))
+ {
+ return value;
+ }
+
+ throw new Exception($"Setting {key} of type {typeof(T)} is required");
+ }
+}
\ No newline at end of file
diff --git a/src/ServiceControl.Persistence/PersistenceSettings.cs b/src/ServiceControl.Persistence/PersistenceSettings.cs
index d0475801bb..70205f9834 100644
--- a/src/ServiceControl.Persistence/PersistenceSettings.cs
+++ b/src/ServiceControl.Persistence/PersistenceSettings.cs
@@ -3,7 +3,7 @@
using System;
///
- /// Marker interface used to serialize persister settings in REST API
+ /// Base settings that apply across all Persisters
///
public abstract class PersistenceSettings
{