Revert changes to Rrd datastore and use local code.

getRrdFiles is just too much of a mess to use. If someone wants to fix it, they can do so in a separate PR.

Author: murrant

LibreNMS/Data/Store/Rrd.php

@@ -485,29 +485,26 @@ public function buildCommand(string $command, string $filename, array $options =
     }
 
     /**
-     * Get array of all rrd files for a device via rrdached or localdisk.
-     * If $hostname is empty, it will list all rrd files
+     * Get array of all rrd files for a device,
+     * via rrdached or localdisk.
      *
      * @param  string  $hostname  hostname of the device
-     * @return string[] array of rrd files for this host relative to rrd_dir
+     * @return string[] array of rrd files for this host
      */
     public function getRrdFiles(string $hostname): array
     {
-        $dir = $this->dirFromHost($hostname);
-
         if ($this->rrdcached) {
-            $output = $this->command('list', $dir . '/', ['--recursive']);
+            $output = $this->command('list', '/' . self::safeName($hostname));
+
             $files = explode("\n", trim($output[0] ?? ''));
             array_pop($files); // remove rrdcached status line
-            $prepend = str_replace($this->rrd_dir . '/', '', $dir) . '/';
-
-            return array_map(fn ($file) => $prepend . $file, $files);
+        } else {
+            $files = glob($this->dirFromHost($hostname) . '/*.rrd') ?: [];
         }
 
-        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir));
-        $rrdFiles = new \RegexIterator($iterator, '/\.rrd$/');
+        sort($files);
 
-        return array_map(fn (\SplFileInfo $file) => str_replace($this->rrd_dir . '/', '', $file), iterator_to_array($rrdFiles, false));
+        return $files;
     }
 
     /**
@@ -525,8 +522,6 @@ public function getRrdApplicationArrays($device, $app_id, $app_name, $category =
         $separator = '-';
 
         $rrdfile_array = $this->getRrdFiles($device['hostname']);
-        sort($rrdfile_array);
-
         if ($category) {
             $pattern = sprintf('%s-%s-%s-%s', 'app', $app_name, $app_id, $category);
         } else {

app/Console/Commands/MaintenanceRrdStep.php

@@ -5,7 +5,6 @@
 use App\Console\LnmsCommand;
 use App\Facades\DeviceCache;
 use App\Facades\LibrenmsConfig;
-use App\Facades\Rrd;
 use Exception;
 use LibreNMS\Exceptions\RrdException;
 use LibreNMS\RRD\RrdProcess;
@@ -50,11 +49,9 @@ public function handle(RrdProcess $rrdProcess): int
             return 0;
         }
 
-        $files = Rrd::getRrdFiles($hostname === 'all' ? '' : $hostname);
-
         [$converted, $skipped, $failed] = [0, 0, 0];
 
-        foreach ($files as $file) {
+        foreach ($this->listFiles($hostname, $rrdProcess) as $file) {
             $rrdFile = basename($file, '.rrd');
 
             [$step, $heartbeat] = $rrdFile === 'icmp-perf'
@@ -128,4 +125,28 @@ private function modifyXml(string $xmlContent, int $step, int $heartbeat): strin
 
         return $xmlContent;
     }
+
+    /**
+     * @param  string  $hostname
+     * @param  RrdProcess  $rrdProcess
+     * @return string[]
+     * @throws RrdException
+     */
+    private function listFiles(string $hostname, RrdProcess $rrdProcess): array
+    {
+        $command= $hostname === 'all' ? ['list -r .', ''] : "list ./$hostname";
+        $output = rtrim($rrdProcess->run($command));
+
+        if (empty($output)) {
+            return [];
+        }
+
+        $files = explode("\n", $output);
+
+        if ($hostname === 'all') {
+            return $files;
+        }
+
+        return array_map(fn ($file) => "$hostname/$file", $files);
+    }
 }