diff --git a/server/AyaNova/Controllers/ServerMetricsController.cs b/server/AyaNova/Controllers/ServerMetricsController.cs
new file mode 100644
index 00000000..88f604b8
--- /dev/null
+++ b/server/AyaNova/Controllers/ServerMetricsController.cs
@@ -0,0 +1,127 @@
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
+
+using AyaNova.Models;
+using AyaNova.Api.ControllerHelpers;
+using AyaNova.Biz;
+
+
+namespace AyaNova.Api.Controllers
+{
+
+    /// <summary>
+    /// Server metrics
+    /// </summary>
+    [ApiController]
+    [ApiVersion("8.0")]
+    [Route("api/v{version:apiVersion}/metric")]
+    [Authorize]
+    public class ServerMetricsController : ControllerBase
+    {
+        private readonly AyContext ct;
+        private readonly ILogger<LogFilesController> log;
+        private readonly ApiServerState serverState;
+      
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="dbcontext"></param>
+        /// <param name="logger"></param>
+        /// <param name="apiServerState"></param>
+        
+        public ServerMetricsController(AyContext dbcontext, ILogger<LogFilesController> logger, ApiServerState apiServerState)
+        {
+            ct = dbcontext;
+            log = logger;
+            serverState = apiServerState;            
+        }
+
+
+        /// <summary>
+        /// Get metrics as text document
+        /// </summary>        
+        /// <returns>Snapshot of metrics</returns>
+        [HttpGet("textsnapshot")]
+        public async Task<IActionResult> GetMetrics()
+        {
+            if (serverState.IsClosed)
+                return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
+
+            if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.Metrics))
+            {
+                return StatusCode(403, new ApiNotAuthorizedResponse());
+            }
+
+            string sResult = await GetTheMetrics("plain");
+
+            //Log
+            await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct);
+
+            return Content(sResult);
+        }
+
+
+        /// <summary>
+        /// Get metrics as json object
+        /// </summary>        
+        /// <returns>Snapshot of metrics</returns>
+        [HttpGet("jsonsnapshot")]
+        public async Task<IActionResult> GetJsonMetrics()
+        {
+            if (serverState.IsClosed)
+                return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
+
+            if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.Metrics))
+            {
+                return StatusCode(403, new ApiNotAuthorizedResponse());
+            }
+
+            string sResult = await GetTheMetrics("json");
+            JObject json = JObject.Parse(sResult);
+
+            //Log
+            await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct);
+
+            return Ok(ApiOkResponse.Response(json));
+        }
+
+        /// <summary>
+        /// Get the metrics snapshot
+        /// </summary>
+        /// <param name="format">Either "json" for json format or "plain" for plaintext format</param>
+        /// <returns></returns>
+        private async Task<string> GetTheMetrics(string format)
+        {
+            var snapshot = metrics.Snapshot.Get();
+
+            var formatters = ((IMetricsRoot)metrics).OutputMetricsFormatters;
+            string sResult = $"ERROR GETTING METRICS IN {format} FORMAT";
+
+            foreach (var formatter in formatters)
+            {
+                if (formatter.MediaType.Format == format)
+                {
+                    using (var stream = new MemoryStream())
+                    {
+                        await formatter.WriteAsync(stream, snapshot);
+                        sResult = System.Text.Encoding.UTF8.GetString(stream.ToArray());
+                    }
+                }
+            }
+
+            return sResult;
+        }
+
+
+        //------------
+
+
+    }
+}
\ No newline at end of file