From 7991c6fd546e04f9ad87c60b1e78e43711861031 Mon Sep 17 00:00:00 2001 From: alejandro <alejandro.sanchez@pandorafms.com> Date: Mon, 10 Jul 2023 16:44:51 +0200 Subject: [PATCH 1/2] change regexp snmp value to accept negative numbers --- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 5e3aa5ea5f..f914b09916 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -2366,7 +2366,7 @@ sub snmp_data_switcher { } if ($data{type} eq "generic_data"){ - ($data{data} = $pure_data) =~ s/\D*//g; + ($data{data} = $pure_data) =~ s/[^-\d]//gr; } return \%data; From c4444e9f9cee6503ddc32bb9312af6892577e7b0 Mon Sep 17 00:00:00 2001 From: alejandro <alejandro.sanchez@pandorafms.com> Date: Wed, 12 Jul 2023 10:15:13 +0200 Subject: [PATCH 2/2] fix warning plugintools --- pandora_server/lib/PandoraFMS/PluginTools.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index f914b09916..5f5f3158a7 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -2366,7 +2366,8 @@ sub snmp_data_switcher { } if ($data{type} eq "generic_data"){ - ($data{data} = $pure_data) =~ s/[^-\d]//gr; + $data{data} = $pure_data; + $data{data} =~ s/[^-\d]//g; } return \%data;