diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index c70ff11f92..4ec519cade 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.741-191127 +Version: 7.0NG.741-191128 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 9beb6c82e2..171c835a59 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.741-191127" +pandora_version="7.0NG.741-191128" 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 4b3e3798a5..a5274dd014 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.741'; -use constant AGENT_BUILD => '191127'; +use constant AGENT_BUILD => '191128'; # 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 00709f13c6..cd718d806d 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.741 -%define release 191127 +%define release 191128 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 014c8e56c3..724fe6fbc7 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.741 -%define release 191127 +%define release 191128 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 fd1890a487..de7be0c1b6 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.741" -PI_BUILD="191127" +PI_BUILD="191128" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 4469057ce4..cdb1daa086 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{191127} +{191128} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index f1b8e2b205..da7f9892be 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.741(Build 191127)") +#define PANDORA_VERSION ("7.0NG.741(Build 191128)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index cc52cfb343..f1cd333d90 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.741(Build 191127))" + VALUE "ProductVersion", "(7.0NG.741(Build 191128))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index c2385b21f0..a98736f458 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.741-191127 +Version: 7.0NG.741-191128 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 86499e572c..ed57ff1015 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.741-191127" +pandora_version="7.0NG.741-191128" package_pear=0 package_pandora=1 diff --git a/pandora_console/extras/mr/33.sql b/pandora_console/extras/mr/33.sql index 09054044a0..3a25268e6d 100644 --- a/pandora_console/extras/mr/33.sql +++ b/pandora_console/extras/mr/33.sql @@ -1,5 +1,6 @@ START TRANSACTION; +ALTER TABLE `treport_template` ADD COLUMN `agent_regex` varchar(600) NOT NULL default ''; ALTER TABLE `tlayout_template_data` ADD COLUMN `cache_expiration` INTEGER UNSIGNED NOT NULL DEFAULT 0; INSERT INTO `ttipo_modulo` VALUES 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 ae080bbefc..e7f00559f9 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 @@ -764,6 +764,8 @@ CREATE TABLE IF NOT EXISTS `treport_template` ( `footer` MEDIUMTEXT default NULL, `custom_font` varchar(200) default NULL, `metaconsole` tinyint(1) DEFAULT 0, + `agent_regex` varchar(600) NOT NULL default '', + PRIMARY KEY(`id_report`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php index ee61ec743d..179cf6ffd1 100644 --- a/pandora_console/include/class/Diagnostics.class.php +++ b/pandora_console/include/class/Diagnostics.class.php @@ -2092,9 +2092,9 @@ class Diagnostics extends Wizard * * @param string|null $filename Filename. * - * @return void + * @return mixed */ - public function exportPDF(?string $filename=null):void + public function exportPDF(?string $filename=null) { global $config; @@ -2141,7 +2141,7 @@ class Diagnostics extends Wizard // Write html filename. $mpdf->writePDFfile($filename); - exit; + return; } diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f648d15a85..00ed9e9093 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC191127'; +$build_version = 'PC191128'; $pandora_version = 'v7.0NG.741'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index e15a0a0f97..732bee643e 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -3509,6 +3509,27 @@ function agents_get_status_animation($up=true) } +function agents_get_agent_id_by_alias_regex($alias_regex, $flag='i', $limit=0) +{ + $agents_id = []; + $all_agents = agents_get_agents(false, ['id_agente', 'alias']); + $agent_match = '/'.$alias_regex.'/'.$flag; + + foreach ($all_agents as $agent) { + $result_agent_match = preg_match($agent_match, $agent['alias']); + if ($result_agent_match) { + $agents_id[] = $agent['id_agente']; + $i++; + if ($i === $limit) { + break; + } + } + } + + return $agents_id; +} + + /** * Return if an agent is SAP or or an a agent SAP list. * If function receive false, you will return all SAP agents, @@ -3525,18 +3546,18 @@ function agents_get_sap_agents($id_agent) $sap_modules = [ 160 => __('SAP Login OK'), 109 => __('SAP Dumps'), - 111 => __('SAP List lock'), - 113 => __('SAP Cancel Jobs'), - 121 => __('SAP Batch input erroneus'), - 104 => __('SAP Idoc erroneus'), + 111 => __('SAP lock entry list'), + 113 => __('SAP canceled Jobs'), + 121 => __('SAP Batch inputs erroneous'), + 104 => __('SAP IDOC erroneous'), 105 => __('SAP IDOC OK'), 150 => __('SAP WP without active restart'), 151 => __('SAP WP stopped'), 102 => __('Average time of SAPGUI response '), 180 => __('Dialog response time'), 103 => __('Dialog Logged users '), - 192 => __('SYSFAIL, delivery attempts tRFC wrong entries number'), - 195 => __('SYSFAIL, queue qRFC INPUT, wrong entries number '), + 192 => __('TRFC in error'), + 195 => __('QRFC in error SMQ2'), 116 => __('Number of Update WPs in error'), ]; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 4ee9e682b8..429c740dfd 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -456,7 +456,7 @@ function config_update_config() } if (!config_update_value('sap_license', get_parameter('sap_license'))) { - $error_update[] = __('Deset SAP license'); + $error_update[] = __('SAP/R3 Plugin Licence'); } $inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', []); diff --git a/pandora_console/install.php b/pandora_console/install.php index 4272cf305e..af9466509f 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 3a5fbb170b..988311f919 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.741 -%define release 191127 +%define release 191128 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 27cf3b8c1c..2a9676531d 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.741 -%define release 191127 +%define release 191128 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 950ebf4f16..4a025f7e7a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.741" -PI_BUILD="191127" +PI_BUILD="191128" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6f93f2df0f..177e655997 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.741 PS191127"; +my $version = "7.0NG.741 PS191128"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index bb7f537580..c6624705d4 100755 --- 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.741 PS191127"; +my $version = "7.0NG.741 PS191128"; # save program name for logging my $progname = basename($0);