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

Merge branch 'develop' into ent-13639-17447-usuario-sin-acceso-a-grupo-x-puede-ver-snmp-traps-de-agentes-pertenecientes-al-grupo-x

This commit is contained in:
Pablo Aragon 2024-05-06 09:27:55 +02:00
parent 7e23501011 d69e6a8dd8
commit ea963d6ab4
65 changed files with 552 additions and 364 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
Version: 7.0NG.776-240429
Version: 7.0NG.776-240506
Architecture: all
Priority: optional
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
# GNU General Public License for more details.
pandora_version="7.0NG.776-240429"
pandora_version="7.0NG.776-240506"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

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

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

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240429
%define release 240506
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240429
%define release 240506
%define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version

2
pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240429
%define release 240506
%define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version

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

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240429
%define release 240506
Summary: Pandora FMS Linux agent, binary version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240429
%define release 240506
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.776"
PI_BUILD="240429"
PI_BUILD="240506"
OS_NAME=`uname -s`
FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{240429}
{240506}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

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

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Pandora FMS"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.776(Build 240429))"
VALUE "ProductVersion", "(7.0NG.776(Build 240506))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.776-240429
Version: 7.0NG.776-240506
Architecture: all
Priority: optional
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
# GNU General Public License for more details.
pandora_version="7.0NG.776-240429"
pandora_version="7.0NG.776-240506"
package_pear=0
package_pandora=1

53
pandora_console/extensions/api_checker.php
View File

@ -69,38 +69,41 @@ function api_execute(
if (empty($url) === true) {
$url = 'http://'.$ip.$pandora_url.'/include/api.php?';
} else {
$url_schema = parse_url($url);
$url = $url_schema['scheme'].'://'.$url_schema['host'].$pandora_url.'/include/api.php?';
}
if (empty($op) === false) {
$data['op'] = $op;
}
if (empty($op) === false) {
$data['op'] = $op;
}
if (empty($op2) === false) {
$data['op2'] = $op2;
}
if (empty($op2) === false) {
$data['op2'] = $op2;
}
if (empty($id) === false) {
$data['id'] = $id;
}
if (empty($id) === false) {
$data['id'] = $id;
}
if (empty($id2) === false) {
$data['id2'] = $id2;
}
if (empty($id2) === false) {
$data['id2'] = $id2;
}
if (empty($return_type) === false) {
$data['return_type'] = $return_type;
}
if (empty($return_type) === false) {
$data['return_type'] = $return_type;
}
if (empty($other) === false) {
$data['other_mode'] = $other_mode;
$data['other'] = $other;
}
if (empty($other) === false) {
$data['other_mode'] = $other_mode;
$data['other'] = $other;
}
// If token is not reported,use old method.
if (empty($token) === true) {
$data['apipass'] = $apipass;
$data['user'] = $user;
$data['pass'] = $password;
}
// If token is not reported,use old method.
if (empty($token) === true) {
$data['apipass'] = $apipass;
$data['user'] = $user;
$data['pass'] = $password;
}
$url_protocol = parse_url($url)['scheme'];

2
pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini
View File

@ -1,4 +1,4 @@
pandorafms.vmware=3d1785e1baa07db0a40b9e47bb30472c
pandorafms.vmware=999bbda7bbcc313aee81d6816f8a5c0e
pandorafms.mysql=33d470c7492214d4b384ed307e81adf4
pandorafms.vmware=1deafce1d55d3574645d8b136104e9ad
pandorafms.mysql=ca7dd8b80a1a03a25eb0fb077818ad63

2
pandora_console/extras/mr/69.sql
View File

@ -7762,4 +7762,6 @@ UPDATE `tdiscovery_apps_executions` SET `execution` = ''_exec1_' 
INSERT INTO `tconfig` (`token`, `value`) VALUES ('JWT_signature', 1);
DELETE FROM tconfig WHERE `token` = 'loginhash_pwd';
UPDATE `tdiscovery_apps` SET `version` = '1.5' WHERE `short_name` = 'pandorafms.vmware';
COMMIT;

14
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -1065,6 +1065,7 @@ if ($update_agent) {
}
$field_values = [];
$update_custom_result = false;
foreach ($fields as $field) {
$field_value = get_parameter_post('customvalue_'.$field['id_field'], '');
@ -1115,7 +1116,7 @@ if ($update_agent) {
);
if ($update_custom == 1) {
$update_custom_result = 1;
$update_custom_result = true;
}
}
}
@ -1157,6 +1158,7 @@ if ($update_agent) {
}
}
$agent_data = agents_get_agent($id_agente);
$values = [
'disabled' => $disabled,
'id_parent' => $id_parent,
@ -1184,6 +1186,14 @@ if ($update_agent) {
'vul_scan_enabled' => $vul_scan_enabled,
'ignore_unknown' => $ignore_unknown,
];
// Update change fix on ticket 13501 to no show errors when press button update with out change anything.
$update_change = false;
foreach ($values as $key => $value) {
if (isset($agent_data[$key]) === true && $agent_data[$key] !== $value) {
$update_agent = true;
break;
}
}
if (empty($repeated_name) === true) {
$values['nombre'] = $nombre_agente;
@ -1195,7 +1205,7 @@ if ($update_agent) {
}
$result = (bool) db_process_sql_update('tagente', $values, ['id_agente' => $id_agente]);
if ($result === false && $update_custom_result == false) {
if ($result === false && $update_custom_result === false && $update_change === true) {
ui_print_error_message(
__('There was a problem updating the agent')
);

16
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -566,10 +566,10 @@ if ($search != '') {
if ($id != '') {
$aux = $id[0]['id_agent'];
$search_sql = sprintf(
' AND ( REPLACE(nombre, " ", " ") LIKE "%%%s%%"
OR REPLACE(alias, " ", " ") LIKE "%%%s%%"
OR REPLACE(comentarios, " ", " ") LIKE "%%%s%%"
OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND REPLACE(description, " ", " ") LIKE "%%%s%%")
' AND ( nombre LIKE "%%%s%%"
OR alias LIKE "%%%s%%"
OR comentarios LIKE "%%%s%%"
OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description LIKE "%%%s%%")
OR tagente.id_agente = %d',
$search,
$search,
@ -591,10 +591,10 @@ if ($search != '') {
$search_sql .= ')';
} else {
$search_sql = sprintf(
' AND ( REPLACE(nombre, " ", " ")
LIKE "%%%s%%" OR REPLACE(alias, " ", " ")
LIKE "%%%s%%" OR REPLACE(comentarios, " ", " ") LIKE "%%%s%%"
OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND REPLACE(description, " ", " ") LIKE "%%%s%%"))',
' AND ( nombre
LIKE "%%%s%%" OR alias
LIKE "%%%s%%" OR comentarios LIKE "%%%s%%"
OR EXISTS (SELECT * FROM tagent_custom_data WHERE id_agent = id_agente AND description LIKE "%%%s%%"))',
$search,
$search,
$search,

4
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -1459,7 +1459,7 @@ $class = 'databox filters';
<td class="bolder">
<?php
echo __('Module').ui_print_help_tip(
__('Case insensitive regular expression or string for module name. For example: if you use this field with "Module exact match" enabled then this field has to be fulfilled with the literally string of the module name, if not you can use a regular expression. Example: %s will match: cpu_usage, vram usage in matchine 1.', '.*usage.*'),
__('Case insensitive regular expression or string for module name. For example: if you use this field with "Module exact match" enabled then this field has to be fulfilled with the literally string of the module name, if not you can use a regular expression. Example: %s will match: cpu_usage, vram usage in machine 1.', '.*usage.*'),
true
);
?>
@ -2318,7 +2318,9 @@ if (is_metaconsole() === true) {
$params['add_none_module'] = true;
$params['use_hidden_input_idagent'] = true;
$params['hidden_input_idagent_id'] = 'hidden-id_agent';
$params['size'] = 40;
if ($meta) {
$params['size'] = 44;
$params['use_input_id_server'] = true;
$params['input_id_server_id'] = 'hidden-server_id';
$params['metaconsole_enabled'] = true;

1
pandora_console/godmode/setup/file_manager.php
View File

@ -121,6 +121,7 @@ if ($upload_file === true) {
MIME_TYPES['jpg'],
MIME_TYPES['png'],
MIME_TYPES['gif'],
MIME_TYPES['svg'],
]
);
}

4
pandora_console/godmode/setup/os.list.php
View File

@ -219,7 +219,9 @@ echo '<div id="aux" class="invisible"></div>';
$('#aux').text('<?php echo __('Not deleted. Error deleting data'); ?>');
} else {
$('#aux').dialog('close');
location.reload();
let url = new URL(window.location.href);
url.searchParams.set('message', r.url_message)
window.location.href = url.href;
}
},
error: function(e) {

2
pandora_console/include/ajax/events.php
View File

@ -2541,7 +2541,7 @@ if ($drawConsoleSound === true) {
true,
[
'title' => __('No alerts discovered'),
'class' => 'invert_filter',
'class' => '',
]
);
$output .= '<span class="text-discovered-alerts">';

128
pandora_console/include/ajax/module.php
View File

@ -55,6 +55,7 @@ if (check_login()) {
$get_id_tag = (bool) get_parameter('get_id_tag', 0);
$get_type = (bool) get_parameter('get_type', 0);
$list_modules = (bool) get_parameter('list_modules', 0);
$list_snmp_modules = (bool) get_parameter('list_snmp_modules', 0);
$get_agent_modules_json_by_name = (bool) get_parameter(
'get_agent_modules_json_by_name',
0
@ -1538,6 +1539,133 @@ if (check_login()) {
unset($table_data);
}
if ($list_snmp_modules) {
include_once $config['homedir'].'/include/functions_graph.php';
$agent = get_parameter('agent');
$id_agente = $agent;
$paginate_module = false;
if (isset($config['paginate_module']) === true) {
$paginate_module = (bool) $config['paginate_module'];
}
$network_interfaces_by_agents = agents_get_network_interfaces([$agent], false, $paginate_module, get_parameter('offset', 0));
$count_network_incerfaces = agents_get_network_interfaces([$agent], false, false, 0, true);
$network_interfaces = [];
if (empty($network_interfaces_by_agents) === false && empty($network_interfaces_by_agents[$id_agente]) === false) {
$network_interfaces = $network_interfaces_by_agents[$id_agente]['interfaces'];
}
if (empty($network_interfaces) === false) {
$table_interface = new stdClass();
$table_interface->id = 'agent_interface_info';
$table_interface->class = 'info_table';
$table_interface->width = '100%';
$table_interface->style = [];
$table_interface->style['interface_event_graph'] = 'width: 35%;';
$table_interface->head = [];
$options = [
'class' => 'closed',
'style' => 'cursor:pointer;',
];
$table_interface->data = [];
$event_text_cont = 0;
foreach ($network_interfaces as $interface_name => $interface) {
if (empty($interface['traffic']) === false) {
$permission = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR');
if ($permission) {
$params = [
'interface_name' => $interface_name,
'agent_id' => $id_agente,
'traffic_module_in' => $interface['traffic']['in'],
'traffic_module_out' => $interface['traffic']['out'],
];
$params_json = json_encode($params);
$params_encoded = base64_encode($params_json);
$win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
$graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=";
$graph_link .= $params_encoded."','";
$graph_link .= $win_handle."', 800, 480)\">";
$graph_link .= html_print_image(
'images/chart.png',
true,
[
'title' => __('Interface traffic'),
'class' => 'invert_filter',
]
).'</a>';
} else {
$graph_link = '';
}
} else {
$graph_link = '';
}
$content = [
'id_agent_module' => $interface['status_module_id'],
'id_group' => $id_group,
'period' => SECONDS_1DAY,
'time_from' => '00:00:00',
'time_to' => '00:00:00',
'sizeForTicks' => 250,
'height_graph' => 40,
[
['id_agent_module' => $interface['status_module_id']],
]
];
$e_graph = \reporting_module_histogram_graph(
['datetime' => time()],
$content
);
$sqlLast_contact = sprintf(
'
SELECT timestamp
FROM tagente_estado
WHERE id_agente_modulo = '.$interface['status_module_id']
);
$last_contact = db_get_all_rows_sql($sqlLast_contact);
$last_contact = array_shift($last_contact);
$last_contact = array_shift($last_contact);
$data = [];
$data['interface_name'] = '<strong>'.$interface_name.'</strong>';
$data['interface_status'] = $interface['status_image'];
$data['interface_graph'] = $graph_link;
$data['interface_ip'] = $interface['ip'];
$data['interface_mac'] = $interface['mac'];
$data['last_contact'] = __('Last contact: ').$last_contact;
$data['interface_event_graph'] = $e_graph['chart'];
$table_interface->data[] = $data;
}
if ($paginate_module === true) {
ui_pagination(
$count_network_incerfaces,
false,
0,
0,
false,
'offset',
true,
'',
'change_page_snmp(offset_param)',
[
'count' => '',
'offset' => 'offset_param',
]
);
}
html_print_table($table_interface);
}
}
if ($get_type === true) {
$id_module = (int) get_parameter('id_module');
$module = modules_get_agentmodule($id_module);

7
pandora_console/include/ajax/os.php
View File

@ -60,7 +60,12 @@ if ($method === 'deleteOS') {
) {
echo json_encode(['deleted' => false]);
} else {
echo json_encode(['deleted' => true]);
echo json_encode(
[
'deleted' => true,
'url_message' => 6,
]
);
}
}

6
pandora_console/include/class/SnmpConsole.class.php
View File

@ -521,7 +521,7 @@ class SnmpConsole extends HTML
$legend .= '<div style=" display : flex;align-items : center;">';
$legend .= html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).' - '.__('Delete');
$legend .= '</div>';
$legend .= '</div></div></td>';
$legend .= '</div></div></td></table>';
echo '<br>';
@ -804,8 +804,8 @@ class SnmpConsole extends HTML
$tmp->snmp_agent .= '<a class="'.$severity_class.'" href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&new_agent=1&direccion='.$tmp->source.'" title="'.__('Create agent').'">'.$tmp->source.'</a>';
} else {
$tmp->snmp_agent .= '<div class="'.$severity_class.' snmp-div"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente'].'" title="'.__('View agent details').'">';
$tmp->snmp_agent .= '<strong>'.$agent['alias'].ui_print_help_tip($tmp->source, true);
'</strong></a></div>';
$tmp->snmp_agent .= '<strong>'.$agent['alias'].'</strong></a>'.ui_print_help_tip($tmp->source, true);
'</div>';
}
// Enterprise string.

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@ use DI\ContainerBuilder;
/*
* Pandora build version and version
*/
$build_version = 'PC240429';
$build_version = 'PC240506';
$pandora_version = 'v7.0NG.776';
// Do not overwrite default timezone set if defined.

34
pandora_console/include/functions_agents.php
View File

@ -1544,7 +1544,9 @@ function agents_get_modules(
$indexed=true,
$get_not_init_modules=true,
$force_tags=false,
$filter_include_sql=true
$filter_include_sql=true,
$pagination=false,
$offset=0,
) {
global $config;
@ -1717,7 +1719,17 @@ function agents_get_modules(
$sql_tags_join,
$where
);
$result = db_get_all_rows_sql($sql);
$limit = '';
if ($pagination === true && isset($config['paginate_module']) === true) {
if ($offset === 0) {
$limit = ' LIMIT '.$config['block_size'].' OFFSET 0';
} else {
$limit = ' LIMIT '.$config['block_size'].' OFFSET '.$offset;
}
}
$result = db_get_all_rows_sql($sql.$limit);
if (empty($result)) {
return [];
@ -3333,7 +3345,7 @@ function agents_update_gis(
*
* @return array A list of network interfaces information by agents.
*/
function agents_get_network_interfaces($agents=false, $agents_filter=false)
function agents_get_network_interfaces($agents=false, $agents_filter=false, $pagination=false, $offset=0, $count=false)
{
global $config;
@ -3432,8 +3444,17 @@ function agents_get_network_interfaces($agents=false, $agents_filter=false)
$columns,
$filter,
true,
false
false,
false,
true,
$pagination,
$offset
);
if ($count === true) {
return (count($modules) ?? 0);
}
if (!empty($modules)) {
$interfaces = [];
@ -4755,7 +4776,10 @@ function get_resume_agent_concat($id_agente, $all_groups, $agent)
'force_checks',
false,
'window.location.assign("'.$url.'&amp;flag_agent=1")',
[ 'mode' => 'link' ],
[
'mode' => 'link',
'class' => 'mrgn_lft_20px ',
],
true
);
}

91
pandora_console/include/functions_forecast.php
View File

@ -134,11 +134,14 @@ function forecast_projection_graph(
// 3.1 Standard deviation for X: sqrt((Sum(Xi²)/Obs) - (avg X)²)
// 3.2 Standard deviation for Y: sqrt((Sum(Yi²)/Obs) - (avg Y)²)
// Linear correlation coefficient:
// Agent interval could be zero, 300 is the predefined
// Agent interval could be zero, 300 is the predefined.
if ($sum_obs == 0) {
$agent_interval = SECONDS_5MINUTES;
} else {
$agent_interval = ($sum_diff_dates / $sum_obs);
if ($agent_interval < 60) {
$agent_interval = SECONDS_1MINUTE;
}
}
// Could be a inverse correlation coefficient
@ -170,7 +173,7 @@ function forecast_projection_graph(
$a = 0;
}
// Data inicialization
// Data inicialization.
$output_data = [];
if ($prediction_period != false) {
$limit_timestamp = ($last_timestamp + $prediction_period);
@ -199,50 +202,54 @@ function forecast_projection_graph(
$time_format = 'M d';
}
// Aplying linear regression to module data in order to do the prediction
$idx = 0;
// Create data in graph format like
while ($in_range) {
$now = time();
try {
// Aplying linear regression to module data in order to do the prediction.
$idx = 0;
// Create data in graph format like.
while ($in_range) {
$now = time();
// Check that exec time is not greater than half max exec server time
if ($max_exec_time != false) {
if (($begin_time + ($max_exec_time / 2)) < $now) {
return false;
}
}
$timestamp_f = ($current_ts * 1000);
if ($csv) {
$output_data[$idx]['date'] = $current_ts;
$output_data[$idx]['data'] = ($a + ($b * $current_ts));
} else {
$output_data[$idx][0] = $timestamp_f;
$output_data[$idx][1] = ($a + ($b * $current_ts));
}
// Using this function for prediction_date
if ($prediction_period == false) {
// These statements stop the prediction when interval is greater than 2 years
if (($current_ts - $last_timestamp) >= 94608000
|| $max_value == $min_value
) {
return false;
// Check that exec time is not greater than half max exec server time.
if ($max_exec_time != false) {
if (($begin_time + ($max_exec_time / 2)) < $now) {
return false;
}
}
// Found it
if (($max_value >= $output_data[$idx][1])
&& ($min_value <= $output_data[$idx][0])
) {
return ($current_ts + ($sum_diff_dates * $agent_interval));
}
} else if ($current_ts > $limit_timestamp) {
$in_range = false;
}
$timestamp_f = ($current_ts * 1000);
$current_ts = ($current_ts + $agent_interval);
$idx++;
if ($csv) {
$output_data[$idx]['date'] = $current_ts;
$output_data[$idx]['data'] = ($a + ($b * $current_ts));
} else {
$output_data[$idx][0] = $timestamp_f;
$output_data[$idx][1] = ($a + ($b * $current_ts));
}
// Using this function for prediction_date.
if ($prediction_period == false) {
// These statements stop the prediction when interval is greater than 2 years.
if (($current_ts - $last_timestamp) >= 94608000
|| $max_value == $min_value
) {
return false;
}
// Found it.
if (($max_value >= $output_data[$idx][1])
&& ($min_value <= $output_data[$idx][0])
) {
return ($current_ts + ($sum_diff_dates * $agent_interval));
}
} else if ($current_ts > $limit_timestamp) {
$in_range = false;
}
$current_ts = ($current_ts + $agent_interval);
$idx++;
}
} catch (\Exception $e) {
return false;
}
return $output_data;

45
pandora_console/include/functions_groups.php
View File

@ -2662,7 +2662,20 @@ function tactical_groups_get_agents_and_monitoring($id_groups, $data='')
$tdata[1] = '<a class="big_data" href="'.$urls['total_agents'].'">'.$tdata[1].'</a>';
if ($data['total_agents'] > 500 && !enterprise_installed()) {
$tdata[2] = "<div id='agentsmodal' class='publienterprise' title='".__('Enterprise version not installed')."'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
$tdata[2] = "<div id='agentsmodal' class='publienterprise' title='Community version' >";
$tdata[2] .= html_print_image(
'images/alert_enterprise.png',
true,
[
'title' => __('Enterprise version not installed'),
'class' => 'img_help'
],
false,
false,
false,
true
);
$tdata[2] .= '</div>';
}
$tdata[3] = html_print_image('images/module.png', true, ['title' => __('Monitor checks'), 'class' => 'invert_filter'], false, false, false, true);
@ -2676,7 +2689,20 @@ function tactical_groups_get_agents_and_monitoring($id_groups, $data='')
*/
if ($data['total_agents']) {
if (($data['monitor_total'] / $data['total_agents'] > 100) && !enterprise_installed()) {
$tdata[5] = "<div id='monitorcheckmodal' class='publienterprise' title='Community version' ><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
$tdata[5] = "<div id='monitorcheckmodal' class='publienterprise' title='Community version' >";
$tdata[5] .= html_print_image(
'images/alert_enterprise.png',
true,
[
'title' => __('Enterprise version not installed'),
'class' => 'img_help'
],
false,
false,
false,
true
);
$tdata[5] .= '</div>';
}
}
@ -2728,7 +2754,20 @@ function tactical_groups_get_stats_alerts($id_groups, $data='')
*/
if ($data['monitor_alerts'] > $data['total_agents'] && !enterprise_installed()) {
$tdata[2] = "<div id='alertagentmodal' class='publienterprise' title='Community version' ><img data-title='".__('Enterprise version not installed')."' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
$tdata[2] = "<div id='alertagentmodal' class='publienterprise' title='Community version' >";
$tdata[2] .= html_print_image(
'images/alert_enterprise.png',
true,
[
'title' => __('Enterprise version not installed'),
'class' => 'img_help'
],
false,
false,
false,
true
);
$tdata[2] .= '</div>';
}
$tdata[3] = html_print_image(

8
pandora_console/include/functions_netflow.php
View File

@ -1570,8 +1570,12 @@ function netflow_draw_item(
);
// Theme.
$theme = $config['style'];
$text_color = ($theme !== 'pandora_black') ? '#333' : '#fff';
$user_info = get_user_info($config['id_user']);
if (isset($user_info['id_skin']) === true && (int) $user_info['id_skin'] === 2) {
$text_color = '#ffffff';
} else {
$text_color = '#333333';
}
$graph_output = pie_graph(
$pie_data,

2
pandora_console/include/functions_planned_downtimes.php
View File

@ -961,7 +961,7 @@ function planned_downtimes_items($filter)
function delete_planned_downtimes($filter)
{
$downtime_execute = db_get_row_filter('tplanned_downtime', ['id' => $filter['id_downtime']], 'execute');
$downtime_execute = db_get_row_filter('tplanned_downtime', ['id' => $filter['id_downtime']], 'executed');
if ($downtime_execute) {
$return = __("This scheduled downtime are executed now. Can't delete in this moment.");

7
pandora_console/include/functions_snmp_browser.php
View File

@ -1588,7 +1588,12 @@ function snmp_browser_create_modules_snmp(
enterprise_include_once('include/functions_policies.php');
foreach ($id_target as $policy) {
$ids[] = policies_create_module($oid['oid'], $policy, 2, $values);
$exist = db_get_row_filter('tpolicy_modules', ['name' => $oid['oid'], 'id_policy' => $policy], '*');
if ($exist !== false) {
$ids[] = false;
} else {
$ids[] = policies_create_module($oid['oid'], $policy, 2, $values);
}
}
}
}

22
pandora_console/include/functions_ui.php
View File

@ -2948,14 +2948,14 @@ function ui_print_help_tip(
$text_title = (strlen($text) >= 60) ? substr($text, 0, 60).'...' : $text;
$id = random_int(1, 99999);
$output = '<div id="div_tip_'.$id.'" class="tip" style="'.$style.'" >';
$output = '<div id="div_tip_'.$id.'" class="tip" style="'.$style.'" onclick="open_tip('.$id.')">';
$output .= '<div id="tip_dialog_'.$id.'" class="invisible margin-15" data-title="'.__('Help').'"><span class="font_13px">'.io_safe_output($text).'</span></div>';
$output .= html_print_image(
$img,
true,
[
'title' => $text_title,
'class' => $blink === true ? 'blink' : '',
'title' => io_safe_output($text_title),
'class' => ($blink === true) ? 'blink' : '',
'style' => 'width: 16px; height: 16px;',
],
false,
@ -5867,7 +5867,7 @@ function ui_print_agent_autocomplete_input($parameters)
$hidden_input_idagent_value = $parameters['hidden_input_idagent_value'];
}
$size = 30;
$size = 100;
// Default value.
if (isset($parameters['size'])) {
$size = $parameters['size'];
@ -6293,14 +6293,14 @@ function ui_print_agent_autocomplete_input($parameters)
$javascript_function_change .= '
function setInputBackground(inputId, image) {
$("#"+inputId)
.attr("style", "background-image: url(\'"+image+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
.attr("style", "background-image: url(\'"+image+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'");
}
$(document).ready(function () {
$("#'.$input_id.'").focusout(function (e) {
setTimeout(() => {
let iconImage = "'.$icon_image.'";
$("#'.$input_id.'").attr("style", "background-image: url(\'"+iconImage+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
$("#'.$input_id.'").attr("style", "background-image: url(\'"+iconImage+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'");
}, 100);
});
});
@ -6574,7 +6574,7 @@ function ui_print_agent_autocomplete_input($parameters)
if (select_item_click) {
select_item_click = 0;
$("#'.$input_id.'")
.attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
.attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'");
return;
} else {
// Clear selectbox if item is not selected.
@ -6589,7 +6589,7 @@ function ui_print_agent_autocomplete_input($parameters)
//Set loading
$("#'.$input_id.'")
.attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
.attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'");
var term = input_value; //Word to search
'.$javascript_change_ajax_params_text.'
@ -6606,7 +6606,7 @@ function ui_print_agent_autocomplete_input($parameters)
success: function (data) {
if (data.length < 2) {
//Set icon
$("#'.$input_id.'").attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$inputStyles.'");
$("#'.$input_id.'").attr("style", "background-image: url(\"'.$spinner_image.'\"); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$inputStyles.'");
return;
}
@ -6656,7 +6656,7 @@ function ui_print_agent_autocomplete_input($parameters)
//Set icon
$("#'.$input_id.'")
.attr("style", "background: url(\"'.$icon_image.'\") 97% center no-repeat; background-size: 20px; width:100%; '.$inputStyles.'")
.attr("style", "background: url(\"'.$icon_image.'\") 97% center no-repeat; background-size: 20px; width:'.$size.'%; '.$inputStyles.'")
return;
}
});
@ -6675,7 +6675,7 @@ function ui_print_agent_autocomplete_input($parameters)
}
$attrs = [];
$attrs['style'] = 'background-image: url('.$icon_image.'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:100%; '.$text_color.' '.$inputStyles.'';
$attrs['style'] = 'background-image: url('.$icon_image.'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; width:'.$size.'%; '.$text_color.' '.$inputStyles.'';
if (!$disabled_javascript_on_blur_function) {
$attrs['onblur'] = $javascript_on_blur_function_name.'()';

2
pandora_console/include/javascript/jquery.pandora.js
View File

@ -216,7 +216,7 @@ $(document).ready(function() {
});
$("#ok_buttom").click(function() {
$("#license_error_msg_dialog").dialog("close");
$(".ui-dialog-content").dialog("close");
});
}
}

50
pandora_console/include/javascript/pandora.js
View File

@ -2364,6 +2364,29 @@ var formatterDataVerticalBar = function(value, ctx) {
}
};
function open_tip(id) {
$("#tip_dialog_" + id).dialog({
title: $("#tip_dialog_" + id).data("title"),
modal: true,
maxWidth: 600,
minWidth: 400,
show: {
effect: "fade",
duration: 200
},
hide: {
effect: "fade",
duration: 200
},
closeOnEscape: true,
buttons: {
Close: function() {
$(this).dialog("close");
}
}
});
}
// Show about section
$(document).ready(function() {
$("[id^='icon_about']").click(function() {
@ -2457,33 +2480,6 @@ $(document).ready(function() {
});
}
}
$("[id^='div_tip_']").click(function() {
var id = $(this)
.attr("id")
.split("_")[2];
$("#tip_dialog_" + id).dialog({
title: $("#tip_dialog_" + id).data("title"),
modal: true,
maxWidth: 600,
minWidth: 400,
show: {
effect: "fade",
duration: 200
},
hide: {
effect: "fade",
duration: 200
},
closeOnEscape: true,
buttons: {
Close: function() {
$(this).dialog("close");
}
}
});
});
});
function close_info_box(id) {

12
pandora_console/include/javascript/pandora_dashboards.js
View File

@ -232,6 +232,9 @@ function initialiceLayout(data) {
});
if (!$("#checkbox-edit-mode").is(":checked")) {
$("#add-widget")
.parent()
.addClass("invisible_important");
$(".add-widget").hide();
} else {
$(".new-widget-message").hide();
@ -549,6 +552,9 @@ function initialiceLayout(data) {
grid.resizable(".grid-stack-item", true);
grid.float(false);
$(".header-options").show();
$("#add-widget")
.parent()
.removeClass("invisible_important");
$(".add-widget").show();
$(".new-widget-message").hide();
$("#container-layout").addClass("container-layout");
@ -558,6 +564,9 @@ function initialiceLayout(data) {
grid.resizable(".grid-stack-item", false);
grid.float(true);
$(".header-options").hide();
$("#add-widget")
.parent()
.addClass("invisible_important");
$(".add-widget").hide();
$(".new-widget-message").show();
$("#container-layout").removeClass("container-layout");
@ -776,6 +785,9 @@ function initialiceLayout(data) {
});
if (!$("#checkbox-edit-mode").is(":checked")) {
$("#add-widget")
.parent()
.addClass("invisible_important");
$(".add-widget").hide();
} else {
$(".new-widget-message").hide();

22
pandora_console/include/javascript/pandora_events.js
View File

@ -1066,7 +1066,7 @@ function openSoundEventsDialog(settings, dialog_parameters) {
resizable: false,
modal: false,
width: 600,
height: 600,
height: 700,
dialogClass: "modal-sound",
open: function() {
$.ajax({
@ -1102,24 +1102,8 @@ function openSoundEventsDialog(settings, dialog_parameters) {
if (mode == 0) {
action = true;
}
if ($("#button-start-search").hasClass("play")) {
$("#modal-sound").css({
height: "500px"
});
$("#modal-sound")
.parent()
.css({
height: "550px"
});
} else {
$("#modal-sound").css({
height: "450px"
});
$("#modal-sound")
.parent()
.css({
height: "500px"
});
if (!$("#button-start-search").hasClass("play")) {
$("#progressbar_time").empty();
}
action_events_sound(action, settings);

31
pandora_console/include/lib/Dashboard/Widgets/module_value.php
View File

@ -447,25 +447,18 @@ class ModuleValueWidget extends Widget
$sizeLabel = (isset($this->values['sizeLabel']) === true) ? $this->values['sizeLabel'] : 40;
$sizeValue = (isset($this->values['sizeValue']) === true) ? $this->values['sizeValue'] : 40;
$sql = 'SELECT min_warning,
max_warning,
min_critical,
max_critical,
str_warning,
str_critical
FROM tagente_modulo
WHERE id_agente_modulo = '.(int) $this->values['moduleId'];
$sql_data = db_get_row_sql($sql);
$last = modules_get_last_value($this->values['moduleId']);
if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) {
$color = COL_WARNING;
}
if ($last >= $sql_data['max_warning']) {
$color = COL_CRITICAL;
}
$db_status = modules_get_agentmodule_status($this->values['moduleId']);
$module_value = modules_get_last_value($this->values['moduleId']);
$status = 0;
$title = '';
modules_get_status($this->values['moduleId'], $db_status, $module_value, $status, $title);
$color = match ($status) {
STATUS_MODULE_NO_DATA => COL_NOTINIT,
STATUS_MODULE_CRITICAL => COL_CRITICAL,
STATUS_MODULE_WARNING => COL_WARNING,
STATUS_MODULE_OK => COL_NORMAL,
STATUS_MODULE_UNKNOWN => COL_UNKNOWN,
};
$uuid = uniqid();
$output .= '<div class="container-center" id="container-'.$uuid.'">';

23
pandora_console/include/lib/Dashboard/Widgets/netflow.php
View File

@ -389,29 +389,6 @@ class Netflow extends Widget
{
return '
$(document).ready(function(){
//Limit 1 week
$("#period_select option").each(function(key, element){
if(element.value > 604800){
$(element).remove();
}
})
$("#period_manual option").each(function(key, element){
if(element.value > 604800){
$(element).remove();
}
});
$("#period_manual input").on("change", function(e){
if($("#hidden-period").val() > 604800) {
$(this).val(1);
$("#hidden-period").val(604800);
$("#period_manual select option").removeAttr("selected");
setTimeout(() => {
$("#period_default select option[value=\'604800\']").attr("selected", "selected");
$("#period_manual select option[value=\'604800\']").attr("selected", "selected");
$("#period_manual select").val(604800);
}, 500);
}
});
if($("#chart_type").val() === "usage_map") {
$("#data_to_show").show();
$("#aggregated").hide();

4
pandora_console/include/styles/pandora.css
View File

@ -3653,6 +3653,10 @@ div.tip > img {
margin-left: 10px;
}
div.tip > div.invisible {
display: none !important;
}
/*
* ---------------------------------------------------------------------
* - SEARCH BOX in header -

12
pandora_console/include/styles/pandora_black.css
View File

@ -556,6 +556,11 @@ table#diagnostic_info tbody td div {
color: var(--text-color) !important;
}
.ui-widget-dialog-border,
.ui-dialog {
border: 1px solid #333 !important;
}
#cancel_btn_dialog {
background-color: red;
}
@ -1443,7 +1448,7 @@ button.submitButton {
button.buttonButton.secondary,
button.submitButton.secondary {
background-color: #999;
color: var(--text-color);
color: var(--text-color) !important;
border-color: #fff;
}
@ -2122,3 +2127,8 @@ select option:checked {
.invert_filter.black-and-white {
filter: invert(1) saturate(0) !important;
}
.content-widget .legend_background,
.content-widget .flot-base {
background-color: unset;
}

2
pandora_console/install.php
View File

@ -131,7 +131,7 @@
<div style='padding-bottom: 50px'>
<?php
$version = '7.0NG.776';
$build = '240429';
$build = '240506';
$banner = "v$version Build $build";
error_reporting(0);

158
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -374,111 +374,6 @@ for ($i = 0; $i < $custom_fields_count; $i++) {
/*
* END: TABLE DATA BUILD
*/
/*
* START: TABLE INTERFACES
*/
$network_interfaces_by_agents = agents_get_network_interfaces([$agent]);
$network_interfaces = [];
if (empty($network_interfaces_by_agents) === false && empty($network_interfaces_by_agents[$id_agente]) === false) {
$network_interfaces = $network_interfaces_by_agents[$id_agente]['interfaces'];
}
if (empty($network_interfaces) === false) {
$table_interface = new stdClass();
$table_interface->id = 'agent_interface_info';
$table_interface->class = 'info_table';
$table_interface->width = '100%';
$table_interface->style = [];
$table_interface->style['interface_event_graph'] = 'width: 35%;';
$table_interface->head = [];
$options = [
'class' => 'closed',
'style' => 'cursor:pointer;',
];
$table_interface->data = [];
$event_text_cont = 0;
foreach ($network_interfaces as $interface_name => $interface) {
if (empty($interface['traffic']) === false) {
$permission = check_acl_one_of_groups($config['id_user'], $all_groups, 'RR');
if ($permission) {
$params = [
'interface_name' => $interface_name,
'agent_id' => $id_agente,
'traffic_module_in' => $interface['traffic']['in'],
'traffic_module_out' => $interface['traffic']['out'],
];
$params_json = json_encode($params);
$params_encoded = base64_encode($params_json);
$win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
$graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=";
$graph_link .= $params_encoded."','";
$graph_link .= $win_handle."', 800, 480)\">";
$graph_link .= html_print_image(
'images/chart.png',
true,
[
'title' => __('Interface traffic'),
'class' => 'invert_filter',
]
).'</a>';
} else {
$graph_link = '';
}
} else {
$graph_link = '';
}
$content = [
'id_agent_module' => $interface['status_module_id'],
'id_group' => $id_group,
'period' => SECONDS_1DAY,
'time_from' => '00:00:00',
'time_to' => '00:00:00',
'sizeForTicks' => 250,
'height_graph' => 40,
[
['id_agent_module' => $interface['status_module_id']],
]
];
$e_graph = \reporting_module_histogram_graph(
['datetime' => time()],
$content
);
$sqlLast_contact = sprintf(
'
SELECT timestamp
FROM tagente_estado
WHERE id_agente_modulo = '.$interface['status_module_id']
);
$last_contact = db_get_all_rows_sql($sqlLast_contact);
$last_contact = array_shift($last_contact);
$last_contact = array_shift($last_contact);
$data = [];
$data['interface_name'] = '<strong>'.$interface_name.'</strong>';
$data['interface_status'] = $interface['status_image'];
$data['interface_graph'] = $graph_link;
$data['interface_ip'] = $interface['ip'];
$data['interface_mac'] = $interface['mac'];
$data['last_contact'] = __('Last contact: ').$last_contact;
$data['interface_event_graph'] = $e_graph['chart'];
$table_interface->data[] = $data;
}
}
/*
* END: TABLE INTERFACES
*/
// This javascript piece of code is used to make expandible
@ -651,16 +546,23 @@ if (empty($agentIncidents) === false) {
);
}
if (isset($table_interface) === true) {
$count_network_incerfaces = agents_get_network_interfaces([$agent], false, false, 0, true);
if ($count_network_incerfaces > 0) {
ui_toggle(
html_print_table($table_interface, true),
html_print_div(
[
'id' => 'agent_interface_info',
'content' => '',
'class' => 'w100p',
],
true
),
'<b>'.__('Interface information (SNMP)').'</b>',
'',
'interface-table-status-agent',
true
);
}
?>
<script type="text/javascript">
@ -678,5 +580,45 @@ if (isset($table_interface) === true) {
$('#deploy_sec_ips_down').css('display', 'none');
$('#deploy_sec_ips_up').css('display', '');
});
<?php if ($count_network_incerfaces > 0) { ?>
load_list_snmp();
<?php } ?>
});
function load_list_snmp() {
var parameters = {};
parameters['list_snmp_modules'] = 1;
parameters['agent'] = <?php echo $id_agente; ?>;
parameters['page'] = 'include/ajax/module';
$('#agent_interface_info').empty();
jQuery.ajax ({
data: parameters,
type: 'POST',
url: "ajax.php",
dataType: 'html',
success: function (data) {
$('#agent_interface_info').empty();
$('#agent_interface_info').html(data);
}
});
}
function change_page_snmp(offset) {
var parameters = {};
parameters['list_snmp_modules'] = 1;
parameters["offset"] = offset;
parameters['agent'] = <?php echo $id_agente; ?>;
parameters['page'] = 'include/ajax/module';
$('#agent_interface_info').empty();
jQuery.ajax ({
data: parameters,
type: 'POST',
url: "ajax.php",
dataType: 'html',
success: function (data) {
$('#agent_interface_info').empty();
$('#agent_interface_info').html(data);
}
});
}
</script>

30
pandora_console/operation/agentes/status_monitor.php
View File

@ -1389,7 +1389,15 @@ if ($autosearch) {
if ($result === false) {
$result = [];
} else {
$tablePagination = ui_pagination($count, false, $offset, 0, true, 'offset', false);
$tablePagination = ui_pagination(
$count,
'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params,
$offset,
0,
true,
'offset',
false
);
}
} else {
// For each server defined and not disabled.
@ -1460,7 +1468,15 @@ if ($autosearch) {
$show_count = true;
}
$tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', $show_count);
$tablePagination = ui_pagination(
$count_modules,
'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params,
$offset,
0,
true,
'offset',
$show_count
);
}
// Get number of elements of the pagination.
@ -2337,7 +2353,15 @@ if (empty($result) === false) {
$show_count = true;
}
$tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', $show_count);
$tablePagination = ui_pagination(
$count_modules,
'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params,
$offset,
0,
true,
'offset',
$show_count
);
}
} else {
if (get_parameter('ag_group', false) !== false) {

4
pandora_console/operation/events/sound_events.php
View File

@ -96,7 +96,7 @@ if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
echo '</head>';
echo '<body style="overflow: hidden;">';
$output = '<div id="tabs-sound-modal">';
$output = '<div id="tabs-sound-modal" class="ui-widget-dialog-border">';
// Header tabs.
$output .= '<ul class="tabs-sound-modal-options">';
$output .= '<li>';
@ -264,7 +264,7 @@ $output = '<div id="tabs-sound-modal">';
true,
[
'title' => __('No alerts discovered'),
'class' => 'invert_filter',
'class' => '',
]
);
$output .= '<span class="text-discovered-alerts">';

15
pandora_console/operation/network/network_report.php
View File

@ -483,6 +483,9 @@ $table->data = [];
$chart_data = [];
$labels = [];
$hide_filter = !empty($main_value) && ($action === 'udp' || $action === 'tcp');
$row_icon_color_filters = ($config['style'] === 'pandora') ? '' : 'filter: invert(100%) !important;';
$row_icon_color_eye = ($config['style'] === 'pandora') ? '' : 'filter: invert(100%) !important; background-color: transparent !important;';
foreach ($data as $item) {
$row = [];
$row['main'] = '<div class="flex_center">';
@ -491,9 +494,17 @@ foreach ($data as $item) {
$row['main'] .= html_print_link_with_params(
'images/filters@svg.svg',
array_merge($hidden_main_link, ['main_value' => $item['host']]),
'image'
'image',
$row_icon_color_filters,
);
$row['main'] .= html_print_input_image(
'whois',
'images/eye.png',
'whois',
$row_icon_color_eye,
true,
['onclick' => 'whois(\''.$item['host'].'\')'],
);
$row['main'] .= html_print_input_image('whois', 'images/eye.png', 'whois', '', true, ['onclick' => 'whois(\''.$item['host'].'\')']);
}
$row['main'] .= '</div>';

2
pandora_console/pandora_console.redhat.spec
View File

@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.776
%define release 240429
%define release 240506
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.776
%define release 240429
%define release 240506
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

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

2
pandora_console/pandoradb_data.sql
View File

@ -2863,7 +2863,7 @@ SET @short_name = 'pandorafms.vmware';
SET @name = 'VMware';
SET @section = 'app';
SET @description = 'Monitor&#x20;ESXi&#x20;hosts,&#x20;datastores&#x20;and&#x20;VMs&#x20;from&#x20;a&#x20;specific&#x20;datacenter';
SET @version = '1.4';
SET @version = '1.5';
INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version);
SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name;

11
pandora_console/vendor/artica/phpchartjs/src/Renderer/JavaScript.php vendored
View File

@ -128,6 +128,13 @@ class JavaScript extends Renderer
}
}
};';
if ($this->chart->options()->getTheme() !== null) {
if ((int) $this->chart->options()->getTheme() === 2) {
$script[] = 'Chart.defaults.color = "#ffffff";';
}
}
$script[] = 'Chart.register(chart_watermark_'.$this->chart->getId().');';
}
@ -163,6 +170,10 @@ class JavaScript extends Renderer
if (chart.config.options.title !== undefined ) {
chart.config.options.title.fontColor = "#ffffff";
}
if (chart.config.options.plugins.legend.labels.font !== undefined ) {
chart.config.options.plugins.legend.labels.font.color = "#ffffff";
}
';
}
}

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.776-240429
Version: 7.0NG.776-240506
Architecture: all
Priority: optional
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
# GNU General Public License for more details.
pandora_version="7.0NG.776-240429"
pandora_version="7.0NG.776-240506"
package_cpan=0
package_pandora=1

6
pandora_server/FreeBSD/pandora_server.conf.new
View File

@ -242,10 +242,8 @@ mta_address localhost
# Set 0 if want eMail deliver shared mail by all destination.
mail_in_separate 1
# nmap: If provided, is used to detect OS type with recon server using
# advanded OS fingerprint technique. Xprobe2 gives more accurate results
# Nmap is also used to do TCP port scanning in detected host.
# nmap: used to detect OS type with recon server using advanced OS fingerprint technique.
# Nmap is also used to do TCP port scanning for host detection.
nmap /usr/local/bin/nmap
# Default path is /usr/sbin/fping for installation default in distro Centos , if you are installing in other distribution,

6
pandora_server/NetBSD/pandora_server.conf.new
View File

@ -238,10 +238,8 @@ mta_address localhost
# Set 0 if want eMail deliver shared mail by all destination.
mail_in_separate 1
# nmap: If provided, is used to detect OS type with recon server using
# advanded OS fingerprint technique. Xprobe2 gives more accurate results
# Nmap is also used to do TCP port scanning in detected host.
# nmap: used to detect OS type with recon server using advanced OS fingerprint technique.
# Nmap is also used to do TCP port scanning for host detection.
nmap /usr/pkg/bin/nmap
# Path to the fping binary. Used by the Enterprise ICMP Server.

6
pandora_server/conf/pandora_server.conf.new
View File

@ -308,10 +308,8 @@ dataserver_threads 1
# Set 0 if want eMail deliver shared mail by all destination.
mail_in_separate 1
# nmap: If provided, is used to detect OS type with recon server using
# advanded OS fingerprint technique. Xprobe2 gives more accurate results
# Nmap is also used to do TCP port scanning in detected host.
# nmap: used to detect OS type with recon server using advanced OS fingerprint technique.
# Nmap is also used to do TCP port scanning for host detection.
nmap /usr/bin/nmap
# Default path is /usr/sbin/fping for installation default in distro Centos , if you are installing in other distribution,

6
pandora_server/conf/pandora_server_sec.conf.template
View File

@ -302,10 +302,8 @@ dataserver_threads 1
# Set 0 if want eMail deliver shared mail by all destination.
mail_in_separate 1
# nmap: If provided, is used to detect OS type with recon server using
# advanded OS fingerprint technique. Xprobe2 gives more accurate results
# Nmap is also used to do TCP port scanning in detected host.
# nmap: used to detect OS type with recon server using advanced OS fingerprint technique.
# Nmap is also used to do TCP port scanning for host detection.
nmap /usr/bin/nmap
# Default path is /usr/sbin/fping for installation default in distro Centos , if you are installing in other distribution,

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

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

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
my $pandora_version = "7.0NG.776";
my $pandora_build = "240429";
my $pandora_build = "240506";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -7,7 +7,7 @@
%define debug_package %{nil}
%define name pandorafms_server
%define version 7.0NG.776
%define release 240429
%define release 240506
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_server
%define version 7.0NG.776
%define release 240429
%define release 240506
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
View File

@ -38,7 +38,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.776 Build 240429";
my $version = "7.0NG.776 Build 240506";
# Pandora server configuration
my %conf;

14
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.776 Build 240429";
my $version = "7.0NG.776 Build 240506";
# save program name for logging
my $progname = basename($0);
@ -6166,7 +6166,7 @@ sub cli_create_group() {
$icon = '' unless defined($icon);
$description = '' unless defined($description);
$group_id = pandora_create_group ($group_name, $icon, $parent_group_id, 0, 0, '', 0, $description, $dbh);
$group_id = pandora_create_group ($group_name, $icon, $parent_group_id, 0, 0, '', 0, safe_input($description), $dbh);
if($group_id == -1) {
print_log "[ERROR] A problem has been ocurred creating group '$group_name'\n\n";
@ -6191,7 +6191,7 @@ sub cli_create_group() {
eval {
$group_id_nodo = db_insert ($dbh_metaconsole, 'id_grupo', 'INSERT INTO tgrupo (id_grupo, nombre, icon, parent, propagate, disabled,
custom_id, id_skin, description) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', $group_name, safe_input($group_name), $icon,
$parent_group_id, 0, 0, '', 0, $description);
$parent_group_id, 0, 0, '', 0, safe_input($description));
};
if ($@) {
print_log "[ERROR] Problems with IDS and doesn't created group\n\n";
@ -6293,15 +6293,15 @@ sub cli_update_group() {
if(defined($icon)){
if(defined($description)){
db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? , icon=? , description=? WHERE id_grupo=?',$group_name,$parent_group_id,$icon,$description,$group_id);
db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? , icon=? , description=? WHERE id_grupo=?',safe_input($group_name),$parent_group_id,$icon, safe_input($description) ,$group_id);
}else{
db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? , icon=? WHERE id_grupo=?',$group_name,$parent_group_id,$icon,$group_id);
db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? , icon=? WHERE id_grupo=?',safe_input($group_name),$parent_group_id,$icon,$group_id);
}
}else{
db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? WHERE id_grupo=?',$group_name,$parent_group_id,$group_id);
db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? WHERE id_grupo=?',safe_input($group_name),$parent_group_id,$group_id);
}
}else{
db_do ($dbh,'UPDATE tgrupo SET nombre=? WHERE id_grupo=?',$group_name,$group_id);
db_do ($dbh,'UPDATE tgrupo SET nombre=? WHERE id_grupo=?',safe_input($group_name),$group_id);
}
print_log "[INFO] Updated group '$group_id'\n\n";
}