From 0fc33f3fa265614326e7bdefd3161eb5b96547e1 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Fri, 23 Feb 2018 14:38:26 +0100 Subject: [PATCH 001/112] Fixed module filter in view events --- pandora_console/operation/events/events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index a7e6523c7e..9564e87b5e 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -275,7 +275,7 @@ if ($id_agent != 0) { } $text_module = (string) get_parameter('module_search', ''); -$id_agent_module = get_parameter('module_search_hidden', 0); +$id_agent_module = get_parameter('module_search_hidden', get_parameter('id_agent_module',0)); if ($id_agent_module != 0) { $text_module = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $id_agent_module); if ($text_module == false) { From 25bed4d5c20bd62abac16c155d553dcaaf9da508 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Mon, 26 Feb 2018 13:42:28 +0100 Subject: [PATCH 002/112] Fixed tags in alert list --- pandora_console/include/functions_tags.php | 9 +++- .../operation/agentes/alerts_status.php | 47 +++++++++++-------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php index 08cfecf26e..b754e90f56 100644 --- a/pandora_console/include/functions_tags.php +++ b/pandora_console/include/functions_tags.php @@ -975,10 +975,11 @@ function tags_has_user_acl_tags($id_user = false) { * * @param string ID of the user (with false the user will be taked from config) * @param string Access flag where check what tags have the user + * @param bool returns 0 if the user has all the tags * * @return string SQL condition for tagente_module */ -function tags_get_user_tags($id_user = false, $access = 'AR') { +function tags_get_user_tags($id_user = false, $access = 'AR', $return_tag_any = false) { global $config; //users_is_strict_acl @@ -1036,7 +1037,11 @@ function tags_get_user_tags($id_user = false, $access = 'AR') { return array(); } else { - return $all_tags; + if($return_tag_any) { + return 0; + } else { + return $all_tags; + } } } diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 848d5e04f7..6667a73291 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -46,30 +46,37 @@ $offset_simple = (int) get_parameter_get ("offset_simple", 0); $id_group = (int) get_parameter ("ag_group", 0); //0 is the All group (selects all groups) $free_search = get_parameter("free_search", ''); -$user_tag_array = array_values(array_keys(tags_get_user_tags($config['id_user']))); -$user_tag = ''; +$user_tag_array = tags_get_user_tags($config['id_user'],'AR', true); -foreach ($user_tag_array as $key => $value) { - if ($value === end($user_tag_array)) { - $user_tag .= $value; - } - else{ - $user_tag .= $value.','; - } -} +if ($user_tag_array) { + $user_tag_array = array_values(array_keys($user_tag_array)); + + $user_tag = ''; -$tag_filter = get_parameter("tag_filter", $user_tag); - -$tag_param_validate = explode(',',$tag_filter); - -foreach ($tag_param_validate as $key => $value) { - if (!in_array($value,$user_tag_array)) { - db_pandora_audit("ACL Violation", - "Trying to access Alert view"); - require ("general/noaccess.php"); - exit; + foreach ($user_tag_array as $key => $value) { + if ($value === end($user_tag_array)) { + $user_tag .= $value; + } + else{ + $user_tag .= $value.','; + } } + $tag_filter = get_parameter("tag_filter", $user_tag); + + $tag_param_validate = explode(',',$tag_filter); + + foreach ($tag_param_validate as $key => $value) { + if (!in_array($value,$user_tag_array)) { + db_pandora_audit("ACL Violation", + "Trying to access Alert view"); + require ("general/noaccess.php"); + exit; + } + } + +} else { + $tag_filter = get_parameter("tag_filter", 0); } if ($tag_filter) { From 892d17f65c89f9094581a6bf04e9fabe34667505 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 27 Feb 2018 00:02:10 +0100 Subject: [PATCH 003/112] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index e5ecc44071..25afc44c64 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.719-180226 +Version: 7.0NG.719-180227 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 837b2398dd..78490f5087 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.719-180226" +pandora_version="7.0NG.719-180227" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index e8d543c1f2..9d129cfe63 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.719'; -use constant AGENT_BUILD => '180226'; +use constant AGENT_BUILD => '180227'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 684559de55..a9cb6e1796 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.719 -%define release 180226 +%define release 180227 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index ffbf19ef95..b7a1b03951 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.719 -%define release 180226 +%define release 180227 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index f6732f6f13..26efeb059e 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.719" -PI_BUILD="180226" +PI_BUILD="180227" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index ebf8fada1f..79ab9d7832 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180226} +{180227} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 9afe1e2a32..daa9b2603f 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.719(Build 180226)") +#define PANDORA_VERSION ("7.0NG.719(Build 180227)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index dcee24bb35..2971e903f0 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.719(Build 180226))" + VALUE "ProductVersion", "(7.0NG.719(Build 180227))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ce8be97e8c..3e633cadbe 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.719-180226 +Version: 7.0NG.719-180227 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index e4412ceb18..57b912165f 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.719-180226" +pandora_version="7.0NG.719-180227" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 5d68a1f175..c4640173c1 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180226'; +$build_version = 'PC180227'; $pandora_version = 'v7.0NG.719'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 138def79ac..6d29a7019e 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 2d87c9e6c5..889d226a44 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.719 -%define release 180226 +%define release 180227 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 894f23297d..70cc2dc26e 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.719 -%define release 180226 +%define release 180227 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 6498162f16..af94338f0c 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.719" -PI_BUILD="180226" +PI_BUILD="180227" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index a0c7e0a0bc..46e7645989 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.719 PS180226"; +my $version = "7.0NG.719 PS180227"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 90db5fa2f7..a27b9699a3 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.719 PS180226"; +my $version = "7.0NG.719 PS180227"; # save program name for logging my $progname = basename($0); From 3fc010135bdc8275df2c525bf5322e8c8cf662ae Mon Sep 17 00:00:00 2001 From: fermin831 Date: Tue, 27 Feb 2018 11:04:49 +0100 Subject: [PATCH 004/112] [Console Tree view] Removed empty childs --- pandora_console/include/class/Tree.class.php | 32 ++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php index 507d1d2b1c..805e46376a 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -1212,12 +1212,7 @@ class Tree { Tree::processCounters($groups); // Filter groups and eliminates the reference to empty groups if ($remove_empty) { - // Filter empty groups - $groups = array_filter($groups, function ($group) { - return (isset($group['counters']) && - isset($group['counters']['total']) && - !empty($group['counters']['total'])); - }); + $groups = Tree::deleteEmptyGroups($groups); } usort($groups, array("Tree", "cmpSortNames")); return $groups; @@ -1892,6 +1887,31 @@ class Tree { } } + /** + * @brief Recursive function to remove the empty groups + * + * @param groups All groups structure + * + * @return new_groups A new groups structure without empty groups + */ + protected static function deleteEmptyGroups ($groups) { + $new_groups = array(); + foreach ($groups as $group) { + // If a group is empty, do not add to new_groups. + if (!isset($group['counters']['total']) || $group['counters']['total'] == 0) { + continue; + } + // Tray to remove the children groups + if (!empty($group['children'])) { + $children = Tree::deleteEmptyGroups ($group['children']); + if (empty($children)) unset($group['children']); + else $group['children'] = $children; + } + $new_groups[] = $group; + } + return $new_groups; + } + private static function extractGroupsWithIDs ($groups, $ids_hash) { $result_groups = array(); foreach ($groups as $group) { From 80ecb6f3669e7c5c062dc4dca404f548c6ab0887 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Tue, 27 Feb 2018 11:46:28 +0100 Subject: [PATCH 005/112] [Console Tree view] Added counter --- .../include/javascript/tree/TreeController.js | 10 ++++++++++ pandora_console/operation/tree.php | 1 + 2 files changed, 11 insertions(+) diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js index 75acddc3f6..0927276200 100644 --- a/pandora_console/include/javascript/tree/TreeController.js +++ b/pandora_console/include/javascript/tree/TreeController.js @@ -20,6 +20,7 @@ var TreeController = { recipient: '', tree: [], emptyMessage: "No data found.", + foundMessage: "Found items", errorMessage: "Error", baseURL: "", ajaxURL: "ajax.php", @@ -683,6 +684,12 @@ var TreeController = { } controller.recipient.empty(); + controller.recipient.html( + "
" + + controller.foundMessage + ": " + controller.tree.length + + "
" + + "
" + ); var $children = _processGroup(this.recipient, this.tree, true); $children.show(); @@ -712,6 +719,9 @@ var TreeController = { if (typeof data.emptyMessage !== 'undefined' && data.emptyMessage.length > 0) { this.emptyMessage = data.emptyMessage; } + if (typeof data.foundMessage !== 'undefined' && data.foundMessage.length > 0) { + this.foundMessage = data.foundMessage; + } if (typeof data.errorMessage !== 'undefined' && data.errorMessage.length > 0) { this.errorMessage = data.errorMessage; } diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index d65d662fd8..75d29cd434 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -283,6 +283,7 @@ enterprise_hook('close_meta_frame'); detailRecipient: $.fixedBottomBox({ width: 400, height: window.innerHeight * 0.9 }), page: parameters['page'], emptyMessage: "", + foundMessage: "", tree: data.tree, baseURL: "", ajaxURL: "", From 3e56e9310846e5564d65c0fb771d0773e7010f3c Mon Sep 17 00:00:00 2001 From: fermin831 Date: Tue, 27 Feb 2018 15:04:18 +0100 Subject: [PATCH 006/112] [Server Policies] Check autodisable mode when a policy is apllied --- pandora_server/lib/PandoraFMS/Core.pm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 1d3784348c..3403b55a67 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -209,6 +209,7 @@ our @EXPORT = qw( pandora_process_event_replication pandora_process_module pandora_reset_server + pandora_safe_mode_modules_update pandora_server_keep_alive pandora_set_event_storm_protection pandora_set_master @@ -5529,6 +5530,29 @@ sub safe_mode($$$$$$) { } } +########################################################################## +=head2 C<< safe_mode_modules_update (I<$pa_config>, I<$agent>, I<$dbh>) >> + +Check if agent safe module is critical and turn all modules to disabled. + +=cut +########################################################################## +sub pandora_safe_mode_modules_update { + my ($pa_config, $agent_id, $dbh) = @_; + + my $agent = get_db_single_row ($dbh, 'SELECT alias, safe_mode_module FROM tagente WHERE id_agente = ?', $agent_id); + # Does nothing if safe_mode is disabled + return unless $agent->{'safe_mode_module'} > 0; + + my $status = get_agentmodule_status($pa_config, $dbh, $agent->{'safe_mode_module'}); + + # If status is critical, disable the rest of the modules. + if ($status == MODULE_CRITICAL) { + logger($pa_config, "Update modules for safe mode agent with alias:" . $agent->{'alias'} . ".", 10); + db_do($dbh, 'UPDATE tagente_modulo SET disabled=1 WHERE id_agente=? AND id_agente_modulo!=?', $agent_id, $agent->{'safe_mode_module'}); + } +} + # End of function declaration # End of defined Code From 789f908b0883f11e2c62ab81f1c1cadb161adeed Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 28 Feb 2018 00:01:39 +0100 Subject: [PATCH 007/112] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 25afc44c64..090ab35d1e 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.719-180227 +Version: 7.0NG.719-180228 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 78490f5087..677317a2cf 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.719-180227" +pandora_version="7.0NG.719-180228" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 9d129cfe63..d4b862cebf 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.719'; -use constant AGENT_BUILD => '180227'; +use constant AGENT_BUILD => '180228'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index a9cb6e1796..f24e83b7a8 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.719 -%define release 180227 +%define release 180228 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index b7a1b03951..2790257e7e 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.719 -%define release 180227 +%define release 180228 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 26efeb059e..2b75296efa 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.719" -PI_BUILD="180227" +PI_BUILD="180228" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 79ab9d7832..ca356b1b9c 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180227} +{180228} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index daa9b2603f..5b1e18770d 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.719(Build 180227)") +#define PANDORA_VERSION ("7.0NG.719(Build 180228)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 2971e903f0..4fa5009cd3 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.719(Build 180227))" + VALUE "ProductVersion", "(7.0NG.719(Build 180228))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 3e633cadbe..e382c27ae1 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.719-180227 +Version: 7.0NG.719-180228 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 57b912165f..d307396a37 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.719-180227" +pandora_version="7.0NG.719-180228" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index c4640173c1..2912855fc0 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180227'; +$build_version = 'PC180228'; $pandora_version = 'v7.0NG.719'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 6d29a7019e..d24d412b7f 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 889d226a44..5db9f32391 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.719 -%define release 180227 +%define release 180228 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 70cc2dc26e..0bb84e02c3 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.719 -%define release 180227 +%define release 180228 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index af94338f0c..fcd7dca083 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.719" -PI_BUILD="180227" +PI_BUILD="180228" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 46e7645989..5a98d5a967 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.719 PS180227"; +my $version = "7.0NG.719 PS180228"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a27b9699a3..e489254f75 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.719 PS180227"; +my $version = "7.0NG.719 PS180228"; # save program name for logging my $progname = basename($0); From 7c5756a7269fa9b8ebf71120955d455c488cdfb7 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Wed, 28 Feb 2018 10:15:32 +0100 Subject: [PATCH 008/112] Fixed list of latest events in tactical view --- pandora_console/include/functions_tags.php | 126 ++++++++++----------- 1 file changed, 62 insertions(+), 64 deletions(-) diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php index 8fe2fc3993..9440200047 100644 --- a/pandora_console/include/functions_tags.php +++ b/pandora_console/include/functions_tags.php @@ -850,83 +850,81 @@ function tags_get_acl_tags_event_condition($acltags, $meta = false, $force_group // Juanma (08/05/2014) Fix : Will have all groups retrieved (also propagated ones) $_groups_not_in = ''; - if($acltags[0]){ - foreach ($acltags as $group_id => $group_tags) { - // Group condition (The module belongs to an agent of the group X) - $group_condition = sprintf('id_grupo IN (%s)', implode(',', array_values(groups_get_id_recursive($group_id, true)))); - //$_groups_not_in .= implode(',', array_values(groups_get_id_recursive($group_id))) . ','; + foreach ($acltags as $group_id => $group_tags) { + // Group condition (The module belongs to an agent of the group X) + $group_condition = sprintf('id_grupo IN (%s)', implode(',', array_values(groups_get_id_recursive($group_id, true)))); + //$_groups_not_in .= implode(',', array_values(groups_get_id_recursive($group_id))) . ','; - // Tags condition (The module has at least one of the restricted tags) - $tags_condition = ''; - if (empty($group_tags)) { - $tags_condition = "id_grupo = ".$group_id; + // Tags condition (The module has at least one of the restricted tags) + $tags_condition = ''; + if (empty($group_tags)) { + $tags_condition = "id_grupo = ".$group_id; + } + else { + if (!is_array($group_tags)) { + $group_tags = explode(',', $group_tags); } - else { - if (!is_array($group_tags)) { - $group_tags = explode(',', $group_tags); - } - foreach ($group_tags as $tag) { - // If the tag ID doesnt exist, ignore - if (!isset($all_tags[$tag])) { - continue; - } + foreach ($group_tags as $tag) { + // If the tag ID doesnt exist, ignore + if (!isset($all_tags[$tag])) { + continue; + } - if ($tags_condition != '') { - $tags_condition .= " OR \n"; - } + if ($tags_condition != '') { + $tags_condition .= " OR \n"; + } - //~ // Add as condition all the posibilities of the serialized tags - //~ $tags_condition .= sprintf('tags LIKE "%s,%%"',io_safe_input($all_tags[$tag])); - //~ $tags_condition .= sprintf(' OR tags LIKE "%%,%s,%%"',io_safe_input($all_tags[$tag])); - //~ $tags_condition .= sprintf(' OR tags LIKE "%%,%s"',io_safe_input($all_tags[$tag])); - //~ $tags_condition .= sprintf(' OR tags LIKE "%s %%"',io_safe_input($all_tags[$tag])); - //~ $tags_condition .= sprintf(' OR tags LIKE "%%,%s %%"',io_safe_input($all_tags[$tag])); + //~ // Add as condition all the posibilities of the serialized tags + //~ $tags_condition .= sprintf('tags LIKE "%s,%%"',io_safe_input($all_tags[$tag])); + //~ $tags_condition .= sprintf(' OR tags LIKE "%%,%s,%%"',io_safe_input($all_tags[$tag])); + //~ $tags_condition .= sprintf(' OR tags LIKE "%%,%s"',io_safe_input($all_tags[$tag])); + //~ $tags_condition .= sprintf(' OR tags LIKE "%s %%"',io_safe_input($all_tags[$tag])); + //~ $tags_condition .= sprintf(' OR tags LIKE "%%,%s %%"',io_safe_input($all_tags[$tag])); - if ($force_group_and_tag) { - if (!empty($all_tags[$tag])) { - if ($force_equal) { - $tags_condition .= sprintf('(tags = "%s"',io_safe_input($all_tags[$tag])); - } else { - $tags_condition .= "(tags LIKE '%".io_safe_input($all_tags[$tag])."%'"; - } - $childrens = groups_get_childrens($group_id, null, true); - - if (empty($childrens)) { - $tags_condition .= sprintf(' AND id_grupo = %d )', $group_id); - } else { - $childrens_ids[] = $group_id; - foreach ($childrens as $child) { - $childrens_ids[] = (int)$child['id_grupo']; - } - $ids_str = implode(',', $childrens_ids); - - $tags_condition .= sprintf(' AND id_grupo IN (%s) )', $ids_str); - } + if ($force_group_and_tag) { + if (!empty($all_tags[$tag])) { + if ($force_equal) { + $tags_condition .= sprintf('(tags = "%s"',io_safe_input($all_tags[$tag])); } else { - $tags_condition .= "id_grupo = ".$group_id; + $tags_condition .= "(tags LIKE '%".io_safe_input($all_tags[$tag])."%'"; + } + $childrens = groups_get_childrens($group_id, null, true); + + if (empty($childrens)) { + $tags_condition .= sprintf(' AND id_grupo = %d )', $group_id); + } else { + $childrens_ids[] = $group_id; + foreach ($childrens as $child) { + $childrens_ids[] = (int)$child['id_grupo']; + } + $ids_str = implode(',', $childrens_ids); + + $tags_condition .= sprintf(' AND id_grupo IN (%s) )', $ids_str); } } else { - if ($force_equal) { - $tags_condition .= sprintf('tags = "%s"',io_safe_input($all_tags[$tag])); - } else { - $tags_condition .= "tags LIKE '%".io_safe_input($all_tags[$tag])."%'"; - } + $tags_condition .= "id_grupo = ".$group_id; + } + } else { + if ($force_equal) { + $tags_condition .= sprintf('tags = "%s"',io_safe_input($all_tags[$tag])); + } else { + $tags_condition .= "tags LIKE '%".io_safe_input($all_tags[$tag])."%'"; } } } - - // If there is not tag condition ignore - if (empty($tags_condition)) { - continue; - } - - if ($condition != '') { - $condition .= ' OR '; - } - - $condition .= "($tags_condition)\n"; } + + // If there is not tag condition ignore + if (empty($tags_condition)) { + continue; + } + + if ($condition != '') { + $condition .= ' OR '; + } + + $condition .= "($tags_condition)\n"; } //Commented because ACLs propagation don't work From 6093f6a0d872b3b4b18860e20e84fd9387d67a7d Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 28 Feb 2018 12:08:15 +0100 Subject: [PATCH 009/112] [Metaconsole] Fixed img broken links on metaconsole --- pandora_console/include/functions_ui.php | 21 ++++++++++++++----- .../agentes/interface_traffic_graph_win.php | 8 ++++++- .../operation/agentes/stat_win.php | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index edcbad7ee4..56865d09e7 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1091,10 +1091,11 @@ function ui_print_alert_template_example ($id_alert_template, $return = false, $ * @param bool Whether to return or output the result * @param string Home url if its necessary * @param string Image path + * @param bool Route is relative or not * * @return string The help tip */ -function ui_print_help_icon ($help_id, $return = false, $home_url = '', $image = "images/help.png") { +function ui_print_help_icon ($help_id, $return = false, $home_url = '', $image = "images/help.png", $is_relative = false) { global $config; if (empty($home_url)) @@ -1104,10 +1105,16 @@ function ui_print_help_icon ($help_id, $return = false, $home_url = '', $image = $home_url = "../../" . $home_url; } - $output = html_print_image ($image, true, + $output = html_print_image ( + $image, + true, array ("class" => "img_help", "title" => __('Help'), - "onclick" => "open_help ('" . $help_id . "','" . $home_url . "','" . $config['id_user'] . "')")); + "onclick" => "open_help ('" . $help_id . "','" . $home_url . "','" . $config['id_user'] . "')" + ), + false, + $is_relative + ); if (!$return) echo $output; @@ -1904,11 +1911,15 @@ function ui_print_session_action_icon ($action, $return = false) { * @param string Complete text to show in the tip * @param bool whether to return an output string or echo now * @param img displayed image + * @param bool Print image in relative way * * @return string HTML code if return parameter is true. */ -function ui_print_help_tip ($text, $return = false, $img = 'images/tip.png') { - $output = '' . html_print_image ($img, true, array('title' => $text)) . ''; +function ui_print_help_tip ($text, $return = false, $img = 'images/tip.png', $is_relative = false) { + $output = + '' . + html_print_image ($img, true, array('title' => $text), false, $is_relative) . + ''; if ($return) return $output; diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php index c232af6e91..d002194846 100644 --- a/pandora_console/operation/agentes/interface_traffic_graph_win.php +++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php @@ -271,7 +271,13 @@ $interface_traffic_modules = array( $table->rowclass[] =''; $data = array(); - $data[0] = __('Show full scale graph (TIP)') . ui_print_help_tip(__('This option may cause performance issues'), true); + $data[0] = __('Show full scale graph (TIP)') . + ui_print_help_tip( + __('This option may cause performance issues'), + true, + 'images/tip.png', + true + ); $data[1] = html_print_checkbox ("fullscale", 1, (bool) $fullscale, true); $table->data[] = $data; $table->rowclass[] =''; diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 8e27312304..7465dfd144 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -290,7 +290,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent); $params = array(); // TOP TEXT //Use the no_meta parameter because this image is only in the base console - $params['top_text'] = "
" . html_print_image('images/wrench_blanco.png', true, array('width' => '16px'), false, false, true) . ' ' . __('Pandora FMS Graph configuration menu') . ui_print_help_icon ("graphs",true, $config["homeurl"], "images/help_w.png") . "
"; + $params['top_text'] = "
" . html_print_image('images/wrench_blanco.png', true, array('width' => '16px'), false, false, true) . ' ' . __('Pandora FMS Graph configuration menu') . ui_print_help_icon ("graphs",true, $config["homeurl"], "images/help_w.png", true) . "
"; $params['body_text'] = "
"; $params['body_text'] .=__('Please, make your changes and apply with the Reload button'); From e37768097f73d55e767e6f607b9cd08f2e3e66c7 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 28 Feb 2018 12:16:43 +0100 Subject: [PATCH 010/112] [Visual] Refixed help images on node --- pandora_console/include/functions_ui.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 56865d09e7..ec0f1466b8 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1113,7 +1113,7 @@ function ui_print_help_icon ($help_id, $return = false, $home_url = '', $image = "onclick" => "open_help ('" . $help_id . "','" . $home_url . "','" . $config['id_user'] . "')" ), false, - $is_relative + $is_relative && is_metaconsole() ); if (!$return) echo $output; @@ -1918,7 +1918,13 @@ function ui_print_session_action_icon ($action, $return = false) { function ui_print_help_tip ($text, $return = false, $img = 'images/tip.png', $is_relative = false) { $output = '' . - html_print_image ($img, true, array('title' => $text), false, $is_relative) . + html_print_image ( + $img, + true, + array('title' => $text), + false, + $is_relative && is_metaconsole() + ) . ''; if ($return) From 3529bfaa5a9e638ad5dfe13dd5212ac2adfd53ab Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 28 Feb 2018 14:11:26 +0100 Subject: [PATCH 011/112] [Server Pluginserver] Added alias to plugin server error --- pandora_server/lib/PandoraFMS/PluginServer.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm index 230ac24f6a..a3d280f9b2 100644 --- a/pandora_server/lib/PandoraFMS/PluginServer.pm +++ b/pandora_server/lib/PandoraFMS/PluginServer.pm @@ -298,9 +298,15 @@ sub data_consumer ($$) { } } } - if (! defined $module_data || $module_data eq '') { - logger ($pa_config,"[ERROR] Undefined value returned by plug-in module " . $module->{'nombre'} . " agent " . $agent->{'nombre'} . ". Is the server out of memory?" , 3); + logger ( + $pa_config, + sprintf( + "[ERROR] Undefined value returned by plug-in module '%s' in agent whith name '%s' and alias '%s'. Is the server out of memory?", + $module->{'nombre'}, $agent->{'nombre'}, $agent->{'alias'} + ), + 3 + ); pandora_update_module_on_error ($pa_config, $module, $dbh); return; } From 8fce51a816a200fffb7b2f1d4e75af6a7683390c Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 28 Feb 2018 14:32:35 +0100 Subject: [PATCH 012/112] Filter clusters by groups - #1868 --- pandora_console/include/ajax/module.php | 9 ++++++--- pandora_console/include/functions_agents.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index b267173f5a..2da50acdd4 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -471,6 +471,7 @@ if ($list_modules) { $id_agente = $id_agent = (int)get_parameter('id_agente', 0); $show_notinit = (int)get_parameter('show_notinit', 0); + $cluster_list = (int)get_parameter('cluster_list', 0); $url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $id_agent; $selectTypeUp = ''; $selectTypeDown = ''; @@ -562,9 +563,11 @@ if ($list_modules) { // Fix: for tag functionality groups have to be all user_groups (propagate ACL funct!) $groups = users_get_groups($config["id_user"], $access); - $tags_sql = tags_get_acl_tags($config['id_user'], - array_keys($groups), $access, 'module_condition', 'AND', - 'tagente_modulo', false, array(), true); + if($cluster_list != 1){ + $tags_sql = tags_get_acl_tags($config['id_user'], + array_keys($groups), $access, 'module_condition', 'AND', + 'tagente_modulo', false, array(), true); + } $status_filter_monitor = (int)get_parameter('status_filter_monitor', -1); $status_text_monitor = get_parameter('status_text_monitor', ''); diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 7587bb76b1..f4310418b3 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -80,7 +80,7 @@ function agents_create_agent ($name, $id_group, $interval, $ip_address, $values if (empty ($name)) return false; - if (empty ($id_group)) + if (empty ($id_group) && (int)$id_group != 0) return false; if (empty ($ip_address)) From 9d36887a02defe9d969f5cb76f3cf7ea9447c39f Mon Sep 17 00:00:00 2001 From: danielmaya Date: Wed, 28 Feb 2018 14:33:22 +0100 Subject: [PATCH 013/112] Fixed graph precision --- pandora_console/extras/mr/13.sql | 13 +++++++++++ .../godmode/setup/setup_visuals.php | 23 ++++++++----------- pandora_console/include/functions_config.php | 4 ++++ .../include/graphs/flot/pandora.flot.js | 18 ++++++++++----- .../include/graphs/functions_flot.php | 10 +++----- 5 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 pandora_console/extras/mr/13.sql diff --git a/pandora_console/extras/mr/13.sql b/pandora_console/extras/mr/13.sql new file mode 100644 index 0000000000..70ccfb05b7 --- /dev/null +++ b/pandora_console/extras/mr/13.sql @@ -0,0 +1,13 @@ +START TRANSACTION; + + SET @st_oum720 = (SELECT IF( + (SELECT value FROM tconfig WHERE token like 'short_module_graph_data') = 1, + "UPDATE tconfig SET value = 2 WHERE token LIKE 'short_module_graph_data'", + "UPDATE tconfig SET value = '' WHERE token LIKE 'short_module_graph_data'" + )); + + PREPARE pr_oum720 FROM @st_oum720; + EXECUTE pr_oum720; + DEALLOCATE PREPARE pr_oum720; + +COMMIT; \ No newline at end of file diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 479269af08..adb686bf05 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -487,11 +487,18 @@ if (!enterprise_installed()) { $disabled_graph_precision = true; } -$table_chars->data[$row][0] = __('Data precision for reports and visual consoles'); -$table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown in reports and visual consoles. It must be a number between 0 and 5'), true); +$table_chars->data[$row][0] = __('Data precision in PandoraFMS'); +$table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. It must be a number between 0 and 5, except in graphs.'), true); $table_chars->data[$row][1] = html_print_input_text ('graph_precision', $config["graph_precision"], '', 5, 5, true, $disabled_graph_precision, false, "onChange=\"change_precision()\""); $row++; +if (!isset($config["short_module_graph_data"])) + $config["short_module_graph_data"] = true; +$table_chars->data[$row][0] = __('Data precision in graphs'); +$table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. If the field is empty, it will show all the decimals'), true); +$table_chars->data[$row][1] = html_print_input_text ('short_module_graph_data', $config["short_module_graph_data"], '', 5, 5, true, $disabled_graph_precision, false, "onChange=\"change_precision()\""); +$row++; + $table_chars->data[$row][0] = __('Default line thickness for the Custom Graph.'); $table_chars->data[$row][1] = html_print_input_text ('custom_graph_width', $config["custom_graph_width"], '', 5, 5, true); @@ -510,18 +517,6 @@ $table_chars->data[$row][1] .= __('No').' ' . html_print_radio_button ('flash_charts', 0, '', $config["global_flash_charts"], true); $row++; -if (!isset($config["short_module_graph_data"])) - $config["short_module_graph_data"] = true; -$table_chars->data[$row][0] = __('Shortened module graph data'); -$table_chars->data[$row][0] .= ui_print_help_tip(__('The data number of the module graphs will be rounded and shortened'), true); -$table_chars->data[$row][1] = __('Yes') . ' ' . - html_print_radio_button ('short_module_graph_data', 1, '', - $config["short_module_graph_data"], true) . - '  '; -$table_chars->data[$row][1] .= __('No') . ' ' . - html_print_radio_button ('short_module_graph_data', 0, '', - $config["short_module_graph_data"], true); -$row++; $table_chars->data[$row][0] = __('Type of module charts'); $table_chars->data[$row][1] = __('Area').' ' . diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index c817482f96..87c8e9cb6a 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -1864,6 +1864,10 @@ function config_process_config () { config_update_value ('networkmap_max_width', 900); } + if (!isset($config['short_module_graph_data'])) { + config_update_value ('short_module_graph_data', ''); + } + if (!isset($config['tutorial_mode'])) { config_update_value ('tutorial_mode', 'full'); } diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 44ec22168e..6175ef554b 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -1773,7 +1773,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, $('#timestamp_'+graph_id).show(); // If no legend, the timestamp labels are short and with value if (legend.length == 0) { - $('#timestamp_'+graph_id).text(labels[j] + ' (' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + ')'); + $('#timestamp_'+graph_id).text(labels[j] + ' (' + (short_data ? number_format(y, 0, "", short_data) : parseFloat(y)) + ')'); } else { $('#timestamp_'+graph_id).text(labels_long[j]); @@ -1809,7 +1809,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, // The graphs of points type and unknown graphs will dont be updated if (serie_types[i] != 'points' && series.label != $('#hidden-unknown_text').val()) { $('#legend_' + graph_id + ' .legendLabel') - .eq(i).html(label_aux + '= ' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + how_bigger + ' ' + unit); + .eq(i).html(label_aux + '= ' + (short_data ? number_format(y, 0, "", short_data) : parseFloat(y)) + how_bigger + ' ' + unit); } $('#legend_' + graph_id + ' .legendLabel') @@ -1925,7 +1925,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, function yFormatter(v, axis) { axis.datamin = 0; if (short_data) { - var formatted = number_format(v, force_integer, ""); + var formatted = number_format(v, force_integer, "", short_data); } else { var formatted = v; @@ -2177,15 +2177,16 @@ function check_adaptions(graph_id) { }); } -function number_format(number, force_integer, unit) { +function number_format(number, force_integer, unit, short_data) { if (force_integer) { if (Math.round(number) != number) { return ''; } } else { - // Round to 2 decimals - number = Math.round(number * 100) / 100; + short_data ++; + decimals = pad(1, short_data, 0); + number = Math.round(number * decimals) / decimals; } var shorts = ["", "K", "M", "G", "T", "P", "E", "Z", "Y"]; @@ -2206,6 +2207,11 @@ function number_format(number, force_integer, unit) { return number + ' ' + shorts[pos] + unit; } + +function pad(input, length, padding) { + var str = input + ""; + return (length <= str.length) ? str : pad(str+padding, length, padding); +} // Recalculate the threshold data depends on warning and critical function axis_thresholded (threshold_data, y_min, y_max, red_threshold, extremes, red_up) { diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 2c77fdd812..527539bcc9 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -490,14 +490,10 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, true); if (!isset($config["short_module_graph_data"])) - $config["short_module_graph_data"] = true; + $config["short_module_graph_data"] = ''; - if ($config["short_module_graph_data"]) { - $short_data = true; - } - else { - $short_data = false; - } + $short_data = $config["short_module_graph_data"]; + // Javascript code From 610c5a5147c43f3543eb8dfa11d6665ca6b721d8 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Wed, 28 Feb 2018 15:45:58 +0100 Subject: [PATCH 014/112] Updated MR and current_package_enterprise --- pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 4 ++-- pandora_console/pandoradb_data.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 1a86b10541..4e292b4f0d 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1159,10 +1159,10 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned; INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); -INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 12); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 13); UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; -INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '719'); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '720'); -- --------------------------------------------------------------------- -- Table `tplanned_downtime_agents` diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 23239e8585..105e4833a1 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -109,10 +109,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_report_front_logo', 'images/pandora_logo_white.jpg'), ('custom_report_front_header', ''), ('custom_report_front_footer', ''), -('MR', 12), +('MR', 13), ('identification_reminder', 1), ('identification_reminder_timestamp', 0), -('current_package_enterprise', '719'), +('current_package_enterprise', '720'), ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'); UNLOCK TABLES; From 18f3020785e855acf2fb72e9c302078b01d04d33 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 28 Feb 2018 19:02:54 +0100 Subject: [PATCH 015/112] Change fixed header and fixed menu positions - #1844 --- .../godmode/setup/setup_visuals.php | 1 + .../include/javascript/jquery.pandora.js | 63 +++++++++++++++++-- pandora_console/index.php | 2 +- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index adb686bf05..bbe0e20d27 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -288,6 +288,7 @@ $table_styles->data[$row][1] = __('Yes') . ' ' . '  '; $table_styles->data[$row][1] .= __('No') . ' ' . html_print_radio_button ('fixed_menu', 0, '', $config["fixed_menu"], true); +$row++; // For 5.1 Autohidden menu feature $table_styles->data['autohidden'][0] = __('Autohidden menu'); diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js index fd0972e750..c3b2e65c6c 100644 --- a/pandora_console/include/javascript/jquery.pandora.js +++ b/pandora_console/include/javascript/jquery.pandora.js @@ -226,12 +226,65 @@ $(document).ready (function () { $(document).on("scroll", function(){ - if((document.documentElement.scrollTop != 0 || document.body.scrollTop != 0) && $('#menu').css('position') =='fixed'){ - $('#menu').css('top','20px'); - } - else{ - $('#menu').css('top','80px'); + + if(document.documentElement.scrollTop != 0 || document.body.scrollTop != 0){ + if($('#head').css('position') =='fixed'){ + if($('#menu').css('position') =='fixed'){ + $('#menu').css('top','80px'); + } + else{ + $('#menu').css('top','60px'); + } + } + else{ + if($('#menu').css('position') =='fixed'){ + $('#menu').css('top','20px'); + } + else{ + $('#menu').css('top','80px'); + } + } } + else{ + if($('#head').css('position') =='fixed'){ + if($('#menu').css('position') =='fixed'){ + $('#menu').css('top','80px'); + } + else{ + $('#menu').css('top','60px'); + } + } + else{ + if($('#menu').css('position') =='fixed'){ + $('#menu').css('top','80px'); + } + else{ + $('#menu').css('top','80px'); + } + } + } + + // if((document.documentElement.scrollTop != 0 || document.body.scrollTop != 0) && $('#menu').css('position') =='fixed'){ + // if($('#head').css('position') =='fixed'){ + // $('#menu').css('top','80px'); + // } + // else{ + // $('#menu').css('top','20px'); + // } + // } + // else{ + // if($('#head').css('position') =='fixed'){ + // if(document.documentElement.scrollTop != 0 || document.body.scrollTop != 0){ + // $('#menu').css('top','60px'); + // }else{ + // $('#menu').css('top','80px'); + // } + // + // } + // else{ + // $('#menu').css('top','60px'); + // } + // } }); $("#alert_messages").draggable(); diff --git a/pandora_console/index.php b/pandora_console/index.php index ed9eb48f9d..b283be0785 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -951,7 +951,7 @@ if ($config["pure"] == 0) { else { echo '
'; } From 6c6c9625fc82afa4c7d63f49913d04523fc3e690 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 28 Feb 2018 19:22:31 +0100 Subject: [PATCH 016/112] [Console help] Fixed and revisted alert macros --- .../include/help/en/help_alert_config.php | 34 +++-- .../include/help/en/help_alert_macros.php | 46 +++--- .../include/help/es/help_alert_config.php | 34 +++-- .../include/help/es/help_alert_macros.php | 97 +++---------- .../include/help/ja/help_alert_config.php | 122 +++++++++------- .../include/help/ja/help_alert_macros.php | 137 +++++++++--------- 6 files changed, 228 insertions(+), 242 deletions(-) diff --git a/pandora_console/include/help/en/help_alert_config.php b/pandora_console/include/help/en/help_alert_config.php index 6ff9b903ac..79c5f47255 100644 --- a/pandora_console/include/help/en/help_alert_config.php +++ b/pandora_console/include/help/en/help_alert_config.php @@ -25,12 +25,14 @@ When it comes to creating the action these are the only 3 fields we can set. Wit Apart from the defined module macros, the following macros are also available: