yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Write points to the DB only at the end of interval

Browse Source
This commit is contained in:
Witek Bedyk 2022-04-08 16:33:53 +02:00
parent 1d36840733
commit 67d6cc4729
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
metrics/access/aggregate.php
View File

@ -213,12 +213,21 @@ function aggregate_all($period)
function aggregate($intervals, &$merged, $date, $date_previous, $data, $tags = [], $prefix = 'access') function aggregate($intervals, &$merged, $date, $date_previous, $data, $tags = [], $prefix = 'access')
{ {
foreach ($intervals as $interval => $format) { foreach ($intervals as $interval => $format) {
if ($interval == 'FQ') if ($interval == 'FQ') {
$value = format_FQ($date); $value = format_FQ($date);
elseif ($interval == 'FY') if (isset($date_previous))
$value_previous = format_FQ($date_previous);
}
elseif ($interval == 'FY') {
$value = format_FY($date); $value = format_FY($date);
else if (isset($date_previous))
$value_previous = format_FY($date_previous);
}
else {
$value = $date->format($format); $value = $date->format($format);
if (isset($date_previous))
$value_previous = $date_previous->format($format);
}
if (!isset($merged[$interval]) || $value != $merged[$interval]['value']) { if (!isset($merged[$interval]) || $value != $merged[$interval]['value']) {
if (!empty($merged[$interval]['data'])) { if (!empty($merged[$interval]['data'])) {
$summary = summarize($merged[$interval]['data']); $summary = summarize($merged[$interval]['data']);
@ -226,6 +235,7 @@ function aggregate($intervals, &$merged, $date, $date_previous, $data, $tags = [
$summary = ['-' => $summary['-']]; $summary = ['-' => $summary['-']];
} }
if (isset($value_previous) and $value != $value_previous) {
$count = write_summary($interval, $date_previous, $summary, $tags, $prefix); $count = write_summary($interval, $date_previous, $summary, $tags, $prefix);
if ($prefix == 'access') { if ($prefix == 'access') {
@ -236,6 +246,7 @@ function aggregate($intervals, &$merged, $date, $date_previous, $data, $tags = [
error_log("[$prefix] [$interval] [{$merged[$interval]['value']}] wrote $count points at " . error_log("[$prefix] [$interval] [{$merged[$interval]['value']}] wrote $count points at " .
$date_previous->format('Y-m-d') . " spanning " . $merged[$interval]['data']['days'] . ' day(s)'); $date_previous->format('Y-m-d') . " spanning " . $merged[$interval]['data']['days'] . ' day(s)');
} }
}
// Reset merge data to current data. // Reset merge data to current data.
$merged[$interval] = [ $merged[$interval] = [