Fix data types and response

This commit is contained in:
Damodar Lohani 2025-04-08 08:52:12 +00:00
parent 8d0cdb8e7f
commit 080350f7ad
4 changed files with 28 additions and 20 deletions

View file

@ -131,13 +131,15 @@ class Get extends Base
'deploymentsTotal' => $usage[$metrics[0]]['total'],
'deploymentsStorageTotal' => $usage[$metrics[1]]['total'],
'buildsTotal' => $usage[$metrics[2]]['total'],
'buildsSuccess' => $usage[$metrics[9]]['total'],
'buildsFailed' => $usage[$metrics[10]]['total'],
'buildsSuccessTotal' => $usage[$metrics[9]]['total'],
'buildsFailedTotal' => $usage[$metrics[10]]['total'],
'buildsStorageTotal' => $usage[$metrics[3]]['total'],
'buildsTimeTotal' => $usage[$metrics[4]]['total'],
'buildsTimeAverage' => (int) ($usage[$metrics[4]]['total'] / $usage[$metrics[2]]['total']),
'executionsTotal' => $usage[$metrics[5]]['total'],
'executionsTimeTotal' => $usage[$metrics[6]]['total'],
'buildsMbSecondsTotal' => $usage[$metrics[7]]['total'],
'executionsMbSecondsTotal' => $usage[$metrics[8]]['total'],
'deployments' => $usage[$metrics[0]]['data'],
'deploymentsStorage' => $usage[$metrics[1]]['data'],
'builds' => $usage[$metrics[2]]['data'],
@ -145,10 +147,10 @@ class Get extends Base
'buildsTime' => $usage[$metrics[4]]['data'],
'executions' => $usage[$metrics[5]]['data'],
'executionsTime' => $usage[$metrics[6]]['data'],
'buildsMbSecondsTotal' => $usage[$metrics[7]]['total'],
'buildsMbSeconds' => $usage[$metrics[7]]['data'],
'executionsMbSeconds' => $usage[$metrics[8]]['data'],
'executionsMbSecondsTotal' => $usage[$metrics[8]]['total']
'buildsSuccess' => $usage[$metrics[9]]['data'],
'buildsFailed' => $usage[$metrics[10]]['data'],
]), Response::MODEL_USAGE_FUNCTION);
}
}

View file

@ -70,6 +70,8 @@ class XList extends Base
str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_EXECUTIONS_COMPUTE),
str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_BUILDS_MB_SECONDS),
str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_EXECUTIONS_MB_SECONDS),
str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_BUILDS_SUCCESS),
str_replace("{resourceType}", RESOURCE_TYPE_FUNCTIONS, METRIC_RESOURCE_TYPE_BUILDS_FAILED),
];
Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
@ -125,6 +127,10 @@ class XList extends Base
'buildsTimeTotal' => $usage[$metrics[5]]['total'],
'executionsTotal' => $usage[$metrics[6]]['total'],
'executionsTimeTotal' => $usage[$metrics[7]]['total'],
'buildsMbSecondsTotal' => $usage[$metrics[8]]['total'],
'executionsMbSecondsTotal' => $usage[$metrics[9]]['total'],
'buildsSuccessTotal' => $usage[$metrics[10]]['total'],
'buildsFailedTotal' => $usage[$metrics[11]]['total'],
'functions' => $usage[$metrics[0]]['data'],
'deployments' => $usage[$metrics[1]]['data'],
'deploymentsStorage' => $usage[$metrics[2]]['data'],
@ -133,10 +139,10 @@ class XList extends Base
'buildsTime' => $usage[$metrics[5]]['data'],
'executions' => $usage[$metrics[6]]['data'],
'executionsTime' => $usage[$metrics[7]]['data'],
'buildsMbSecondsTotal' => $usage[$metrics[8]]['total'],
'buildsMbSeconds' => $usage[$metrics[8]]['data'],
'executionsMbSeconds' => $usage[$metrics[9]]['data'],
'executionsMbSecondsTotal' => $usage[$metrics[9]]['total'],
'buildsSuccess' => $usage[$metrics[10]]['data'],
'buildsFailed' => $usage[$metrics[11]]['data'],
]), Response::MODEL_USAGE_FUNCTIONS);
}
}

View file

@ -19,8 +19,8 @@ class UsageSite extends UsageFunction
->addRule('requests', [
'type' => Response::MODEL_METRIC,
'description' => 'Aggregated number of sites per period.',
'default' => 0,
'example' => 0,
'default' => [],
'example' => [],
'array' => true
])
->addRule('inboundTotal', [
@ -32,8 +32,8 @@ class UsageSite extends UsageFunction
->addRule('inbound', [
'type' => Response::MODEL_METRIC,
'description' => 'Aggregated number of sites per period.',
'default' => 0,
'example' => 0,
'default' => [],
'example' => [],
'array' => true
])
->addRule('outboundTotal', [
@ -45,8 +45,8 @@ class UsageSite extends UsageFunction
->addRule('outbound', [
'type' => Response::MODEL_METRIC,
'description' => 'Aggregated number of sites per period.',
'default' => 0,
'example' => 0,
'default' => [],
'example' => [],
'array' => true
])
;

View file

@ -21,8 +21,8 @@ class UsageSites extends UsageFunctions
->addRule('sites', [
'type' => Response::MODEL_METRIC,
'description' => 'Aggregated number of sites per period.',
'default' => 0,
'example' => 0,
'default' => [],
'example' => [],
'array' => true
])
->addRule('requestsTotal', [
@ -34,8 +34,8 @@ class UsageSites extends UsageFunctions
->addRule('requests', [
'type' => Response::MODEL_METRIC,
'description' => 'Aggregated number of sites per period.',
'default' => 0,
'example' => 0,
'default' => [],
'example' => [],
'array' => true
])
->addRule('inboundTotal', [
@ -47,8 +47,8 @@ class UsageSites extends UsageFunctions
->addRule('inbound', [
'type' => Response::MODEL_METRIC,
'description' => 'Aggregated number of sites per period.',
'default' => 0,
'example' => 0,
'default' => [],
'example' => [],
'array' => true
])
->addRule('outboundTotal', [
@ -60,8 +60,8 @@ class UsageSites extends UsageFunctions
->addRule('outbound', [
'type' => Response::MODEL_METRIC,
'description' => 'Aggregated number of sites per period.',
'default' => 0,
'example' => 0,
'default' => [],
'example' => [],
'array' => true
])
;