lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reporting / rrd - start using cron for rrd collection.

Browse Source 
This is a temporary solution, but a first step into cleaning up rrd stat collection.

In this first milestone, we keep using the generated script, but remove the loop and sleep construct out of it, offering the posibility to handle service control to cron. To prevent the script being written at the same time we're collecting, we always lock the script before use.

should fix: https://github.com/opnsense/core/issues/7753
This commit is contained in:
Ad Schellevis 2024-08-11 12:56:49 +02:00
parent 805489d1a0
commit 3e99b87cdf
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/etc/inc/plugins.inc.d/core.inc
View File

@ -295,6 +295,14 @@ function core_cron()
$jobs[]['autocron'] = array('/usr/local/sbin/ping_hosts.sh', '*/4');
$jobs[]['autocron'] = array('/usr/local/sbin/configctl -d firmware changelog cron', '0', '22');
/**
* rrd graph collector, only execute when script is present and not locked by rrd_configure()
*/
$jobs[]['autocron'] = [
'test -e /var/db/rrd/updaterrd.sh && /usr/local/bin/flock -n -E 1 /var/db/rrd/updaterrd.sh /var/db/rrd/updaterrd.sh',
'*'
];
if (!empty($config['system']['rrdbackup']) && $config['system']['rrdbackup'] > 0) {
$jobs[]['autocron'] = array(
'/usr/local/etc/rc.syshook.d/backup/20-rrd',

25
src/etc/inc/rrd.inc
View File

@ -100,7 +100,7 @@ function rrd_configure($verbose = false, $bootup = false)
$downstream = 2500000000;
$upstream = 2500000000;
/* kill off traffic collectors */
/* XXX: kill off traffic collectors, remove when we know the update required a reboot */
killbypid('/var/run/updaterrd.pid');
if (isset($config['rrd']['enable'])) {
@ -109,16 +109,14 @@ function rrd_configure($verbose = false, $bootup = false)
mkdir($rrddbpath, 0775);
}
chown($rrddbpath, "nobody");
/* open file handle to update script and lock it in exclusive mode */
$fobj = new \OPNsense\Core\FileObject('/var/db/rrd/updaterrd.sh', 'r+', 0755, LOCK_EX);
/* db update script */
$rrdupdatesh = "#!/bin/sh\n";
$rrdupdatesh .= "\n";
$rrdupdatesh .= "export TERM=dumb\n";
$rrdupdatesh .= "\n";
$rrdupdatesh .= "counter=1\n";
$rrdupdatesh .= "while [ \"\$counter\" -ne 0 ]\n";
$rrdupdatesh .= "do\n";
$rrdupdatesh .= "";
$ifdescrs = get_configured_interface_with_descr();
/* IPsec counters */
@ -541,19 +539,12 @@ function rrd_configure($verbose = false, $bootup = false)
EOD;
$rrdupdatesh .= "\n";
$rrdupdatesh .= " for UNUSED in \$(seq 1 60); do sleep 1; done\n";
$rrdupdatesh .= "done\n";
/* write the rrd update script */
$updaterrdscript = '/var/db/rrd/updaterrd.sh';
$fd = fopen($updaterrdscript, 'w');
fwrite($fd, $rrdupdatesh);
fclose($fd);
chmod($updaterrdscript, 0755);
/* start traffic collector */
mwexecf('/usr/sbin/daemon -f -p %s %s', ['/var/run/updaterrd.pid', $updaterrdscript]);
$fobj->seek(0)->truncate(0)->write($rrdupdatesh);
unset($fobj);
} elseif (file_exists('/var/db/rrd/updaterrd.sh')) {
/* remove script, stop collecting. cron checks for existence if this file */
unlink('/var/db/rrd/updaterrd.sh');
}
$databases = glob("{$rrddbpath}/*.rrd");

6
src/www/reporting_settings.php
View File

@ -75,8 +75,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if ($configure_unbound) {
unbound_configure_do();
} else {
plugins_configure('monitor');
rrd_configure();
plugins_configure('monitor');
rrd_configure();
/* XXX: rrd graphs depend on a cronjob, we can probably remove this in a future version when the job is unconditional */
system_cron_configure();
}
}