mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RRD Graph optimization (#12735)

Browse Source 
* RRD Graph optimization
Do not use temporary files to generate graphs
Don't start up a process to pipe commands to, just run the command
Error image improvements

* fix style issues
This commit is contained in:
Tony Murray
2021-04-28 05:28:07 -05:00
committed by GitHub
parent 33c7151763
commit 2833d935e0
7 changed files with 165 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
LibreNMS/Data/Store/Rrd.php
View File

@@ -28,9 +28,11 @@ use Illuminate\Support\Str;
use LibreNMS\Config;
use LibreNMS\Data\Measure\Measurement;
use LibreNMS\Exceptions\FileExistsException;
use LibreNMS\Exceptions\RrdGraphException;
use LibreNMS\Proc;
use LibreNMS\Util\Rewrite;
use Log;
use Symfony\Component\Process\Process;
class Rrd extends BaseDatastore
{
@@ -545,25 +547,26 @@ class Rrd extends BaseDatastore
/**
* Generates a graph file at $graph_file using $options
* Opens its own rrdtool pipe.
* Graphs are a single command per run, so this just runs rrdtool
*
* @param string $graph_file
* @param string $options
* @return string|int
* @param string $options
* @return string
* @throws \LibreNMS\Exceptions\FileExistsException
* @throws \LibreNMS\Exceptions\RrdGraphException
*/
public function graph($graph_file, $options)
public function graph(string $options): string
{
if ($this->init(false)) {
$cmd = $this->buildCommand('graph', $graph_file, $options);
$cmd = $this->buildCommand('graph', '-', $options);
$process = Process::fromShellCommandline(Config::get('rrdtool') . ' ' . $cmd);
$process->setTimeout(300);
$process->setIdleTimeout(300);
$process->run();
$output = implode($this->sync_process->sendCommand($cmd));
d_echo("<p>$cmd</p>\n<p>command returned ($output)</p>");
return $output;
} else {
return 0;
if (! $process->isSuccessful()) {
throw new RrdGraphException($process->getErrorOutput(), $process->getExitCode(), $process->getOutput());
}
return $process->getOutput();
}
public function __destruct()