Backfill usage stats with empty records when required
This commit is contained in:
parent
275dd70a04
commit
656471ced2
5 changed files with 140 additions and 14 deletions
|
@ -323,10 +323,13 @@ App::get('/v1/database/usage')
|
||||||
|
|
||||||
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
||||||
foreach ($metrics as $metric) {
|
foreach ($metrics as $metric) {
|
||||||
|
$limit = $period[$range]['limit'];
|
||||||
|
$period = $period[$range]['period'];
|
||||||
|
|
||||||
$requestDocs = $dbForInternal->find('stats', [
|
$requestDocs = $dbForInternal->find('stats', [
|
||||||
new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
|
new Query('period', Query::TYPE_EQUAL, [$period]),
|
||||||
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
||||||
], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
|
], $limit, 0, ['time'], [Database::ORDER_DESC]);
|
||||||
|
|
||||||
$stats[$metric] = [];
|
$stats[$metric] = [];
|
||||||
foreach ($requestDocs as $requestDoc) {
|
foreach ($requestDocs as $requestDoc) {
|
||||||
|
@ -335,6 +338,21 @@ App::get('/v1/database/usage')
|
||||||
'date' => $requestDoc->getAttribute('time'),
|
'date' => $requestDoc->getAttribute('time'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// backfill metrics with empty values for graphs
|
||||||
|
$backfill = $limit - \count($requestDocs);
|
||||||
|
while ($backfill > 0) {
|
||||||
|
$last = $limit - $backfill - 1; // array index of last added metric
|
||||||
|
$diff = match($period) { // convert period to seconds for unix timestamp math
|
||||||
|
'30m' => 1800,
|
||||||
|
'1d' => 86400,
|
||||||
|
};
|
||||||
|
$stats[$metric][] = [
|
||||||
|
'value' => 0,
|
||||||
|
'date' => $stats[$metric][$last]['time'] - $diff, // time of last metric minus period
|
||||||
|
];
|
||||||
|
$backfill--;
|
||||||
|
}
|
||||||
$stats[$metric] = array_reverse($stats[$metric]);
|
$stats[$metric] = array_reverse($stats[$metric]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -417,10 +435,13 @@ App::get('/v1/database/:collectionId/usage')
|
||||||
|
|
||||||
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
||||||
foreach ($metrics as $metric) {
|
foreach ($metrics as $metric) {
|
||||||
|
$limit = $period[$range]['limit'];
|
||||||
|
$period = $period[$range]['period'];
|
||||||
|
|
||||||
$requestDocs = $dbForInternal->find('stats', [
|
$requestDocs = $dbForInternal->find('stats', [
|
||||||
new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
|
new Query('period', Query::TYPE_EQUAL, [$period]),
|
||||||
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
||||||
], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
|
], $limit, 0, ['time'], [Database::ORDER_DESC]);
|
||||||
|
|
||||||
$stats[$metric] = [];
|
$stats[$metric] = [];
|
||||||
foreach ($requestDocs as $requestDoc) {
|
foreach ($requestDocs as $requestDoc) {
|
||||||
|
@ -429,6 +450,21 @@ App::get('/v1/database/:collectionId/usage')
|
||||||
'date' => $requestDoc->getAttribute('time'),
|
'date' => $requestDoc->getAttribute('time'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// backfill metrics with empty values for graphs
|
||||||
|
$backfill = $limit - \count($requestDocs);
|
||||||
|
while ($backfill > 0) {
|
||||||
|
$last = $limit - $backfill - 1; // array index of last added metric
|
||||||
|
$diff = match($period) { // convert period to seconds for unix timestamp math
|
||||||
|
'30m' => 1800,
|
||||||
|
'1d' => 86400,
|
||||||
|
};
|
||||||
|
$stats[$metric][] = [
|
||||||
|
'value' => 0,
|
||||||
|
'date' => $stats[$metric][$last]['time'] - $diff, // time of last metric minus period
|
||||||
|
];
|
||||||
|
$backfill--;
|
||||||
|
}
|
||||||
$stats[$metric] = array_reverse($stats[$metric]);
|
$stats[$metric] = array_reverse($stats[$metric]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -205,10 +205,13 @@ App::get('/v1/functions/:functionId/usage')
|
||||||
|
|
||||||
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
||||||
foreach ($metrics as $metric) {
|
foreach ($metrics as $metric) {
|
||||||
|
$limit = $period[$range]['limit'];
|
||||||
|
$period = $period[$range]['period'];
|
||||||
|
|
||||||
$requestDocs = $dbForInternal->find('stats', [
|
$requestDocs = $dbForInternal->find('stats', [
|
||||||
new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
|
new Query('period', Query::TYPE_EQUAL, [$period]),
|
||||||
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
||||||
], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
|
], $limit, 0, ['time'], [Database::ORDER_DESC]);
|
||||||
|
|
||||||
$stats[$metric] = [];
|
$stats[$metric] = [];
|
||||||
foreach ($requestDocs as $requestDoc) {
|
foreach ($requestDocs as $requestDoc) {
|
||||||
|
@ -217,6 +220,21 @@ App::get('/v1/functions/:functionId/usage')
|
||||||
'date' => $requestDoc->getAttribute('time'),
|
'date' => $requestDoc->getAttribute('time'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// backfill metrics with empty values for graphs
|
||||||
|
$backfill = $limit - \count($requestDocs);
|
||||||
|
while ($backfill > 0) {
|
||||||
|
$last = $limit - $backfill - 1; // array index of last added metric
|
||||||
|
$diff = match($period) { // convert period to seconds for unix timestamp math
|
||||||
|
'30m' => 1800,
|
||||||
|
'1d' => 86400,
|
||||||
|
};
|
||||||
|
$stats[$metric][] = [
|
||||||
|
'value' => 0,
|
||||||
|
'date' => $stats[$metric][$last]['time'] - $diff, // time of last metric minus period
|
||||||
|
];
|
||||||
|
$backfill--;
|
||||||
|
}
|
||||||
$stats[$metric] = array_reverse($stats[$metric]);
|
$stats[$metric] = array_reverse($stats[$metric]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -290,10 +290,13 @@ App::get('/v1/projects/:projectId/usage')
|
||||||
|
|
||||||
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
||||||
foreach ($metrics as $metric) {
|
foreach ($metrics as $metric) {
|
||||||
|
$limit = $period[$range]['limit'];
|
||||||
|
$period = $period[$range]['period'];
|
||||||
|
|
||||||
$requestDocs = $dbForInternal->find('stats', [
|
$requestDocs = $dbForInternal->find('stats', [
|
||||||
new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
|
new Query('period', Query::TYPE_EQUAL, [$period]),
|
||||||
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
||||||
], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
|
], $limit, 0, ['time'], [Database::ORDER_DESC]);
|
||||||
|
|
||||||
$stats[$metric] = [];
|
$stats[$metric] = [];
|
||||||
foreach ($requestDocs as $requestDoc) {
|
foreach ($requestDocs as $requestDoc) {
|
||||||
|
@ -302,6 +305,21 @@ App::get('/v1/projects/:projectId/usage')
|
||||||
'date' => $requestDoc->getAttribute('time'),
|
'date' => $requestDoc->getAttribute('time'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// backfill metrics with empty values for graphs
|
||||||
|
$backfill = $limit - \count($requestDocs);
|
||||||
|
while ($backfill > 0) {
|
||||||
|
$last = $limit - $backfill - 1; // array index of last added metric
|
||||||
|
$diff = match($period) { // convert period to seconds for unix timestamp math
|
||||||
|
'30m' => 1800,
|
||||||
|
'1d' => 86400,
|
||||||
|
};
|
||||||
|
$stats[$metric][] = [
|
||||||
|
'value' => 0,
|
||||||
|
'date' => $stats[$metric][$last]['time'] - $diff, // time of last metric minus period
|
||||||
|
];
|
||||||
|
$backfill--;
|
||||||
|
}
|
||||||
$stats[$metric] = array_reverse($stats[$metric]);
|
$stats[$metric] = array_reverse($stats[$metric]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -698,10 +698,13 @@ App::get('/v1/storage/usage')
|
||||||
|
|
||||||
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
||||||
foreach ($metrics as $metric) {
|
foreach ($metrics as $metric) {
|
||||||
|
$limit = $period[$range]['limit'];
|
||||||
|
$period = $period[$range]['period'];
|
||||||
|
|
||||||
$requestDocs = $dbForInternal->find('stats', [
|
$requestDocs = $dbForInternal->find('stats', [
|
||||||
new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
|
new Query('period', Query::TYPE_EQUAL, [$period]),
|
||||||
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
||||||
], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
|
], $limit, 0, ['time'], [Database::ORDER_DESC]);
|
||||||
|
|
||||||
$stats[$metric] = [];
|
$stats[$metric] = [];
|
||||||
foreach ($requestDocs as $requestDoc) {
|
foreach ($requestDocs as $requestDoc) {
|
||||||
|
@ -710,6 +713,21 @@ App::get('/v1/storage/usage')
|
||||||
'date' => $requestDoc->getAttribute('time'),
|
'date' => $requestDoc->getAttribute('time'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// backfill metrics with empty values for graphs
|
||||||
|
$backfill = $limit - \count($requestDocs);
|
||||||
|
while ($backfill > 0) {
|
||||||
|
$last = $limit - $backfill - 1; // array index of last added metric
|
||||||
|
$diff = match($period) { // convert period to seconds for unix timestamp math
|
||||||
|
'30m' => 1800,
|
||||||
|
'1d' => 86400,
|
||||||
|
};
|
||||||
|
$stats[$metric][] = [
|
||||||
|
'value' => 0,
|
||||||
|
'date' => $stats[$metric][$last]['time'] - $diff, // time of last metric minus period
|
||||||
|
];
|
||||||
|
$backfill--;
|
||||||
|
}
|
||||||
$stats[$metric] = array_reverse($stats[$metric]);
|
$stats[$metric] = array_reverse($stats[$metric]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -777,10 +795,13 @@ App::get('/v1/storage/:bucketId/usage')
|
||||||
|
|
||||||
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
||||||
foreach ($metrics as $metric) {
|
foreach ($metrics as $metric) {
|
||||||
|
$limit = $period[$range]['limit'];
|
||||||
|
$period = $period[$range]['period'];
|
||||||
|
|
||||||
$requestDocs = $dbForInternal->find('stats', [
|
$requestDocs = $dbForInternal->find('stats', [
|
||||||
new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
|
new Query('period', Query::TYPE_EQUAL, [$period]),
|
||||||
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
||||||
], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
|
], $limit, 0, ['time'], [Database::ORDER_DESC]);
|
||||||
|
|
||||||
$stats[$metric] = [];
|
$stats[$metric] = [];
|
||||||
foreach ($requestDocs as $requestDoc) {
|
foreach ($requestDocs as $requestDoc) {
|
||||||
|
@ -789,6 +810,21 @@ App::get('/v1/storage/:bucketId/usage')
|
||||||
'date' => $requestDoc->getAttribute('time'),
|
'date' => $requestDoc->getAttribute('time'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// backfill metrics with empty values for graphs
|
||||||
|
$backfill = $limit - \count($requestDocs);
|
||||||
|
while ($backfill > 0) {
|
||||||
|
$last = $limit - $backfill - 1; // array index of last added metric
|
||||||
|
$diff = match($period) { // convert period to seconds for unix timestamp math
|
||||||
|
'30m' => 1800,
|
||||||
|
'1d' => 86400,
|
||||||
|
};
|
||||||
|
$stats[$metric][] = [
|
||||||
|
'value' => 0,
|
||||||
|
'date' => $stats[$metric][$last]['time'] - $diff, // time of last metric minus period
|
||||||
|
];
|
||||||
|
$backfill--;
|
||||||
|
}
|
||||||
$stats[$metric] = array_reverse($stats[$metric]);
|
$stats[$metric] = array_reverse($stats[$metric]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -814,10 +814,13 @@ App::get('/v1/users/usage')
|
||||||
|
|
||||||
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
|
||||||
foreach ($metrics as $metric) {
|
foreach ($metrics as $metric) {
|
||||||
|
$limit = $period[$range]['limit'];
|
||||||
|
$period = $period[$range]['period'];
|
||||||
|
|
||||||
$requestDocs = $dbForInternal->find('stats', [
|
$requestDocs = $dbForInternal->find('stats', [
|
||||||
new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
|
new Query('period', Query::TYPE_EQUAL, [$period]),
|
||||||
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
new Query('metric', Query::TYPE_EQUAL, [$metric]),
|
||||||
], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
|
], $limit, 0, ['time'], [Database::ORDER_DESC]);
|
||||||
|
|
||||||
$stats[$metric] = [];
|
$stats[$metric] = [];
|
||||||
foreach ($requestDocs as $requestDoc) {
|
foreach ($requestDocs as $requestDoc) {
|
||||||
|
@ -826,6 +829,21 @@ App::get('/v1/users/usage')
|
||||||
'date' => $requestDoc->getAttribute('time'),
|
'date' => $requestDoc->getAttribute('time'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// backfill metrics with empty values for graphs
|
||||||
|
$backfill = $limit - \count($requestDocs);
|
||||||
|
while ($backfill > 0) {
|
||||||
|
$last = $limit - $backfill - 1; // array index of last added metric
|
||||||
|
$diff = match($period) { // convert period to seconds for unix timestamp math
|
||||||
|
'30m' => 1800,
|
||||||
|
'1d' => 86400,
|
||||||
|
};
|
||||||
|
$stats[$metric][] = [
|
||||||
|
'value' => 0,
|
||||||
|
'date' => $stats[$metric][$last]['time'] - $diff, // time of last metric minus period
|
||||||
|
];
|
||||||
|
$backfill--;
|
||||||
|
}
|
||||||
$stats[$metric] = array_reverse($stats[$metric]);
|
$stats[$metric] = array_reverse($stats[$metric]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue