From ff084dadab80ffb371bac4634df8f3474e8b3f1c Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 8 Dec 2025 21:06:46 +0100 Subject: [PATCH] System: High Availability - missing syslog caused by netflow_xmlrpc_sync() shadowing the section PR: https://github.com/opnsense/core/issues/9481 (cherry picked from commit 6e478cf67131b2646ea53e2da3bb855a74bb5b3b) (cherry picked from commit 4bfa65463c869d0e9decd26aa9a3e1e315e8b579) --- src/etc/inc/plugins.inc.d/core.inc | 2 +- src/etc/inc/plugins.inc.d/netflow.inc | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/core.inc b/src/etc/inc/plugins.inc.d/core.inc index 1a45212c09..18b38dcee0 100644 --- a/src/etc/inc/plugins.inc.d/core.inc +++ b/src/etc/inc/plugins.inc.d/core.inc @@ -375,7 +375,7 @@ function core_xmlrpc_sync() $result[] = [ 'description' => gettext('System logging'), 'section' => 'syslog,OPNsense.Syslog', - 'id' => 'syslog', + 'id' => 'syslog-ng', 'services' => ['syslogd'], ]; diff --git a/src/etc/inc/plugins.inc.d/netflow.inc b/src/etc/inc/plugins.inc.d/netflow.inc index d323f0a9b5..ece70ec03d 100644 --- a/src/etc/inc/plugins.inc.d/netflow.inc +++ b/src/etc/inc/plugins.inc.d/netflow.inc @@ -80,13 +80,10 @@ function netflow_services() */ function netflow_xmlrpc_sync() { - $result = []; - $result[] = array( + return [[ 'description' => gettext('Netflow / Insight'), + 'id' => 'syslog', /* historic yet tolerated typo */ 'section' => 'OPNsense.Netflow', - 'id' => 'syslog', - 'services' => ["samplicate", "flowd_aggregate"], - ); - - return $result; + 'services' => ['samplicate', 'flowd_aggregate'], + ]]; }