Fix rrdcached directory replacement (librenms#19842)

* Fix rrdcached directory replacement
remove duplicate code block, which made it work for most installs

* Remove rrdcached tests from RrdtoolTest, will restore them in another PR

Author: murrant

LibreNMS/Data/Store/Rrd.php

@@ -395,17 +395,6 @@ public function buildCommand(string $command, string $filename, array $options =
             }
         }
 
-        if ($this->rrdcached &&
-            ! ($command == 'create' && version_compare($this->version, '1.5.5', '<')) &&
-            ! ($command == 'tune' && version_compare($this->version, '1.5', '<'))
-        ) {
-            // only relative paths if using rrdcached
-            $filename = str_replace([$this->rrd_dir . '/', $this->rrd_dir], '', $filename);
-            $options = str_replace([$this->rrd_dir . '/', $this->rrd_dir], '', $options);
-
-            return [$command, $filename, '--daemon', $this->rrdcached, ...$options];
-        }
-
         return [$command, $filename, ...$options];
     }
 

LibreNMS/RRD/RrdProcess.php

@@ -3,6 +3,7 @@
 namespace LibreNMS\RRD;
 
 use App\Facades\LibrenmsConfig;
+use Illuminate\Support\Str;
 use LibreNMS\Exceptions\RrdException;
 use LibreNMS\Exceptions\RrdNotFoundException;
 use LibreNMS\Exceptions\RrdUpdateTooFrequentException;
@@ -26,7 +27,7 @@ public function __construct(private readonly LoggerInterface $logger, private re
     {
         $this->rrdtool_exec = LibrenmsConfig::get('rrdtool', 'rrdtool');
         $this->rrdcached = (string) LibrenmsConfig::get('rrdcached', '');
-        $this->rrd_dir = LibrenmsConfig::get('rrd_dir', LibrenmsConfig::get('install_dir') . '/rrd');
+        $this->rrd_dir = Str::finish(LibrenmsConfig::get('rrd_dir', LibrenmsConfig::get('install_dir') . '/rrd'), '/');
         $this->input = new InputStream();
 
         if ($this->rrdcached) {

tests/RrdtoolTest.php

@@ -58,33 +58,6 @@ public function testBuildCommandLocal(): void
         $this->assertEquals(['update', '/opt/librenms/rrd/f', 'options'], $cmd);
     }
 
-    public function testBuildCommandRemote(): void
-    {
-        LibrenmsConfig::set('rrdcached', 'server:42217');
-        LibrenmsConfig::set('rrdtool_version', '1.4');
-        LibrenmsConfig::set('rrd_dir', '/opt/librenms/rrd');
-
-        $cmd = $this->buildCommandProxy('create', '/opt/librenms/rrd/f', ['o']);
-        $this->assertEquals(['create', '/opt/librenms/rrd/f', 'o'], $cmd);
-
-        $cmd = $this->buildCommandProxy('tune', '/opt/librenms/rrd/f', ['o']);
-        $this->assertEquals(['tune', '/opt/librenms/rrd/f', 'o'], $cmd);
-
-        $cmd = $this->buildCommandProxy('update', '/opt/librenms/rrd/f', ['o']);
-        $this->assertEquals(['update', 'f', '--daemon', 'server:42217', 'o'], $cmd);
-
-        LibrenmsConfig::set('rrdtool_version', '1.6');
-
-        $cmd = $this->buildCommandProxy('create', '/opt/librenms/rrd/f', ['o']);
-        $this->assertEquals(['create', 'f', '--daemon', 'server:42217', 'o', '-O'], $cmd);
-
-        $cmd = $this->buildCommandProxy('tune', '/opt/librenms/rrd/f', ['o']);
-        $this->assertEquals(['tune', 'f', '--daemon', 'server:42217', 'o'], $cmd);
-
-        $cmd = $this->buildCommandProxy('update', '/opt/librenms/rrd/f', ['o']);
-        $this->assertEquals(['update', 'f', '--daemon', 'server:42217', 'o'], $cmd);
-    }
-
     public function testBuildCommandException(): void
     {
         LibrenmsConfig::set('rrdcached', '');