tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center

This commit is contained in:
Daniel Barbero Martin 2021-04-14 08:35:02 +02:00
parent aa31ed8f58 46291eed66
commit 1b21652ed2
38 changed files with 142 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.753-210413 Version: 7.0NG.753-210414
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.753-210413" pandora_version="7.0NG.753-210414"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -1015,7 +1015,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.753'; use constant AGENT_VERSION => '7.0NG.753';
use constant AGENT_BUILD => '210413'; use constant AGENT_BUILD => '210414';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.753 %define version 7.0NG.753
%define release 210413 %define release 210414
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.753 %define version 7.0NG.753
%define release 210413 %define release 210414
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.753" PI_VERSION="7.0NG.753"
PI_BUILD="210413" PI_BUILD="210414"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{210413} {210414}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.753(Build 210413)") #define PANDORA_VERSION ("7.0NG.753(Build 210414)")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST" VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.753(Build 210413))" VALUE "ProductVersion", "(7.0NG.753(Build 210414))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.753-210413 Version: 7.0NG.753-210414
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.753-210413" pandora_version="7.0NG.753-210414"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

3
pandora_console/extras/mr/46.sql
View File

@ -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 `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; COMMIT;

3
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -565,6 +565,9 @@ CREATE TABLE IF NOT EXISTS `tskin` (
PRIMARY KEY (id) PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) 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` -- Table `tpolicy_queue`
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------

11
pandora_console/godmode/groups/configure_group.php
View File

@ -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); $table->data[$i][1] = html_print_textarea('other', 4, 40, $other, "class='min-height-0px'", true);
$i++; $i++;
$isFunctionSkins = enterprise_include_once('include/functions_skins.php'); // $isFunctionSkins = enterprise_include_once('include/functions_skins.php');
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK && !defined('METACONSOLE')) { // if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK && !defined('METACONSOLE')) {
$table->data[9][0] = __('Skin'); // $table->data[10][0] = __('Skin');
$table->data[9][1] = skins_print_select($config['id_user'], 'skin', $skin, '', __('None'), 0, true); // $table->data[10][1] = skins_print_select($config['id_user'], 'skin', $skin, '', __('None'), 0, true);
} // }
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
$sec = 'advanced'; $sec = 'advanced';
} else { } else {

23
pandora_console/godmode/users/configure_user.php
View File

@ -1111,7 +1111,9 @@ if ($dashboards === false) {
} }
} }
$home_screen .= '<div id="show_db" style="display: none; width: 100%;">';
$home_screen .= html_print_select($dashboards_aux, 'dashboard', $user_info['data_section'], '', '', '', true); $home_screen .= html_print_select($dashboards_aux, 'dashboard', $user_info['data_section'], '', '', '', true);
$home_screen .= '</div>';
$layouts = visual_map_get_user_layouts($config['id_user'], true); $layouts = visual_map_get_user_layouts($config['id_user'], true);
@ -1124,6 +1126,7 @@ if ($layouts === false) {
} }
} }
$home_screen .= '<div id="show_vc" style="display: none; width: 100%;">';
$home_screen .= html_print_select( $home_screen .= html_print_select(
$layouts_aux, $layouts_aux,
'visual_console', 'visual_console',
@ -1133,6 +1136,8 @@ $home_screen .= html_print_select(
'', '',
true true
); );
$home_screen .= '</div>';
$home_screen .= html_print_input_text( $home_screen .= html_print_input_text(
'data_section', 'data_section',
$user_info['data_section'], $user_info['data_section'],
@ -1664,46 +1669,64 @@ function show_data_section () {
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", ""); $("#dashboard").css("display", "");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "inline-grid");
break; break;
case <?php echo "'".'Visual console'."'"; ?>: case <?php echo "'".'Visual console'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", ""); $("#visual_console").css("display", "");
$("#show_vc").css("display", "inline-grid");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Event list'."'"; ?>: case <?php echo "'".'Event list'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Group view'."'"; ?>: case <?php echo "'".'Group view'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Tactical view'."'"; ?>: case <?php echo "'".'Tactical view'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Alert detail'."'"; ?>: case <?php echo "'".'Alert detail'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'External link'."'"; ?>: case <?php echo "'".'External link'."'"; ?>:
$("#text-data_section").css("display", ""); $("#text-data_section").css("display", "");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Other'."'"; ?>: case <?php echo "'".'Other'."'"; ?>:
$("#text-data_section").css("display", ""); $("#text-data_section").css("display", "");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Default'."'"; ?>: case <?php echo "'".'Default'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
} }
} }

17
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -713,6 +713,19 @@ class DiscoveryTaskList extends HTML
$data[6] .= __('Discovery.Cloud.Aws.RDS'); $data[6] .= __('Discovery.Cloud.Aws.RDS');
break; 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',
]
).'&nbsp;&nbsp;';
$data[6] .= __('Discovery.Cloud.Aws.S3');
break;
case DISCOVERY_APP_MYSQL: case DISCOVERY_APP_MYSQL:
// Discovery Applications MySQL. // Discovery Applications MySQL.
$data[6] = html_print_image( $data[6] = html_print_image(
@ -868,6 +881,7 @@ class DiscoveryTaskList extends HTML
&& $task['type'] != DISCOVERY_APP_DB2 && $task['type'] != DISCOVERY_APP_DB2
&& $task['type'] != DISCOVERY_APP_SAP && $task['type'] != DISCOVERY_APP_SAP
&& $task['type'] != DISCOVERY_CLOUD_AWS_RDS && $task['type'] != DISCOVERY_CLOUD_AWS_RDS
&& $task['type'] != DISCOVERY_CLOUD_AWS_S3
) { ) {
if (check_acl($config['id_user'], 0, 'MR')) { if (check_acl($config['id_user'], 0, 'MR')) {
$data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">'; $data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">';
@ -1046,6 +1060,9 @@ class DiscoveryTaskList extends HTML
case DISCOVERY_CLOUD_AZURE_COMPUTE: case DISCOVERY_CLOUD_AZURE_COMPUTE:
return 'wiz=cloud&mode=azure&ki='.$task['auth_strings'].'&sub=compute&page=0'; 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: default:
return 'wiz=cloud'; return 'wiz=cloud';
} }

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC210413'; $build_version = 'PC210414';
$pandora_version = 'v7.0NG.753'; $pandora_version = 'v7.0NG.753';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

1
pandora_console/include/constants.php
View File

@ -626,6 +626,7 @@ define('DISCOVERY_APP_SAP', 10);
define('DISCOVERY_APP_DB2', 11); define('DISCOVERY_APP_DB2', 11);
define('DISCOVERY_APP_MICROSOFT_SQL_SERVER', 12); define('DISCOVERY_APP_MICROSOFT_SQL_SERVER', 12);
define('DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE', 13); define('DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE', 13);
define('DISCOVERY_CLOUD_AWS_S3', 14);
// Force task build tmp results. // Force task build tmp results.
define('DISCOVERY_REVIEW', 0); define('DISCOVERY_REVIEW', 0);

26
pandora_console/include/functions_config.php
View File

@ -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')) { if (defined('METACONSOLE')) {
$config['metaconsole_access'] = $userinfo['metaconsole_access']; $config['metaconsole_access'] = $userinfo['metaconsole_access'];
} }

2
pandora_console/install.php
View File

@ -129,7 +129,7 @@
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '7.0NG.753'; $version = '7.0NG.753';
$build = '210413'; $build = '210414';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

30
pandora_console/operation/users/user_edit.php
View File

@ -376,7 +376,9 @@ if (!$meta) {
} }
} }
$home_screen .= html_print_select($dashboards_aux, 'dashboard', $user_info['data_section'], '', '', '', true); $home_screen .= '<div id="show_db" style="display: none; width: 100%;">';
$home_screen .= html_print_select($dashboards_aux, 'dashboard', $user_info['data_section'], '', '', '', true, false, false, '');
$home_screen .= '</div>';
$layouts = visual_map_get_user_layouts($config['id_user'], true); $layouts = visual_map_get_user_layouts($config['id_user'], true);
$layouts_aux = []; $layouts_aux = [];
@ -388,7 +390,9 @@ if (!$meta) {
} }
} }
$home_screen .= '<div id="show_vc" style="display: none; width: 100%;">';
$home_screen .= html_print_select($layouts_aux, 'visual_console', $user_info['data_section'], '', '', '', true); $home_screen .= html_print_select($layouts_aux, 'visual_console', $user_info['data_section'], '', '', '', true);
$home_screen .= '</div>';
$home_screen .= html_print_input_text('data_section', $user_info['data_section'], '', 60, 255, true, false); $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"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", ""); $("#dashboard").css("display", "");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "inline-grid");
break; break;
case <?php echo "'".'Visual console'."'"; ?>: case <?php echo "'".'Visual console'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", ""); $("#visual_console").css("display", "");
$("#show_vc").css("display", "inline-grid");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Event list'."'"; ?>: case <?php echo "'".'Event list'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Group view'."'"; ?>: case <?php echo "'".'Group view'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Tactical view'."'"; ?>: case <?php echo "'".'Tactical view'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Alert detail'."'"; ?>: case <?php echo "'".'Alert detail'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Other'."'"; ?>: case <?php echo "'".'Other'."'"; ?>:
$("#text-data_section").css("display", ""); $("#text-data_section").css("display", "");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
case <?php echo "'".'Default'."'"; ?>: case <?php echo "'".'Default'."'"; ?>:
$("#text-data_section").css("display", "none"); $("#text-data_section").css("display", "none");
$("#dashboard").css("display", "none"); $("#dashboard").css("display", "none");
$("#visual_console").css("display", "none"); $("#visual_console").css("display", "none");
$("#show_vc").css("display", "none");
$("#show_db").css("display", "none");
break; break;
} }
} }

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.753 %define version 7.0NG.753
%define release 210413 %define release 210414
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.753 %define version 7.0NG.753
%define release 210413 %define release 210414
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.753 %define version 7.0NG.753
%define release 210413 %define release 210414
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

4
pandora_console/pandoradb_data.sql
View File

@ -1199,8 +1199,8 @@ INSERT INTO `tupdate_settings` VALUES ('current_update', '412'), ('customer_key
-- --
-- Dumping data for table `tskin` -- Dumping data for table `tskin`
-- --
INSERT INTO `tskin` VALUES (1,'skin&#x20;default', 'skin_default', 'Default&#x20;skin&#x20;for&#x20;Pandora&#x20;FMS&#x20;web&#x20;console', 1); INSERT INTO `tskin` VALUES (1,'Default&#x20;theme', 'pandora.css', 'Default&#x20;skin&#x20;for&#x20;Pandora&#x20;FMS&#x20;web&#x20;console', 0);
INSERT INTO `tskin` VALUES (2,'Legacy', 'legacy', 'Skin&#x20;of&#x20;the&#x20;visual&#x20;style&#x20;of&#x20;Pandora&#x20;FMS&#x20;4.x&#x20;and&#x20;previous&#x20;versions', 1); INSERT INTO `tskin` VALUES (2,'Black&#x20;theme', 'pandora_black.css', 'Black&#x20;theme', 0);
-- --
-- Dumping data for table `tcollection` -- Dumping data for table `tcollection`

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.753-210413 Version: 7.0NG.753-210414
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.753-210413" pandora_version="7.0NG.753-210414"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.753"; my $pandora_version = "7.0NG.753";
my $pandora_build = "210413"; my $pandora_build = "210414";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

4
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -1376,11 +1376,11 @@ sub pandora_execute_action ($$$$$$$$$;$) {
my $threshold = shift; my $threshold = shift;
my $period = $hours * 3600; # Hours to seconds my $period = $hours * 3600; # Hours to seconds
if($threshold == 0){ if($threshold == 0){
$params->{"other"} = $period . '%7C0%7C0%7C225'; $params->{"other"} = $period . '%7C1%7C0%7C225';
$cid = 'module_graph_' . $hours . 'h'; $cid = 'module_graph_' . $hours . 'h';
} }
else{ else{
$params->{"other"} = $period . '%7C0%7C1%7C225'; $params->{"other"} = $period . '%7C1%7C1%7C225';
$cid = 'module_graphth_' . $hours . 'h'; $cid = 'module_graphth_' . $hours . 'h';
} }

13
pandora_server/lib/PandoraFMS/DiscoveryServer.pm
View File

@ -49,7 +49,7 @@ my %PendingTasks :shared;
my $Sem :shared; my $Sem :shared;
my $TaskSem :shared; my $TaskSem :shared;
# IDs from tconfig_os. # Some required constants, OS_X from tconfig_os.
use constant { use constant {
OS_OTHER => 10, OS_OTHER => 10,
OS_ROUTER => 17, OS_ROUTER => 17,
@ -63,17 +63,6 @@ use constant {
STEP_STATISTICS => 1, STEP_STATISTICS => 1,
STEP_APP_SCAN => 2, STEP_APP_SCAN => 2,
STEP_CUSTOM_QUERIES => 3, 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_REVIEW => 0,
DISCOVERY_STANDARD => 1, DISCOVERY_STANDARD => 1,
DISCOVERY_RESULTS => 2, DISCOVERY_RESULTS => 2,

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.753"; my $pandora_version = "7.0NG.753";
my $pandora_build = "210413"; my $pandora_build = "210414";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -86,6 +86,7 @@ our @EXPORT = qw(
DISCOVERY_APP_ORACLE DISCOVERY_APP_ORACLE
DISCOVERY_CLOUD_AWS_EC2 DISCOVERY_CLOUD_AWS_EC2
DISCOVERY_CLOUD_AWS_RDS DISCOVERY_CLOUD_AWS_RDS
DISCOVERY_CLOUD_AWS_S3
DISCOVERY_CLOUD_AZURE_COMPUTE DISCOVERY_CLOUD_AZURE_COMPUTE
DISCOVERY_DEPLOY_AGENTS DISCOVERY_DEPLOY_AGENTS
DISCOVERY_APP_SAP DISCOVERY_APP_SAP
@ -220,6 +221,7 @@ use constant DISCOVERY_APP_SAP => 10;
use constant DISCOVERY_APP_DB2 => 11; use constant DISCOVERY_APP_DB2 => 11;
use constant DISCOVERY_APP_MICROSOFT_SQL_SERVER => 12; use constant DISCOVERY_APP_MICROSOFT_SQL_SERVER => 12;
use constant DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE => 13; use constant DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE => 13;
use constant DISCOVERY_CLOUD_AWS_S3 => 14;
# Set OS, OS version and /dev/null # Set OS, OS version and /dev/null
our $OS = $^O; our $OS = $^O;

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.753 %define version 7.0NG.753
%define release 210413 %define release 210414
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.753 %define version 7.0NG.753
%define release 210413 %define release 210414
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.753" PI_VERSION="7.0NG.753"
PI_BUILD="210413" PI_BUILD="210414"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.753 PS210413"; my $version = "7.0NG.753 PS210414";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.753 PS210413"; my $version = "7.0NG.753 PS210414";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);

5
pandora_server/util/plugin/snmp_remote.pl
View File

@ -247,9 +247,10 @@ if ($module eq "diskuse") {
$diskuse = 0; $diskuse = 0;
} }
else { 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); printf("%.2f", $diskuse);