lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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
parent 54553e3a69 8079f22003
commit 583bc58268
1 changed files with 11 additions and 3 deletions
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); $points = $this->repository->getPointsSinceMinutes($metric, $nrOfMinutes + $metric->threshold)->pluck('value', 'key')->take(-$nrOfMinutes);
$timeframe = $nrOfMinutes; $timeframe = $nrOfMinutes;
//Settings counter for minutes without data
$minutesWithNoData = 0;
for ($i = 0; $i < $timeframe; $i++) { for ($i = 0; $i < $timeframe; $i++) {
if (!$points->has($pointKey)) { if (!$points->has($pointKey)) {
if ($i >= $metric->threshold) { if ($i >= $metric->threshold) {
$points->put($pointKey, $metric->default_value); $points->put($pointKey, $metric->default_value);
//We put default value as metric, so we can reset counter for minutes without data
$minutesWithNoData = 0;
} else { } else {
// The point not found is still within the threshold, so it is ignored and //We didn't find any data, but threshold is not meet yet so we just adding to counter
// the timeframe is shifted by one minute $minutesWithNoData++;
$timeframe++;
} }
} else {
//We found data within this threshold, zeroing counter
$minutesWithNoData = 0;
} }
$pointKey = $dateTime->sub(new DateInterval('PT1M'))->format('Y-m-d H:i'); $pointKey = $dateTime->sub(new DateInterval('PT1M'))->format('Y-m-d H:i');