fix(conf/export) broker RRDcacheD export (#11811)

centreon · Sep 21, 2022 · 54e10c7 · 54e10c7
1 parent 4422b96
commit 54e10c7
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/www/class/config-generate/broker.class.php b/www/class/config-generate/broker.class.php
@@ -219,7 +219,8 @@ private function generate($poller_id, $localhost)
                 }
 
                 $subValuesToCastInArray = [];
-                $rrdCacheOption = 'disable';
+                $rrdCacheOption = null;
+                $rrdCached = null;
                 foreach ($value as $subvalue) {
                     if (!isset($subvalue['fieldIndex']) ||
                         $subvalue['fieldIndex'] == "" ||
@@ -237,21 +238,20 @@ private function generate($poller_id, $localhost)
                         } elseif ($subvalue['config_key'] === 'category') {
                             $object[$key][$subvalue['config_group_id']]['filters'][$subvalue['config_key']][] =
                                 $subvalue['config_value'];
-                        } else {
+                        } elseif (in_array($subvalue['config_key'], ['rrd_cached_option', 'rrd_cached'])) {
                             if ($subvalue['config_key'] === 'rrd_cached_option') {
                                 $rrdCacheOption = $subvalue['config_value'];
-                                continue;
+                            } elseif ($subvalue['config_key'] === 'rrd_cached') {
+                                $rrdCached = $subvalue['config_value'];
                             }
-
-                            if ($subvalue['config_key'] === 'rrd_cached') {
+                            if ($rrdCached && $rrdCacheOption) {
                                 if ($rrdCacheOption === 'tcp') {
-                                    $object[$key][$subvalue['config_group_id']]['port'] = $subvalue['config_value'];
+                                    $object[$key][$subvalue['config_group_id']]['port'] = $rrdCached;
                                 } elseif ($rrdCacheOption === 'unix') {
-                                    $object[$key][$subvalue['config_group_id']]['path'] = $subvalue['config_value'];
+                                    $object[$key][$subvalue['config_group_id']]['path'] = $rrdCached;
                                 }
-                                continue;
                             }
-
+                        } else {
                             $object[$key][$subvalue['config_group_id']][$subvalue['config_key']] =
                                 $subvalue['config_value'];