From 631bd3f3ce0994177df89aa87f8af64d521a3581 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 11 Sep 2017 17:46:56 +0200 Subject: [PATCH 1/2] Avoid to overwrite the os_version when is empty --- pandora_server/lib/PandoraFMS/DataServer.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index a33dd64247..e24af3c022 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -306,7 +306,7 @@ sub process_xml_data ($$$$$) { # Check some variables $interval = 300 if (! defined ($interval) || $interval eq ''); - $os_version = 'N/A' if (! defined ($os_version) || $os_version eq ''); + $os_version = undef if (! defined ($os_version) || $os_version eq ''); # Get agent address from the XML if available my $address = '' ; From ea7853f97c41d578c6db49c1a352a17125a0003b Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 11 Sep 2017 17:54:28 +0200 Subject: [PATCH 2/2] Fixed no os_version on event agent view --- pandora_console/include/functions_events.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 2b1be6fa8f..84fa1e0b70 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2031,7 +2031,8 @@ function events_page_details ($event, $server = "") { $data = array(); $data[0] = '
'.__('OS').'
'; - $data[1] = ui_print_os_icon ($agent["id_os"], true, true).' ('.$agent["os_version"].')'; + $data[1] = ui_print_os_icon ($agent["id_os"], true, true); + if (!empty($agent["os_version"])) $data[1] .= ' ('.$agent["os_version"].')'; $table_details->data[] = $data; $data = array();