diff --git a/src/Seq.Api/Model/Diagnostics/ServerMetricsEntity.cs b/src/Seq.Api/Model/Diagnostics/ServerMetricsPart.cs
similarity index 80%
rename from src/Seq.Api/Model/Diagnostics/ServerMetricsEntity.cs
rename to src/Seq.Api/Model/Diagnostics/ServerMetricsPart.cs
index 9342d2c..9b75681 100644
--- a/src/Seq.Api/Model/Diagnostics/ServerMetricsEntity.cs
+++ b/src/Seq.Api/Model/Diagnostics/ServerMetricsPart.cs
@@ -13,19 +13,19 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 
 namespace Seq.Api.Model.Diagnostics
 {
     /// <summary>
     /// Metrics describing the state and performance of the Seq server.
     /// </summary>
-    public class ServerMetricsEntity : Entity
+    /// <remarks>This information is not preserved across server restarts or fail-over.</remarks>
+    public class ServerMetricsPart
     {
         /// <summary>
-        /// Construct a <see cref="ServerMetricsEntity"/>.
+        /// Construct a <see cref="ServerMetricsPart"/>.
         /// </summary>
-        public ServerMetricsEntity()
+        public ServerMetricsPart()
         {
         }
 
@@ -34,6 +34,16 @@ public ServerMetricsEntity()
         /// </summary>
         public long? EventStoreDiskRemainingBytes { get; set; }
 
+        /// <summary>
+        /// The total time spent indexing the event store in the last 24 hours.
+        /// </summary>
+        public TimeSpan EventStoreIndexingTimeLastDay { get; set; }
+
+        /// <summary>
+        /// The total time spent writing events to disk in the last minute.
+        /// </summary>
+        public TimeSpan EventStoreWriteTimeLastMinute { get; set; }
+
         /// <summary>
         /// The number of events that arrived at the ingestion endpoint in the past minute.
         /// </summary>
diff --git a/src/Seq.Api/Model/Indexes/IndexEntity.cs b/src/Seq.Api/Model/Indexes/IndexEntity.cs
index c2ea190..6b92295 100644
--- a/src/Seq.Api/Model/Indexes/IndexEntity.cs
+++ b/src/Seq.Api/Model/Indexes/IndexEntity.cs
@@ -1,4 +1,4 @@
-    namespace Seq.Api.Model.Indexes
+namespace Seq.Api.Model.Indexes
 {
     /// <summary>
     /// An index over the event stream. May be one of several types discriminated by <see cref="IndexedEntityType"/>.
diff --git a/src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs b/src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs
index d1616b9..5ba40d8 100644
--- a/src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs
@@ -38,9 +38,9 @@ internal DiagnosticsResourceGroup(ILoadResourceGroup connection)
         /// </summary>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
         /// <returns>Current server metrics.</returns>
-        public async Task<ServerMetricsEntity> GetServerMetricsAsync(CancellationToken cancellationToken = default)
+        public async Task<ServerMetricsPart> GetServerMetricsAsync(CancellationToken cancellationToken = default)
         {
-            return await GroupGetAsync<ServerMetricsEntity>("ServerMetrics", cancellationToken: cancellationToken).ConfigureAwait(false);
+            return await GroupGetAsync<ServerMetricsPart>("ServerMetrics", cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/src/Seq.Api/ResourceGroups/ExpressionIndexesResourceGroup.cs b/src/Seq.Api/ResourceGroups/ExpressionIndexesResourceGroup.cs
index fb4c550..b804093 100644
--- a/src/Seq.Api/ResourceGroups/ExpressionIndexesResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/ExpressionIndexesResourceGroup.cs
@@ -3,7 +3,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Seq.Api.Model;
-using Seq.Api.Model.Indexes;
 using Seq.Api.Model.Indexing;
 
 namespace Seq.Api.ResourceGroups