diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index bc0d786172..79dd7ebbd2 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.753-210412 +Version: 7.0NG.753-210414 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 22c2c03797..4bad64cd46 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.753-210412" +pandora_version="7.0NG.753-210414" 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 36d131d6a7..f07627ae02 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.753'; -use constant AGENT_BUILD => '210412'; +use constant AGENT_BUILD => '210414'; # 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 e9fe2234d3..138c0dc01b 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.753 -%define release 210412 +%define release 210414 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 bc877a3c1b..a6016c7fa0 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.753 -%define release 210412 +%define release 210414 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 6360975bc5..b16bc68c8e 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.753" -PI_BUILD="210412" +PI_BUILD="210414" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 9a991926ad..c73ac3f92e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210412} +{210414} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index cbde9a4e71..1037a8feac 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.753(Build 210412)") +#define PANDORA_VERSION ("7.0NG.753(Build 210414)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 694f2d9e43..2624d730d0 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.753(Build 210412))" + VALUE "ProductVersion", "(7.0NG.753(Build 210414))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 4abfac53cc..74c3407a7c 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.753-210412 +Version: 7.0NG.753-210414 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 0506da0c17..00649207db 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.753-210412" +pandora_version="7.0NG.753-210414" package_pear=0 package_pandora=1 diff --git a/pandora_console/extras/mr/46.sql b/pandora_console/extras/mr/46.sql index 0e20f2af03..717b459590 100644 --- a/pandora_console/extras/mr/46.sql +++ b/pandora_console/extras/mr/46.sql @@ -6,4 +6,7 @@ ALTER TABLE `treport_content_template` MODIFY `external_source` MEDIUMTEXT; UPDATE `talert_commands` SET `fields_descriptions` = '[\"Event name\",\"Event type\",\"Source\",\"Agent name or _agent_\",\"Event severity\",\"ID extra\",\"Tags separated by commas\",\"Comments\",\"\",\"\"]' WHERE `name` = "Monitoring Event"; +UPDATE `tskin` SET `name` = 'Default theme' , `relative_path` = 'pandora.css' WHERE `id` = 1; +UPDATE `tskin` SET `name` = 'Black theme' , `relative_path` = 'Black theme' , `description` = 'Black theme' WHERE `id` = 2; + COMMIT; 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 e5841cc7e6..c124721019 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 @@ -565,6 +565,9 @@ CREATE TABLE IF NOT EXISTS `tskin` ( PRIMARY KEY (id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +UPDATE `tskin` SET `name` = 'Default theme' , `relative_path` = 'pandora.css' WHERE `id` = 1; +UPDATE `tskin` SET `name` = 'Black theme' , `relative_path` = 'Black theme' , `description` = 'Black theme' WHERE `id` = 2; + -- --------------------------------------------------------------------- -- Table `tpolicy_queue` -- --------------------------------------------------------------------- diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index 08e2c2e9f3..0d45f381e4 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -219,12 +219,11 @@ $table->data[$i][0] = __('Other').ui_print_help_tip(__('Information accessible t $table->data[$i][1] = html_print_textarea('other', 4, 40, $other, "class='min-height-0px'", true); $i++; -$isFunctionSkins = enterprise_include_once('include/functions_skins.php'); -if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK && !defined('METACONSOLE')) { - $table->data[9][0] = __('Skin'); - $table->data[9][1] = skins_print_select($config['id_user'], 'skin', $skin, '', __('None'), 0, true); -} - +// $isFunctionSkins = enterprise_include_once('include/functions_skins.php'); +// if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK && !defined('METACONSOLE')) { +// $table->data[10][0] = __('Skin'); +// $table->data[10][1] = skins_print_select($config['id_user'], 'skin', $skin, '', __('None'), 0, true); +// } if (defined('METACONSOLE')) { $sec = 'advanced'; } else { diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 2909620e3b..6948368eb1 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -1111,7 +1111,9 @@ if ($dashboards === false) { } } +$home_screen .= ''; $layouts = visual_map_get_user_layouts($config['id_user'], true); @@ -1124,6 +1126,7 @@ if ($layouts === false) { } } +$home_screen .= ''; + $home_screen .= html_print_input_text( 'data_section', $user_info['data_section'], @@ -1664,46 +1669,64 @@ function show_data_section () { $("#text-data_section").css("display", "none"); $("#dashboard").css("display", ""); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "inline-grid"); break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", ""); + $("#show_vc").css("display", "inline-grid"); + $("#show_db").css("display", "none"); break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); break; case : $("#text-data_section").css("display", ""); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); break; case : $("#text-data_section").css("display", ""); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); break; } } diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 384abd4db4..65eeb50d1a 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -713,6 +713,19 @@ class DiscoveryTaskList extends HTML $data[6] .= __('Discovery.Cloud.Aws.RDS'); break; + case DISCOVERY_CLOUD_AWS_S3: + // Discovery Cloud S3. + $data[6] = html_print_image( + 'images/op_network.png', + true, + [ + 'title' => __('Discovery Cloud S3'), + 'class' => 'invert_filter', + ] + ).'  '; + $data[6] .= __('Discovery.Cloud.Aws.S3'); + break; + case DISCOVERY_APP_MYSQL: // Discovery Applications MySQL. $data[6] = html_print_image( @@ -868,6 +881,7 @@ class DiscoveryTaskList extends HTML && $task['type'] != DISCOVERY_APP_DB2 && $task['type'] != DISCOVERY_APP_SAP && $task['type'] != DISCOVERY_CLOUD_AWS_RDS + && $task['type'] != DISCOVERY_CLOUD_AWS_S3 ) { if (check_acl($config['id_user'], 0, 'MR')) { $data[9] .= ''; @@ -1046,6 +1060,9 @@ class DiscoveryTaskList extends HTML case DISCOVERY_CLOUD_AZURE_COMPUTE: return 'wiz=cloud&mode=azure&ki='.$task['auth_strings'].'&sub=compute&page=0'; + case DISCOVERY_CLOUD_AWS_S3: + return 'wiz=cloud&mode=amazonws&ki='.$task['auth_strings'].'&sub=s3&page=0'; + default: return 'wiz=cloud'; } diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 40850ddcbf..92d360fa6f 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 = 'PC210412'; +$build_version = 'PC210414'; $pandora_version = 'v7.0NG.753'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 19520f9791..c6c4a190e4 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -626,6 +626,7 @@ define('DISCOVERY_APP_SAP', 10); define('DISCOVERY_APP_DB2', 11); define('DISCOVERY_APP_MICROSOFT_SQL_SERVER', 12); define('DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE', 13); +define('DISCOVERY_CLOUD_AWS_S3', 14); // Force task build tmp results. define('DISCOVERY_REVIEW', 0); diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 322e630485..d2bed417b4 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -3358,6 +3358,32 @@ function config_user_set_custom_config() } } + if ((isset($userinfo['id_skin']) && $userinfo['id_skin'] !== 0)) { + if ((int) $userinfo['id_skin'] === 1) { + $config['style'] = 'pandora'; + } + + if ((int) $userinfo['id_skin'] === 2) { + $config['style'] = 'pandora_black'; + } + } + + $skin = get_parameter('skin', false); + $sec2_aux = get_parameter('sec2'); + + if ($sec2_aux != 'godmode/groups/group_list' && $skin !== false) { + $id_user_aux = get_parameter('id'); + if ($id_user_aux == $config['id_user']) { + if ((int) $skin === 1 || (int) $skin === 0) { + $config['style'] = 'pandora'; + } + + if ((int) $skin === 2) { + $config['style'] = 'pandora_black'; + } + } + } + if (defined('METACONSOLE')) { $config['metaconsole_access'] = $userinfo['metaconsole_access']; } diff --git a/pandora_console/install.php b/pandora_console/install.php index fa08dfd6e2..c5f188732d 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
'; + $home_screen .= html_print_select($dashboards_aux, 'dashboard', $user_info['data_section'], '', '', '', true, false, false, ''); + $home_screen .= '
'; $layouts = visual_map_get_user_layouts($config['id_user'], true); $layouts_aux = []; @@ -388,7 +390,9 @@ if (!$meta) { } } + $home_screen .= ''; $home_screen .= html_print_input_text('data_section', $user_info['data_section'], '', 60, 255, true, false); @@ -926,41 +930,65 @@ function show_data_section () { $("#text-data_section").css("display", "none"); $("#dashboard").css("display", ""); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "inline-grid"); + break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", ""); + $("#show_vc").css("display", "inline-grid"); + $("#show_db").css("display", "none"); + break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); + break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); + break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); + break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); + break; case : $("#text-data_section").css("display", ""); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); + break; case : $("#text-data_section").css("display", "none"); $("#dashboard").css("display", "none"); $("#visual_console").css("display", "none"); + $("#show_vc").css("display", "none"); + $("#show_db").css("display", "none"); + break; } } diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index cbf10b496d..a93fc526e8 100644 --- a/pandora_console/pandora_console.redhat.spec +++ b/pandora_console/pandora_console.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.753 -%define release 210412 +%define release 210414 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec index 6100036ccd..7b5ad07818 100644 --- a/pandora_console/pandora_console.rhel7.spec +++ b/pandora_console/pandora_console.rhel7.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.753 -%define release 210412 +%define release 210414 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 0c20abebb4..a055e8d820 100644 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.753 -%define release 210412 +%define release 210414 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2 diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index fce3eaf402..de448f7dd9 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -1199,8 +1199,8 @@ INSERT INTO `tupdate_settings` VALUES ('current_update', '412'), ('customer_key -- -- Dumping data for table `tskin` -- -INSERT INTO `tskin` VALUES (1,'skin default', 'skin_default', 'Default skin for Pandora FMS web console', 1); -INSERT INTO `tskin` VALUES (2,'Legacy', 'legacy', 'Skin of the visual style of Pandora FMS 4.x and previous versions', 1); +INSERT INTO `tskin` VALUES (1,'Default theme', 'pandora.css', 'Default skin for Pandora FMS web console', 0); +INSERT INTO `tskin` VALUES (2,'Black theme', 'pandora_black.css', 'Black theme', 0); -- -- Dumping data for table `tcollection` diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index 0401088cd8..51da18be12 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 7.0NG.753-210412 +Version: 7.0NG.753-210414 Architecture: all Priority: optional Section: admin diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index df91215a14..8ef71038a5 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/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.753-210412" +pandora_version="7.0NG.753-210414" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 2750404ea9..7788686d08 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -45,7 +45,7 @@ our @EXPORT = qw( # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.753"; -my $pandora_build = "210412"; +my $pandora_build = "210414"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index e09942308e..40cd75f4d9 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1376,11 +1376,11 @@ sub pandora_execute_action ($$$$$$$$$;$) { my $threshold = shift; my $period = $hours * 3600; # Hours to seconds if($threshold == 0){ - $params->{"other"} = $period . '%7C0%7C0%7C225'; + $params->{"other"} = $period . '%7C1%7C0%7C225'; $cid = 'module_graph_' . $hours . 'h'; } else{ - $params->{"other"} = $period . '%7C0%7C1%7C225'; + $params->{"other"} = $period . '%7C1%7C1%7C225'; $cid = 'module_graphth_' . $hours . 'h'; } diff --git a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm index c5f6b0f1c4..f1c10268e6 100644 --- a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm +++ b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm @@ -49,7 +49,7 @@ my %PendingTasks :shared; my $Sem :shared; my $TaskSem :shared; -# IDs from tconfig_os. +# Some required constants, OS_X from tconfig_os. use constant { OS_OTHER => 10, OS_ROUTER => 17, @@ -63,17 +63,6 @@ use constant { STEP_STATISTICS => 1, STEP_APP_SCAN => 2, STEP_CUSTOM_QUERIES => 3, - DISCOVERY_HOSTDEVICES => 0, - DISCOVERY_HOSTDEVICES_CUSTOM => 1, - DISCOVERY_CLOUD_AWS => 2, - DISCOVERY_APP_VMWARE => 3, - DISCOVERY_APP_MYSQL => 4, - DISCOVERY_APP_ORACLE => 5, - DISCOVERY_CLOUD_AWS_EC2 => 6, - DISCOVERY_CLOUD_AWS_RDS => 7, - DISCOVERY_CLOUD_AZURE_COMPUTE => 8, - DISCOVERY_DEPLOY_AGENTS => 9, - DISCOVERY_APP_SAP => 10, DISCOVERY_REVIEW => 0, DISCOVERY_STANDARD => 1, DISCOVERY_RESULTS => 2, diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 4a5af54f8a..61718a93a4 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -34,7 +34,7 @@ our @ISA = qw(Exporter); # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.753"; -my $pandora_build = "210412"; +my $pandora_build = "210414"; our $VERSION = $pandora_version." ".$pandora_build; our %EXPORT_TAGS = ( 'all' => [ qw() ] ); diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index 7d7c3fbfd9..0d532e46dc 100755 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -86,6 +86,7 @@ our @EXPORT = qw( DISCOVERY_APP_ORACLE DISCOVERY_CLOUD_AWS_EC2 DISCOVERY_CLOUD_AWS_RDS + DISCOVERY_CLOUD_AWS_S3 DISCOVERY_CLOUD_AZURE_COMPUTE DISCOVERY_DEPLOY_AGENTS DISCOVERY_APP_SAP @@ -220,6 +221,7 @@ use constant DISCOVERY_APP_SAP => 10; use constant DISCOVERY_APP_DB2 => 11; use constant DISCOVERY_APP_MICROSOFT_SQL_SERVER => 12; use constant DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE => 13; +use constant DISCOVERY_CLOUD_AWS_S3 => 14; # Set OS, OS version and /dev/null our $OS = $^O; diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 957e39be18..4967ad6bf8 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.753 -%define release 210412 +%define release 210414 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 4f4cc45fd8..c923e517a8 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.753 -%define release 210412 +%define release 210414 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 27fe60503c..62e3f669de 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.753" -PI_BUILD="210412" +PI_BUILD="210414" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index dad150e4c8..8486ae06f9 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.753 PS210412"; +my $version = "7.0NG.753 PS210414"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 717c957148..3a9fc1d3ba 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.753 PS210412"; +my $version = "7.0NG.753 PS210414"; # save program name for logging my $progname = basename($0); diff --git a/pandora_server/util/plugin/snmp_remote.pl b/pandora_server/util/plugin/snmp_remote.pl index 040de876bb..96d1f69c39 100755 --- a/pandora_server/util/plugin/snmp_remote.pl +++ b/pandora_server/util/plugin/snmp_remote.pl @@ -247,9 +247,10 @@ if ($module eq "diskuse") { $diskuse = 0; } else { - my @diskfree = split (/\s/, `snmpget -r 2 $command_line_parameters .1.3.6.1.2.1.25.2.3.1.6.$diskid`) ; + # hrStorageAllocationUnits + my @diskUsed = split (/\s/, `snmpget -r 2 $command_line_parameters .1.3.6.1.2.1.25.2.3.1.6.$diskid`) ; - $diskuse = ($disktot[-1] - $diskfree[-1]) * 100 / $disktot[-1]; + $diskuse = ($diskUsed[-1] * 100) / $disktot[-1]; } printf("%.2f", $diskuse);