attempt to fix merge

Author: murrant

LibreNMS/Services/LegacyService.php

@@ -58,7 +58,7 @@ public function buildCommand(\App\Models\Service $service): array
         return parent::buildCommand($service);
     }
 
-    public function dataSets(string $rrd_filename = '', ?string $ds = null): array
+    public function dataSets(string $rrd_filename = '', array $ds = []): array
     {
         $vars = $this->loadScript(['rrd_filename' => $rrd_filename]);
 

LibreNMS/Services/Service.php

@@ -82,17 +82,12 @@ public function parameters(): array
     }
 
     /**
+     * @param  $ds  string[]
      * @return array<ServiceDataSet>
      */
-    public function dataSets(string $rrd_filename = '', ?string $ds = null): array
+    public function dataSets(string $rrd_filename = '', array $ds = []): array
     {
-        if (empty($ds)) {
-            return [];
-        }
-
-        return [
-            new ServiceDataSet($ds, '', $this->defaultGraphCommands($rrd_filename, $ds)),
-        ];
+        return array_map(fn ($d) => new ServiceDataSet($d, '', $this->defaultGraphCommands($rrd_filename, $d)), $ds);
     }
 
     protected function defaultGraphCommands(string $rrd_filename, string $ds): array

app/Models/Service.php

@@ -27,6 +27,7 @@ class Service extends DeviceRelatedModel
         'service_ignore' => 'bool',
         'service_disabled' => 'bool',
         'service_status' => 'int',
+        'service_ds' => 'array',
     ];
 
     protected function serviceParam(): Attribute

includes/html/graphs/service/graph.inc.php

@@ -35,6 +35,7 @@
 $rrd_options[] = 'COMMENT:                      Now     Avg      Max\\n';
 
 $check = ServiceFactory::make($service->service_type);
-foreach ($check->dataSets($rrd_filename, $vars['ds'] ?? null) as $ds) {
+$dataSets = isset($vars['ds']) ? [$vars['ds']] : array_keys($service->service_ds);
+foreach ($check->dataSets($rrd_filename, $dataSets) as $ds) {
     $rrd_options = array_merge($rrd_options, $ds->graphCommands);
 }