Merge branch 'master' into always-configure-command-output

Author: murrant

LibreNMS/RRD/RrdProcess.php

@@ -89,6 +89,12 @@ public function run(string $command, string $waitFor = self::COMMAND_COMPLETE):
     public function runAsync(string $command): void
     {
         $this->start();
+
+        // clean directory path when using rrdcached
+        if ($this->rrdcached) {
+            $command = str_replace($this->rrd_dir, '', $command);
+        }
+
         $this->logger->debug("RRD[%g$command%n]", ['color' => true]);
         $this->input->write("$command\n");
     }

app/Console/Commands/MaintenanceRrdStep.php

@@ -15,10 +15,6 @@ class MaintenanceRrdStep extends LnmsCommand
 {
     protected $name = 'maintenance:rrd-step';
 
-    private int $systemStep;
-    private int $icmpStep;
-    private int $systemHeartbeat;
-
     public function __construct()
     {
         parent::__construct();
@@ -28,9 +24,9 @@ public function __construct()
 
     public function handle(RrdProcess $rrdProcess): int
     {
-        $this->systemStep = (int) LibrenmsConfig::get('rrd.step', 300);
-        $this->icmpStep = (int) LibrenmsConfig::get('ping_rrd_step', $this->systemStep);
-        $this->systemHeartbeat = (int) LibrenmsConfig::get('rrd.heartbeat', $this->systemStep * 2);
+        $systemStep = (int) LibrenmsConfig::get('rrd.step', 300);
+        $icmpStep = (int) LibrenmsConfig::get('ping_rrd_step', $systemStep);
+        $systemHeartbeat = (int) LibrenmsConfig::get('rrd.heartbeat', $systemStep * 2);
 
         $hostname = (string) $this->argument('device');
         if ($hostname !== 'all') {
@@ -53,8 +49,8 @@ public function handle(RrdProcess $rrdProcess): int
             $rrdFile = basename($file, '.rrd');
 
             [$step, $heartbeat] = $rrdFile === 'icmp-perf'
-                ? [$this->icmpStep, $this->icmpStep * 2]
-                : [$this->systemStep, $this->systemHeartbeat];
+                ? [$icmpStep, $icmpStep * 2]
+                : [$systemStep, $systemHeartbeat];
 
             try {
                 $this->checkRrdFile($rrdProcess, $file, $step, $heartbeat);
@@ -133,7 +129,9 @@ private function modifyXml(string $xmlContent, int $step, int $heartbeat): strin
      */
     private function listFiles(string $hostname, RrdProcess $rrdProcess): array
     {
-        $command = $hostname === 'all' ? ['list -r .', ''] : "list ./$hostname";
+        $rrd_dir = LibrenmsConfig::get('rrd_dir', LibrenmsConfig::get('install_dir') . '/rrd');
+
+        $command = $hostname === 'all' ? "list -r $rrd_dir" : "list $rrd_dir/$hostname";
         $output = rtrim($rrdProcess->run($command));
 
         if (empty($output)) {