This commit is contained in:
@@ -50,14 +50,14 @@ namespace AyaNova.Api.Controllers
|
|||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get minute frequency server metrics for time period specified
|
/// Get Memory and CPU server metrics for time period specified
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="tsStart">Start timestamp UTC</param>
|
/// <param name="tsStart">Start timestamp UTC</param>
|
||||||
/// <param name="tsEnd">End timestamp UTC</param>
|
/// <param name="tsEnd">End timestamp UTC</param>
|
||||||
/// <param name="maxRecords">Optional maximum records to return (downsampled). There is a 400 record maximum fixed default</param>
|
/// <param name="maxRecords">Optional maximum records to return (downsampled). There is a 400 record maximum fixed default</param>
|
||||||
/// <returns>Snapshot of metrics</returns>
|
/// <returns>Snapshot of metrics</returns>
|
||||||
[HttpGet("mm")]
|
[HttpGet("memcpu")]
|
||||||
public async Task<IActionResult> GetMMMetrics([FromQuery, Required] DateTime? tsStart, [FromQuery, Required] DateTime? tsEnd, [FromQuery] int? maxRecords)
|
public async Task<IActionResult> GetMemCPUetrics([FromQuery, Required] DateTime? tsStart, [FromQuery, Required] DateTime? tsEnd, [FromQuery] int? maxRecords)
|
||||||
{
|
{
|
||||||
//Note: the date and times are nullable and required so that the regular modelstate code kicks in to ensure they are present
|
//Note: the date and times are nullable and required so that the regular modelstate code kicks in to ensure they are present
|
||||||
if (serverState.IsClosed)
|
if (serverState.IsClosed)
|
||||||
@@ -96,7 +96,7 @@ namespace AyaNova.Api.Controllers
|
|||||||
var dsGen2 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen2)).ToList();
|
var dsGen2 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen2)).ToList();
|
||||||
dsGen2 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen2, (int)maxRecords) as List<Tuple<double, double>>;
|
dsGen2 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen2, (int)maxRecords) as List<Tuple<double, double>>;
|
||||||
|
|
||||||
var MetricMM = new
|
var Metric = new
|
||||||
{
|
{
|
||||||
cpu = dsCPU.Select(z => new MetricDouble(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
cpu = dsCPU.Select(z => new MetricDouble(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
||||||
gen0 = dsGen0.Select(z => new MetricInt(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
gen0 = dsGen0.Select(z => new MetricInt(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
||||||
@@ -107,95 +107,88 @@ namespace AyaNova.Api.Controllers
|
|||||||
privateBytes = dsPrivateBytes.Select(z => new MetricLong(DateTime.FromOADate(z.Item1), z.Item2 / MB)).ToArray()
|
privateBytes = dsPrivateBytes.Select(z => new MetricLong(DateTime.FromOADate(z.Item1), z.Item2 / MB)).ToArray()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
var ret = new
|
|
||||||
{
|
|
||||||
MetricMM = MetricMM
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct);
|
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct);
|
||||||
return Ok(ApiOkResponse.Response(ret));
|
return Ok(ApiOkResponse.Response(Metric));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// /// <summary>
|
||||||
|
// /// Get hourly server metrics for time period specified
|
||||||
|
// /// </summary>
|
||||||
|
// /// <param name="tsStart">Start timestamp UTC</param>
|
||||||
|
// /// <param name="tsEnd">End timestamp UTC</param>
|
||||||
|
// /// <param name="maxRecords">Optional maximum records to return (downsampled). There is a 400 record maximum fixed default</param>
|
||||||
|
// /// <returns>Snapshot of metrics</returns>
|
||||||
|
// [HttpGet("hh")]
|
||||||
|
// public async Task<IActionResult> GetHHMetrics([FromQuery, Required] DateTime? tsStart, [FromQuery, Required] DateTime? tsEnd, [FromQuery] int? maxRecords)
|
||||||
|
// {
|
||||||
|
// //Note: the date and times are nullable and required so that the regular modelstate code kicks in to ensure they are present
|
||||||
|
// 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());
|
||||||
|
// if (!ModelState.IsValid)
|
||||||
|
// return BadRequest(new ApiErrorResponse(ModelState));
|
||||||
|
|
||||||
|
// maxRecords ??= DEFAULT_MAX_RECORDS;
|
||||||
|
|
||||||
|
// List<MetricMM> MinuteMetrics = new List<MetricMM>();
|
||||||
|
// //touniversal is because the parameters are converted to local time here
|
||||||
|
// //but then sent to the query as local time as well and not universal time which is what it should be
|
||||||
|
// MinuteMetrics = await ct.MetricMM.AsNoTracking().Where(z => z.t >= ((DateTime)tsStart).ToUniversalTime() && z.t <= ((DateTime)tsEnd).ToUniversalTime()).OrderBy(z => z.t).ToListAsync();
|
||||||
|
|
||||||
|
|
||||||
|
// var dsCPU = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.CPU)).ToList();
|
||||||
|
// dsCPU = Util.DataUtil.LargestTriangleThreeBuckets(dsCPU, (int)maxRecords) as List<Tuple<double, double>>;
|
||||||
|
|
||||||
|
// var dsAllocated = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Allocated)).ToList();
|
||||||
|
// dsAllocated = Util.DataUtil.LargestTriangleThreeBuckets(dsAllocated, (int)maxRecords) as List<Tuple<double, double>>;
|
||||||
|
|
||||||
|
// var dsWorkingSet = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.WorkingSet)).ToList();
|
||||||
|
// dsWorkingSet = Util.DataUtil.LargestTriangleThreeBuckets(dsWorkingSet, (int)maxRecords) as List<Tuple<double, double>>;
|
||||||
|
|
||||||
|
// var dsPrivateBytes = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.PrivateBytes)).ToList();
|
||||||
|
// dsPrivateBytes = Util.DataUtil.LargestTriangleThreeBuckets(dsPrivateBytes, (int)maxRecords) as List<Tuple<double, double>>;
|
||||||
|
|
||||||
|
// var dsGen0 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen0)).ToList();
|
||||||
|
// dsGen0 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen0, (int)maxRecords) as List<Tuple<double, double>>;
|
||||||
|
|
||||||
|
// var dsGen1 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen1)).ToList();
|
||||||
|
// dsGen1 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen1, (int)maxRecords) as List<Tuple<double, double>>;
|
||||||
|
|
||||||
|
// var dsGen2 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen2)).ToList();
|
||||||
|
// dsGen2 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen2, (int)maxRecords) as List<Tuple<double, double>>;
|
||||||
|
|
||||||
|
// var MetricMM = new
|
||||||
|
// {
|
||||||
|
// cpu = dsCPU.Select(z => new MetricDouble(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
||||||
|
// gen0 = dsGen0.Select(z => new MetricInt(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
||||||
|
// gen1 = dsGen1.Select(z => new MetricInt(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
||||||
|
// gen2 = dsGen2.Select(z => new MetricInt(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
||||||
|
// allocated = dsAllocated.Select(z => new MetricLong(DateTime.FromOADate(z.Item1), z.Item2 / MB)).ToArray(),
|
||||||
|
// workingSet = dsWorkingSet.Select(z => new MetricLong(DateTime.FromOADate(z.Item1), z.Item2 / MB)).ToArray(),
|
||||||
|
// privateBytes = dsPrivateBytes.Select(z => new MetricLong(DateTime.FromOADate(z.Item1), z.Item2 / MB)).ToArray()
|
||||||
|
// };
|
||||||
|
|
||||||
|
|
||||||
|
// var ret = new
|
||||||
|
// {
|
||||||
|
// MetricMM = MetricMM
|
||||||
|
|
||||||
|
// };
|
||||||
|
|
||||||
|
// await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct);
|
||||||
|
// return Ok(ApiOkResponse.Response(ret));
|
||||||
|
// }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get hourly server metrics for time period specified
|
/// Get storage server metrics for time period specified
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="tsStart">Start timestamp UTC</param>
|
/// <param name="tsStart">Start timestamp UTC</param>
|
||||||
/// <param name="tsEnd">End timestamp UTC</param>
|
/// <param name="tsEnd">End timestamp UTC</param>
|
||||||
/// <param name="maxRecords">Optional maximum records to return (downsampled). There is a 400 record maximum fixed default</param>
|
/// <param name="maxRecords">Optional maximum records to return (downsampled). There is a 400 record maximum fixed default</param>
|
||||||
/// <returns>Snapshot of metrics</returns>
|
/// <returns>Snapshot of metrics</returns>
|
||||||
[HttpGet("hh")]
|
[HttpGet("storage")]
|
||||||
public async Task<IActionResult> GetHHMetrics([FromQuery, Required] DateTime? tsStart, [FromQuery, Required] DateTime? tsEnd, [FromQuery] int? maxRecords)
|
public async Task<IActionResult> GetStorageMetrics([FromQuery, Required] DateTime? tsStart, [FromQuery, Required] DateTime? tsEnd, [FromQuery] int? maxRecords)
|
||||||
{
|
|
||||||
//Note: the date and times are nullable and required so that the regular modelstate code kicks in to ensure they are present
|
|
||||||
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());
|
|
||||||
if (!ModelState.IsValid)
|
|
||||||
return BadRequest(new ApiErrorResponse(ModelState));
|
|
||||||
|
|
||||||
maxRecords ??= DEFAULT_MAX_RECORDS;
|
|
||||||
|
|
||||||
List<MetricMM> MinuteMetrics = new List<MetricMM>();
|
|
||||||
//touniversal is because the parameters are converted to local time here
|
|
||||||
//but then sent to the query as local time as well and not universal time which is what it should be
|
|
||||||
MinuteMetrics = await ct.MetricMM.AsNoTracking().Where(z => z.t >= ((DateTime)tsStart).ToUniversalTime() && z.t <= ((DateTime)tsEnd).ToUniversalTime()).OrderBy(z => z.t).ToListAsync();
|
|
||||||
|
|
||||||
|
|
||||||
var dsCPU = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.CPU)).ToList();
|
|
||||||
dsCPU = Util.DataUtil.LargestTriangleThreeBuckets(dsCPU, (int)maxRecords) as List<Tuple<double, double>>;
|
|
||||||
|
|
||||||
var dsAllocated = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Allocated)).ToList();
|
|
||||||
dsAllocated = Util.DataUtil.LargestTriangleThreeBuckets(dsAllocated, (int)maxRecords) as List<Tuple<double, double>>;
|
|
||||||
|
|
||||||
var dsWorkingSet = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.WorkingSet)).ToList();
|
|
||||||
dsWorkingSet = Util.DataUtil.LargestTriangleThreeBuckets(dsWorkingSet, (int)maxRecords) as List<Tuple<double, double>>;
|
|
||||||
|
|
||||||
var dsPrivateBytes = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.PrivateBytes)).ToList();
|
|
||||||
dsPrivateBytes = Util.DataUtil.LargestTriangleThreeBuckets(dsPrivateBytes, (int)maxRecords) as List<Tuple<double, double>>;
|
|
||||||
|
|
||||||
var dsGen0 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen0)).ToList();
|
|
||||||
dsGen0 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen0, (int)maxRecords) as List<Tuple<double, double>>;
|
|
||||||
|
|
||||||
var dsGen1 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen1)).ToList();
|
|
||||||
dsGen1 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen1, (int)maxRecords) as List<Tuple<double, double>>;
|
|
||||||
|
|
||||||
var dsGen2 = MinuteMetrics.Select(z => new Tuple<double, double>(z.t.ToOADate(), z.Gen2)).ToList();
|
|
||||||
dsGen2 = Util.DataUtil.LargestTriangleThreeBuckets(dsGen2, (int)maxRecords) as List<Tuple<double, double>>;
|
|
||||||
|
|
||||||
var MetricMM = new
|
|
||||||
{
|
|
||||||
cpu = dsCPU.Select(z => new MetricDouble(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
|
||||||
gen0 = dsGen0.Select(z => new MetricInt(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
|
||||||
gen1 = dsGen1.Select(z => new MetricInt(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
|
||||||
gen2 = dsGen2.Select(z => new MetricInt(DateTime.FromOADate(z.Item1), z.Item2)).ToArray(),
|
|
||||||
allocated = dsAllocated.Select(z => new MetricLong(DateTime.FromOADate(z.Item1), z.Item2 / MB)).ToArray(),
|
|
||||||
workingSet = dsWorkingSet.Select(z => new MetricLong(DateTime.FromOADate(z.Item1), z.Item2 / MB)).ToArray(),
|
|
||||||
privateBytes = dsPrivateBytes.Select(z => new MetricLong(DateTime.FromOADate(z.Item1), z.Item2 / MB)).ToArray()
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
var ret = new
|
|
||||||
{
|
|
||||||
MetricMM = MetricMM
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct);
|
|
||||||
return Ok(ApiOkResponse.Response(ret));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get daily server metrics for time period specified
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="tsStart">Start timestamp UTC</param>
|
|
||||||
/// <param name="tsEnd">End timestamp UTC</param>
|
|
||||||
/// <param name="maxRecords">Optional maximum records to return (downsampled). There is a 400 record maximum fixed default</param>
|
|
||||||
/// <returns>Snapshot of metrics</returns>
|
|
||||||
[HttpGet("dd")]
|
|
||||||
public async Task<IActionResult> GetDDMetrics([FromQuery, Required] DateTime? tsStart, [FromQuery, Required] DateTime? tsEnd, [FromQuery] int? maxRecords)
|
|
||||||
{
|
{
|
||||||
//Note: the date and times are nullable and required so that the regular modelstate code kicks in to ensure they are present
|
//Note: the date and times are nullable and required so that the regular modelstate code kicks in to ensure they are present
|
||||||
if (serverState.IsClosed)
|
if (serverState.IsClosed)
|
||||||
|
|||||||
Reference in New Issue
Block a user