From c4a3263453abcc82ab8dba4442b31ac79e0ced8f Mon Sep 17 00:00:00 2001 From: rafael Date: Tue, 21 Mar 2023 17:16:31 +0100 Subject: [PATCH 1/4] set pandorafsnmp as default binary for snmp v2 and v1 snmpserver --- pandora_server/conf/pandora_server.conf.new | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 21449c7df4..48ae23e58c 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -334,7 +334,7 @@ snmpget /usr/bin/snmpget # Location of the braa binary needed by the Enterprise SNMP Server # /usr/bin/braa by default (PANDORA FMS ENTERPRISE ONLY). -braa /usr/bin/braa +braa /usr/bin/pandorafsnmp # Number of retries before braa hands a module over to the Network Server (PANDORA FMS ENTERPRISE ONLY). From ca8573ae701c86ea3d0d6b1556e1db6b49864753 Mon Sep 17 00:00:00 2001 From: rafael Date: Tue, 21 Mar 2023 17:21:28 +0100 Subject: [PATCH 2/4] 10771 adding default value on comments --- pandora_server/conf/pandora_server.conf.new | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 48ae23e58c..d4169e13e2 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -332,7 +332,8 @@ recon_timing_template 3 snmpget /usr/bin/snmpget # Location of the braa binary needed by the Enterprise SNMP Server -# /usr/bin/braa by default (PANDORA FMS ENTERPRISE ONLY). +# /usr/bin/pandorafsnmp by default for v1 and v2c (PANDORA FMS ENTERPRISE ONLY). +# /usr/bin/braa could be set as optional legacy binary for snmp v1 and v2c (PANDORA FMS ENTERPRISE ONLY). braa /usr/bin/pandorafsnmp @@ -341,7 +342,7 @@ braa /usr/bin/pandorafsnmp braa_retries 3 # Location of the pandorafsnmp binary needed by the Enterprise SNMP Server. -# /usr/bin/pandorafsnmp by default (PANDORA FMS ENTERPRISE ONLY). +# /usr/bin/pandorafsnmp by default for snmp version 3 (PANDORA FMS ENTERPRISE ONLY). fsnmp /usr/bin/pandorafsnmp From 1de15ddcd5fef0002df07481c706c6b4b8bcce4a Mon Sep 17 00:00:00 2001 From: rafael Date: Tue, 21 Mar 2023 17:22:52 +0100 Subject: [PATCH 3/4] 10771 adding default value on comments --- pandora_server/conf/pandora_server.conf.new | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index d4169e13e2..2a37fa0795 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -331,7 +331,7 @@ recon_timing_template 3 snmpget /usr/bin/snmpget -# Location of the braa binary needed by the Enterprise SNMP Server +# Location of the pandorafsnm/braa binary needed by the Enterprise SNMP Server v1 and v2c # /usr/bin/pandorafsnmp by default for v1 and v2c (PANDORA FMS ENTERPRISE ONLY). # /usr/bin/braa could be set as optional legacy binary for snmp v1 and v2c (PANDORA FMS ENTERPRISE ONLY). @@ -341,7 +341,7 @@ braa /usr/bin/pandorafsnmp braa_retries 3 -# Location of the pandorafsnmp binary needed by the Enterprise SNMP Server. +# Location of the pandorafsnmp binary needed by the Enterprise SNMP Server v3. # /usr/bin/pandorafsnmp by default for snmp version 3 (PANDORA FMS ENTERPRISE ONLY). fsnmp /usr/bin/pandorafsnmp From 45e04c005f6dfb4bc06b51aecbad790fac91e513 Mon Sep 17 00:00:00 2001 From: rafael Date: Tue, 21 Mar 2023 17:23:35 +0100 Subject: [PATCH 4/4] 10771 fix typo --- pandora_server/conf/pandora_server.conf.new | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 2a37fa0795..7392267246 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -331,7 +331,7 @@ recon_timing_template 3 snmpget /usr/bin/snmpget -# Location of the pandorafsnm/braa binary needed by the Enterprise SNMP Server v1 and v2c +# Location of the pandorafsnmp/braa binary needed by the Enterprise SNMP Server v1 and v2c # /usr/bin/pandorafsnmp by default for v1 and v2c (PANDORA FMS ENTERPRISE ONLY). # /usr/bin/braa could be set as optional legacy binary for snmp v1 and v2c (PANDORA FMS ENTERPRISE ONLY).