usage cleanup
This commit is contained in:
parent
205372519c
commit
d80bd75b6d
4 changed files with 18 additions and 7 deletions
|
@ -29,6 +29,7 @@ App::get('/v1/project/usage')
|
||||||
$stats = $usage = [];
|
$stats = $usage = [];
|
||||||
$days = $periods[$range];
|
$days = $periods[$range];
|
||||||
$metrics = [
|
$metrics = [
|
||||||
|
'requests',
|
||||||
'network.inbound',
|
'network.inbound',
|
||||||
'network.outbound',
|
'network.outbound',
|
||||||
'executions',
|
'executions',
|
||||||
|
@ -79,12 +80,13 @@ App::get('/v1/project/usage')
|
||||||
|
|
||||||
$response->dynamic(new Document([
|
$response->dynamic(new Document([
|
||||||
'range' => $range,
|
'range' => $range,
|
||||||
'network' => ($usage[$metrics[0]] + $usage[$metrics[1]]),
|
'requests' => ($usage[$metrics[0]]),
|
||||||
'executions' => $usage[$metrics[2]],
|
'network' => ($usage[$metrics[1]] + $usage[$metrics[2]]),
|
||||||
'documents' => $usage[$metrics[3]],
|
'executions' => $usage[$metrics[3]],
|
||||||
'databases' => $usage[$metrics[4]],
|
'documents' => $usage[$metrics[4]],
|
||||||
'users' => $usage[$metrics[5]],
|
'databases' => $usage[$metrics[5]],
|
||||||
'storage' => $usage[$metrics[6]],
|
'users' => $usage[$metrics[6]],
|
||||||
|
'storage' => $usage[$metrics[7]],
|
||||||
'buckets' => $usage[$metrics[8]],
|
'buckets' => $usage[$metrics[8]],
|
||||||
]), Response::MODEL_USAGE_PROJECT);
|
]), Response::MODEL_USAGE_PROJECT);
|
||||||
});
|
});
|
||||||
|
|
|
@ -64,6 +64,7 @@ $databaseListener = function (string $event, array $args, Document $project, Usa
|
||||||
$queueForUsage->addMetric("teams", $value); // per project
|
$queueForUsage->addMetric("teams", $value); // per project
|
||||||
break;
|
break;
|
||||||
case $document->getCollection() === 'users':
|
case $document->getCollection() === 'users':
|
||||||
|
var_dump($document);
|
||||||
$queueForUsage->addMetric("users", $value); // per project
|
$queueForUsage->addMetric("users", $value); // per project
|
||||||
break;
|
break;
|
||||||
case $document->getCollection() === 'sessions': // Todo sessions count offset issue
|
case $document->getCollection() === 'sessions': // Todo sessions count offset issue
|
||||||
|
|
|
@ -39,6 +39,7 @@ use Appwrite\Network\Validator\URL;
|
||||||
use Appwrite\OpenSSL\OpenSSL;
|
use Appwrite\OpenSSL\OpenSSL;
|
||||||
use Appwrite\URL\URL as AppwriteURL;
|
use Appwrite\URL\URL as AppwriteURL;
|
||||||
use Utopia\App;
|
use Utopia\App;
|
||||||
|
use Utopia\Queue\Connection;
|
||||||
use Utopia\Validator\Range;
|
use Utopia\Validator\Range;
|
||||||
use Utopia\Validator\WhiteList;
|
use Utopia\Validator\WhiteList;
|
||||||
use Utopia\Database\ID;
|
use Utopia\Database\ID;
|
||||||
|
@ -96,7 +97,7 @@ const APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT = 60; // Default maximum write rate pe
|
||||||
const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
|
const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
|
||||||
const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
|
const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
|
||||||
const APP_CACHE_BUSTER = 501;
|
const APP_CACHE_BUSTER = 501;
|
||||||
const APP_VERSION_STABLE = '1.1.2';
|
const APP_VERSION_STABLE = '1.1.1';
|
||||||
const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
|
const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
|
||||||
const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
|
const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
|
||||||
const APP_DATABASE_ATTRIBUTE_IP = 'ip';
|
const APP_DATABASE_ATTRIBUTE_IP = 'ip';
|
||||||
|
|
|
@ -16,6 +16,13 @@ class UsageProject extends Model
|
||||||
'default' => '',
|
'default' => '',
|
||||||
'example' => '30d',
|
'example' => '30d',
|
||||||
])
|
])
|
||||||
|
->addRule('requests', [
|
||||||
|
'type' => Response::MODEL_METRIC,
|
||||||
|
'description' => 'Aggregated stats for number of requests.',
|
||||||
|
'default' => [],
|
||||||
|
'example' => [],
|
||||||
|
'array' => true
|
||||||
|
])
|
||||||
->addRule('network', [
|
->addRule('network', [
|
||||||
'type' => Response::MODEL_METRIC,
|
'type' => Response::MODEL_METRIC,
|
||||||
'description' => 'Aggregated stats for consumed bandwidth.',
|
'description' => 'Aggregated stats for consumed bandwidth.',
|
||||||
|
|
Loading…
Reference in a new issue