mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-03-14 20:39:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4026 from marek-knappe/fixing-issue-3842

Browse Source 
Fixing issue #3842
This commit is contained in:
James Brooks 2020-08-01 09:07:21 +01:00 committed by GitHub
commit 583bc58268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Repositories/Metric/MetricRepository.php
View File

@ -65,15 +65,23 @@ class MetricRepository
$points = $this->repository->getPointsSinceMinutes($metric, $nrOfMinutes + $metric->threshold)->pluck('value', 'key')->take(-$nrOfMinutes);
$timeframe = $nrOfMinutes;
//Settings counter for minutes without data
$minutesWithNoData = 0;
for ($i = 0; $i < $timeframe; $i++) {
if (!$points->has($pointKey)) {
if ($i >= $metric->threshold) {
$points->put($pointKey, $metric->default_value);
//We put default value as metric, so we can reset counter for minutes without data
$minutesWithNoData = 0;
} else {
// The point not found is still within the threshold, so it is ignored and
// the timeframe is shifted by one minute
$timeframe++;
//We didn't find any data, but threshold is not meet yet so we just adding to counter
$minutesWithNoData++;
}
} else {
//We found data within this threshold, zeroing counter
$minutesWithNoData = 0;
}
$pointKey = $dateTime->sub(new DateInterval('PT1M'))->format('Y-m-d H:i');