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-3943-Plantillas-de-alerta-con-varios-horarios 

Conflicts:
	pandora_console/include/styles/pandora.css
This commit is contained in:
Daniel Barbero Martin 2022-02-01 11:36:33 +01:00
parent 645257f9dc 4ba18dc52b
commit 0a4d6cfd31
18 changed files with 1135 additions and 831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/groups/group_list.php
View File

@ -113,6 +113,7 @@ if (is_ajax() === true) {
'|'
);
$force_serialized = (bool) get_parameter('force_serialized', false);
$nodes = (array) get_parameter('nodes', []);
if ((bool) check_acl($config['id_user'], $id_group, 'AR') === false) {
db_pandora_audit(
@ -154,6 +155,10 @@ if (is_ajax() === true) {
$filter[$_sql_post] = '1';
}
if (is_metaconsole() === true && empty($nodes) === false) {
$filter['id_server'] = $nodes;
}
$id_groups_get_agents = $id_group;
if ($id_group == 0 && $privilege != '') {
$groups = users_get_groups($config['id_user'], $privilege, false);

231
pandora_console/godmode/massive/massive_delete_agents.php
View File

@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -26,10 +26,13 @@
* ============================================================================
*/
use PandoraFMS\Agent;
use PandoraFMS\Enterprise\Metaconsole\Node;
// Begin.
check_login();
if (! check_acl($config['id_user'], 0, 'AW')) {
if ((bool) check_acl($config['id_user'], 0, 'AW') === false) {
db_pandora_audit(
'ACL Violation',
'Trying to access massive agent deletion section'
@ -38,30 +41,63 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
return;
}
require_once 'include/functions_agents.php';
require_once 'include/functions_alerts.php';
require_once 'include/functions_modules.php';
require_once 'include/functions_users.php';
require_once $config['homedir'].'/include/functions_agents.php';
require_once $config['homedir'].'/include/functions_alerts.php';
require_once $config['homedir'].'/include/functions_modules.php';
require_once $config['homedir'].'/include/functions_users.php';
require_once $config['homedir'].'/include/functions_massive_operations.php';
/**
* Bulk operations Delete.
*
* @param array $id_agents Agents to delete.
*
* @return boolean
*/
function process_manage_delete($id_agents)
{
if (empty($id_agents)) {
if (empty($id_agents) === true) {
ui_print_error_message(__('No agents selected'));
return false;
}
$id_agents = (array) $id_agents;
$copy_modules = (bool) get_parameter('copy_modules');
$copy_alerts = (bool) get_parameter('copy_alerts');
$error = false;
$count_deleted = 0;
$agent_id_restore = 0;
foreach ($id_agents as $id_agent) {
$success = agents_delete_agent($id_agent);
if (! $success) {
if (is_metaconsole() === true) {
$array_id = explode('|', $id_agent);
try {
$node = new Node((int) $array_id[0]);
$node->connect();
$agent = new Agent((int) $array_id[1]);
$success = $agent->delete();
$node->disconnect();
$success = agent_delete_from_metaconsole(
$array_id[1],
$array_id[0]
);
} catch (\Exception $e) {
// Unexistent agent.
$success = false;
$node->disconnect();
}
} else {
try {
$agent = new Agent($id_agent);
$success = $agent->delete();
} catch (\Exception $e) {
// Unexistent agent.
$success = false;
}
}
if ($success === false) {
$agent_id_restore = $id_agent;
break;
}
@ -69,11 +105,22 @@ function process_manage_delete($id_agents)
$count_deleted++;
}
if (! $success) {
if ($success === false) {
if (is_metaconsole() === true) {
$array_id = explode('|', $agent_id_restore);
$alias = agents_get_alias_metaconsole(
$array_id[1],
'none',
$array_id[0]
);
} else {
$alias = agents_get_alias($agent_id_restore);
}
ui_print_error_message(
sprintf(
__('There was an error deleting the agent, the operation has been cancelled Could not delete agent %s'),
agents_get_name($agent_id_restore)
$alias
)
);
@ -96,22 +143,32 @@ function process_manage_delete($id_agents)
$id_group = (int) get_parameter('id_group');
$id_agents = get_parameter('id_agents');
$recursion = get_parameter('recursion');
$delete = (bool) get_parameter_post('delete');
if ($delete) {
if ($delete === true) {
$result = process_manage_delete($id_agents);
$info = '{"Agent":"'.implode(',', $id_agents).'"}';
if ($result) {
db_pandora_audit('Massive management', 'Delete agent ', false, false, $info);
if ($result === true) {
db_pandora_audit(
'Massive management',
'Delete agent ',
false,
false,
$info
);
} else {
db_pandora_audit('Massive management', 'Fail try to delete agent', false, false, $info);
db_pandora_audit(
'Massive management',
'Fail try to delete agent',
false,
false,
$info
);
}
}
$groups = users_get_groups();
$table = new stdClass;
$table->id = 'delete_table';
$table->class = 'databox filters';
$table->width = '100%';
@ -177,31 +234,98 @@ $table->data[1][3] = html_print_select(
__('All'),
2,
true,
false,
true,
'',
'',
'',
'',
false,
'width:30%;'
);
$table->data[2][0] = __('Agents');
$table->data[2][0] .= '<span id="agent_loading" class="invisible">';
$table->data[2][0] .= html_print_image('images/spinner.png', true);
$table->data[2][0] .= '</span>';
$table->data[2][1] = html_print_select(
agents_get_group_agents(array_keys(users_get_groups($config['id_user'], 'AW', false)), false, 'none'),
if (is_metaconsole() === true) {
$servers = metaconsole_get_servers();
$server_fields = [];
foreach ($servers as $key => $server) {
$server_fields[$key] = $server['server_name'];
}
$table->data[2][2] = __('Node');
$table->data[2][3] = html_print_select(
$server_fields,
'nodes[]',
0,
false,
'',
'',
true,
true,
true,
'',
false,
'min-width: 500px; max-width: 500px; max-height: 100px',
false,
false,
false,
'',
false,
false,
false,
false,
true,
true,
true
);
}
$table->data[3][0] = __('Agents');
$table->data[3][0] .= '<span id="agent_loading" class="invisible">';
$table->data[3][0] .= html_print_image('images/spinner.png', true);
$table->data[3][0] .= '</span>';
$agents = agents_get_group_agents(
array_keys(users_get_groups($config['id_user'], 'AW', false)),
['disabled' => 2],
'none',
false,
false,
is_metaconsole(),
'|'
);
$table->data[3][1] = html_print_select(
$agents,
'id_agents[]',
0,
false,
'',
'',
true,
true,
true,
'',
false,
'min-width: 500px; max-width: 500px; max-height: 100px',
false,
false,
false,
'',
false,
false,
false,
false,
true,
true,
true
);
echo '<form method="post" id="form_agents" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_agents">';
$url = 'index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_agents';
if (is_metaconsole() === true) {
$url = 'index.php?sec=advanced&sec2=advanced/massive_operations&tab=massive_agents&pure=0&option=delete_agents';
}
echo '<form method="post" id="form_agent" action="'.$url.'">';
html_print_table($table);
if (is_management_allowed() === true) {
if (is_metaconsole() === true || is_management_allowed() === true) {
attachActionButton('delete', 'delete', $table->width);
}
@ -215,25 +339,34 @@ ui_require_jquery_file('pandora.controls');
<script type="text/javascript">
$(document).ready (function () {
// Check Metaconsole.
var metaconsole = '<?php echo (is_metaconsole() === true) ? 1 : 0; ?>';
// Listeners.
var recursion;
$("#checkbox-recursion").click(function () {
recursion = this.checked ? 1 : 0;
$("#id_group").trigger("change");
});
var disabled;
$("#disabled").click(function () {
$("#disabled").change(function () {
disabled = this.value;
$("#id_group").trigger("change");
});
$("#id_group").pandoraSelectGroupAgent ({
var nodes;
$("#nodes").change(function () {
nodes = $("#nodes").val();
$("#id_group").trigger("change");
});
$("#status_agents").change(function() {
$("#id_group").trigger("change");
});
// Build data.
var data = {
status_agents: function () {
return $("#status_agents").val();
},
@ -244,16 +377,18 @@ ui_require_jquery_file('pandora.controls');
},
disabled: function() {
return disabled;
},
}
});
$("#status_agents").change(function() {
$("#id_group").trigger("change");
});
disabled = 2;
$("#id_group").trigger("change");
if (metaconsole == 1) {
data.serialized = true;
data.serialized_separator = '|';
data.nodes = function() {
return nodes;
};
}
// Change agents.
$("#id_group").pandoraSelectGroupAgent(data);
});
</script>

89
pandora_console/godmode/massive/massive_edit_agents.php
View File

@ -38,13 +38,13 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
return;
}
require_once 'include/functions_agents.php';
require_once 'include/functions_ui.php';
require_once 'include/functions_alerts.php';
require_once 'include/functions_modules.php';
require_once 'include/functions_servers.php';
require_once 'include/functions_gis.php';
require_once 'include/functions_users.php';
require_once $config['homedir'].'/include/functions_agents.php';
require_once $config['homedir'].'/include/functions_ui.php';
require_once $config['homedir'].'/include/functions_alerts.php';
require_once $config['homedir'].'/include/functions_modules.php';
require_once $config['homedir'].'/include/functions_servers.php';
require_once $config['homedir'].'/include/functions_gis.php';
require_once $config['homedir'].'/include/functions_users.php';
enterprise_include_once('include/functions_config_agents.php');
if (is_ajax()) {
@ -56,7 +56,7 @@ if (is_ajax()) {
$name = agents_get_name($id_agent);
$agent_md5 = md5($name);
if (file_exists($config['remote_config'].'/md5/'.$agent_md5.'.md5')) {
$cont ++;
$cont++;
}
}
@ -171,7 +171,7 @@ if ($update_agents) {
}
}
// CONF FILE DELETION
// CONF FILE DELETION.
if (isset($values['delete_conf'])) {
unset($values['delete_conf']);
$n_deleted = 0;
@ -339,7 +339,7 @@ if ($update_agents) {
}
$info = [];
// Update Custom Fields
// Update Custom Fields.
foreach ($fields as $field) {
$info[$field['id_field']] = $field['name'];
$value = get_parameter('customvalue_'.$field['id_field']);
@ -354,7 +354,7 @@ if ($update_agents) {
);
if ($old_value === false) {
// Create custom field if not exist
// Create custom field if not exist.
$result = db_process_sql_insert(
'tagent_custom_data',
[
@ -400,8 +400,6 @@ if ($update_agents) {
$id_group = 0;
$groups = users_get_groups();
$table = new StdClass();
$table->id = 'delete_table';
$table->class = 'databox filters';
@ -468,18 +466,22 @@ $table->data[1][3] = html_print_select(
__('All'),
2,
true,
false,
true,
'',
'',
'',
'',
false,
'width:30%;'
);
$table->data[2][0] = __('Agents');
$table->data[2][0] .= '<span id="agent_loading" class="invisible">';
$table->data[2][0] .= html_print_image('images/spinner.png', true);
$table->data[2][0] .= '</span>';
$enabled_agents = agents_get_group_agents(array_keys(users_get_groups($config['id_user'], 'AW', false)), ['disabled' => 0], 'none');
$all_agents = (agents_get_group_agents(array_keys(users_get_groups($config['id_user'], 'AW', false)), ['disabled' => 1], 'none') + $enabled_agents);
$all_agents = agents_get_group_agents(
array_keys(users_get_groups($config['id_user'], 'AW', false)),
['disabled' => 2],
'none'
);
$table->data[2][1] = html_print_select(
$all_agents,
@ -489,10 +491,27 @@ $table->data[2][1] = html_print_select(
'',
'',
true,
true,
true,
'',
false,
'min-width: 500px; max-width: 500px; max-height: 100px',
false,
false,
false,
'',
false,
false,
false,
false,
true,
true,
true
);
echo '<form method="post" id="form_agent" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=edit_agents">';
echo '<form method="post" autocomplete="off" id="form_agent" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=edit_agents">';
echo html_print_avoid_autocomplete();
html_print_table($table);
$nombre_agente = '';
@ -522,9 +541,6 @@ $table->size[3] = '35%';
$table->data = [];
$groups = users_get_groups($config['id_user'], 'AW', false);
$agents = agents_get_group_agents(array_keys($groups));
$modules = db_get_all_rows_sql(
'SELECT id_agente_modulo as id_module, nombre as name FROM tagente_modulo
WHERE id_agente = '.$id_parent
@ -609,7 +625,7 @@ $table->data[3][1] .= ' <span id="os_preview">';
$table->data[3][1] .= ui_print_os_icon($id_os, false, true);
$table->data[3][1] .= '</span>';
// Network server
// Network server.
$none = '';
if ($server_name == '' && $id_agente) {
$none = __('None');
@ -631,7 +647,7 @@ $table->data[4][1] = html_print_select(
'width: 150px;'
);
// Description
// Description.
$table->data[5][0] = __('Description');
$table->data[5][1] = html_print_input_text('description', $description, '', 45, 255, true);
@ -662,27 +678,27 @@ $table->style = [];
$table->style[0] = 'font-weight: bold; width: 150px;';
$table->data = [];
// Custom ID
// Custom ID.
$table->data[0][0] = __('Custom ID');
$table->data[0][1] = html_print_input_text('custom_id', $custom_id, '', 16, 255, true);
// Learn mode / Normal mode
// Learn mode / Normal mode.
$table->data[1][0] = __('Module definition');
$table->data[1][1] = __('No change').' '.html_print_radio_button_extended('mode', -1, '', $mode, false, '', 'class="mrgn_right_40px"', true);
$table->data[1][1] .= __('Learning mode').' '.html_print_radio_button_extended('mode', 1, '', $mode, false, '', 'class="mrgn_right_40px"', true);
$table->data[1][1] .= __('Normal mode').' '.html_print_radio_button_extended('mode', 0, '', $mode, false, '', 'class="mrgn_right_40px"', true);
$table->data[1][1] .= __('Autodisable mode').' '.html_print_radio_button_extended('mode', 2, '', $mode, false, '', 'class="mrgn_right_40px"', true);
// Status (Disabled / Enabled)
// Status (Disabled / Enabled).
$table->data[2][0] = __('Status');
$table->data[2][1] = __('No change').' '.html_print_radio_button_extended('disabled', -1, '', $disabled, false, '', 'class="mrgn_right_40px"', true);
$table->data[2][1] .= __('Disabled').' '.ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true).' '.html_print_radio_button_extended('disabled', 1, '', $disabled, false, '', 'class="mrgn_right_40px"', true);
$table->data[2][1] .= __('Active').' '.html_print_radio_button_extended('disabled', 0, '', $disabled, false, '', 'class="mrgn_right_40px"', true);
// Remote configuration
// Remote configuration.
$table->data[3][0] = __('Remote configuration');
// Delete remote configuration
// Delete remote configuration.
$table->data[3][1] = '<div id="delete_configurations" class="invisible">'.__('Delete available remote configurations').' (';
$table->data[3][1] .= '<span id="n_configurations"></span>';
$table->data[3][1] .= ') '.html_print_checkbox_extended('delete_conf', 1, 0, false, '', 'class="mrgn_right_40px"', true).'</div>';
@ -700,7 +716,7 @@ $path = 'images/gis_map/icons/';
// TODO set better method the path
if ($icon_path == '') {
$display_icons = 'none';
// Hack to show no icon. Use any given image to fix not found image errors
// Hack to show no icon. Use any given image to fix not found image errors.
$path_without = 'images/spinner.png';
$path_default = 'images/spinner.png';
$path_ok = 'images/spinner.png';
@ -801,7 +817,8 @@ foreach ($fields as $field) {
}
if ($field['is_password_type']) {
$data[1] = html_print_input_text_extended(
$data[1] = html_print_input_password_avoid_autocomplete();
$data[1] .= html_print_input_text_extended(
'customvalue_'.$field['id_field'],
$custom_value,
'customvalue_'.$field['id_field'],
@ -864,7 +881,6 @@ var limit_parameters_massive = <?php echo $config['limit_parameters_massive']; ?
//Use this function for change 3 icons when change the selectbox
$(document).ready (function () {
var checked = $("#cascade_protection").val();
$("#cascade_protection_module").attr("disabled", 'disabled');
$("#cascade_protection").change(function () {
@ -926,7 +942,6 @@ $(document).ready (function () {
);
}
$("#form_agent").submit(function() {
var get_parameters_count = window.location.href.slice(
window.location.href.indexOf('?') + 1).split('&').length;
@ -942,11 +957,8 @@ $(document).ready (function () {
});
var disabled;
$("#disabled").click(function () {
$("#disabled").change(function () {
disabled = this.value;
$("#id_group").trigger("change");
});
@ -1011,10 +1023,9 @@ $(document).ready (function () {
$("#id_group").trigger("change");
});
disabled = 2;
$("#id_group").trigger("change");
//$("#id_group").trigger("change");
});

224
pandora_console/godmode/massive/massive_operations.php
View File

@ -14,7 +14,7 @@
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -29,6 +29,8 @@
// Begin.
check_login();
global $config;
if (! check_acl($config['id_user'], 0, 'AW')) {
db_pandora_audit(
'ACL Violation',
@ -38,16 +40,20 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
return;
}
require_once 'include/functions_agents.php';
require_once 'include/functions_alerts.php';
require_once 'include/functions_modules.php';
require_once 'include/functions_massive_operations.php';
require_once $config['homedir'].'/include/functions_agents.php';
require_once $config['homedir'].'/include/functions_alerts.php';
require_once $config['homedir'].'/include/functions_modules.php';
require_once $config['homedir'].'/include/functions_massive_operations.php';
enterprise_include('godmode/massive/massive_operations.php');
$tab = (string) get_parameter('tab', 'massive_agents');
$option = (string) get_parameter('option');
$url = 'index.php?sec=gmassive&sec2=godmode/massive/massive_operations';
if (is_metaconsole() === true) {
$url = 'index.php?sec=advanced&sec2=advanced/massive_operations&tab=massive_agents&pure=0';
}
$options_alerts = [
'add_alerts' => __('Bulk alert add'),
@ -62,6 +68,11 @@ $options_agents = [
'edit_agents' => __('Bulk agent edit'),
'delete_agents' => __('Bulk agent delete'),
];
if (is_metaconsole() === true) {
$options_agents = [
'delete_agents' => __('Bulk agent delete'),
];
}
if (check_acl($config['id_user'], 0, 'UM')) {
$options_users = [
@ -114,28 +125,31 @@ if ($options_services === ENTERPRISE_NOT_HOOK) {
}
if (in_array($option, array_keys($options_alerts))) {
if (in_array($option, array_keys($options_alerts)) === true) {
$tab = 'massive_alerts';
} else if (in_array($option, array_keys($options_agents))) {
} else if (in_array($option, array_keys($options_agents)) === true) {
$tab = 'massive_agents';
} else if (in_array($option, array_keys($options_users))) {
} else if (in_array($option, array_keys($options_users)) === true) {
$tab = 'massive_users';
} else if (in_array($option, array_keys($options_modules))) {
} else if (in_array($option, array_keys($options_modules)) === true) {
$tab = 'massive_modules';
} else if (in_array($option, array_keys($options_policies))) {
} else if (in_array($option, array_keys($options_policies)) === true) {
$tab = 'massive_policies';
} else if (in_array($option, array_keys($options_snmp))) {
} else if (in_array($option, array_keys($options_snmp)) === true) {
$tab = 'massive_snmp';
} else if (in_array($option, array_keys($options_satellite))) {
} else if (in_array($option, array_keys($options_satellite)) === true) {
$tab = 'massive_satellite';
} else if (in_array($option, array_keys($options_plugins))) {
} else if (in_array($option, array_keys($options_plugins)) === true) {
$tab = 'massive_plugins';
} else if (in_array($option, array_keys($options_services))) {
} else if (in_array($option, array_keys($options_services)) === true) {
$tab = 'massive_services';
}
if ($tab == 'massive_agents' && $option == '') {
if ($tab === 'massive_agents' && empty($option) === true) {
$option = 'edit_agents';
if (is_metaconsole() === true) {
$option = 'delete_agents';
}
}
if ($tab == 'massive_modules' && $option == '') {
@ -212,7 +226,7 @@ if ($option == '') {
}
$alertstab = [
'text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_alerts">'.html_print_image(
'text' => '<a href="'.$url.'&tab=massive_alerts">'.html_print_image(
'images/bell.png',
true,
[
@ -224,7 +238,7 @@ $alertstab = [
];
$userstab = [
'text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_users">'.html_print_image(
'text' => '<a href="'.$url.'&tab=massive_users">'.html_print_image(
'images/user.png',
true,
[
@ -236,7 +250,7 @@ $userstab = [
];
$agentstab = [
'text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_agents">'.html_print_image(
'text' => '<a href="'.$url.'&tab=massive_agents">'.html_print_image(
'images/agent.png',
true,
[
@ -247,8 +261,8 @@ $agentstab = [
'active' => $tab == 'massive_agents',
];
$modulestab = [
'text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_modules">'.html_print_image(
$modulestab = [
'text' => '<a href="'.$url.'&tab=massive_modules">'.html_print_image(
'images/module.png',
true,
[
@ -257,10 +271,10 @@ $agentstab = [
]
).'</a>',
'active' => $tab == 'massive_modules',
];
];
$pluginstab = [
'text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_plugins">'.html_print_image(
$pluginstab = [
'text' => '<a href="'.$url.'&tab=massive_plugins">'.html_print_image(
'images/plugin.png',
true,
[
@ -269,55 +283,48 @@ $agentstab = [
]
).'</a>',
'active' => $tab == 'massive_plugins',
];
];
$policiestab = enterprise_hook('massive_policies_tab');
$policiestab = enterprise_hook('massive_policies_tab');
if ($policiestab == ENTERPRISE_NOT_HOOK) {
if ($policiestab == ENTERPRISE_NOT_HOOK) {
$policiestab = '';
}
}
$snmptab = enterprise_hook('massive_snmp_tab');
$snmptab = enterprise_hook('massive_snmp_tab');
if ($snmptab == ENTERPRISE_NOT_HOOK) {
if ($snmptab == ENTERPRISE_NOT_HOOK) {
$snmptab = '';
}
}
$satellitetab = enterprise_hook('massive_satellite_tab');
$satellitetab = enterprise_hook('massive_satellite_tab');
if ($satellitetab == ENTERPRISE_NOT_HOOK) {
if ($satellitetab == ENTERPRISE_NOT_HOOK) {
$satellitetab = '';
}
}
$servicestab = enterprise_hook('massive_services_tab');
$servicestab = enterprise_hook('massive_services_tab');
if ($servicestab == ENTERPRISE_NOT_HOOK) {
if ($servicestab == ENTERPRISE_NOT_HOOK) {
$servicestab = '';
}
}
$onheader = [];
$onheader['massive_agents'] = $agentstab;
$onheader['massive_modules'] = $modulestab;
$onheader['massive_plugins'] = $pluginstab;
if (check_acl($config['id_user'], 0, 'UM')) {
$onheader = [];
$onheader['massive_agents'] = $agentstab;
$onheader['massive_modules'] = $modulestab;
$onheader['massive_plugins'] = $pluginstab;
if (check_acl($config['id_user'], 0, 'UM')) {
$onheader['user_agents'] = $userstab;
}
}
$onheader['massive_alerts'] = $alertstab;
$onheader['policies'] = $policiestab;
$onheader['snmp'] = $snmptab;
$onheader['satellite'] = $satellitetab;
$onheader['services'] = $servicestab;
/*
Hello there! :)
We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger’ of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
*/
$onheader['massive_alerts'] = $alertstab;
$onheader['policies'] = $policiestab;
$onheader['snmp'] = $snmptab;
$onheader['satellite'] = $satellitetab;
$onheader['services'] = $servicestab;
// Header.
if (is_metaconsole() === false) {
ui_print_page_header(
__('Bulk operations').' &raquo; '.$options[$option],
'images/gm_massive_operations.png',
@ -328,57 +335,42 @@ $agentstab = [
false,
'massivemodal'
);
} else {
massive_meta_print_header();
}
// Checks if the PHP configuration is correctly.
if ((get_cfg_var('max_execution_time') != 0)
// Checks if the PHP configuration is correctly.
if ((get_cfg_var('max_execution_time') != 0)
|| (get_cfg_var('max_input_time') != -1)
) {
) {
echo '<div id="notify_conf" class="notify">';
echo __('In order to perform massive operations, PHP needs a correct configuration in timeout parameters. Please, open your PHP configuration file (php.ini) for example: <i>sudo vi /etc/php5/apache2/php.ini;</i><br> And set your timeout parameters to a correct value: <br><i> max_execution_time = 0</i> and <i>max_input_time = -1</i>');
echo '</div>';
}
}
if ($tab == 'massive_policies' && is_management_allowed() === false) {
if (is_metaconsole() === false) {
$url = '<a target="_blank" href="'.ui_get_meta_url(
'index.php?sec=advanced&sec2=advanced/policymanager'
).'">'.__('metaconsole').'</a>';
} else {
$url = __('any node');
}
ui_print_warning_message(
__(
'This node is configured with centralized mode. All policies information is read only. Go to %s to manage it.',
$url
)
);
return;
}
// Catch all submit operations in this view to display Wait banner.
$submit_action = get_parameter('go');
$submit_update = get_parameter('updbutton');
$submit_del = get_parameter('del');
$submit_template_disabled = get_parameter('id_alert_template_disabled');
$submit_template_enabled = get_parameter('id_alert_template_enabled');
$submit_template_not_standby = get_parameter('id_alert_template_not_standby');
$submit_template_standby = get_parameter('id_alert_template_standby');
$submit_add = get_parameter('crtbutton');
// Waiting spinner.
ui_print_spinner(__('Loading'));
// Modal for show messages.
html_print_div(
// Catch all submit operations in this view to display Wait banner.
$submit_action = get_parameter('go');
$submit_update = get_parameter('updbutton');
$submit_del = get_parameter('del');
$submit_template_disabled = get_parameter('id_alert_template_disabled');
$submit_template_enabled = get_parameter('id_alert_template_enabled');
$submit_template_not_standby = get_parameter('id_alert_template_not_standby');
$submit_template_standby = get_parameter('id_alert_template_standby');
$submit_add = get_parameter('crtbutton');
// Waiting spinner.
ui_print_spinner(__('Loading'));
// Modal for show messages.
html_print_div(
[
'id' => 'massive_modal',
'content' => '',
]
);
);
// Load common JS files.
ui_require_javascript_file('massive_operations');
// Load common JS files.
ui_require_javascript_file('massive_operations');
?>
?>
<script language="javascript" type="text/javascript">
/* <![CDATA[ */
@ -411,25 +403,25 @@ $agentstab = [
</script>
<?php
if (is_management_allowed() === false && $option == 'delete_agents') {
if (is_management_allowed() === false) {
if (is_metaconsole() === false) {
$url = '<a target="_blank" href="'.ui_get_meta_url(
$text_warning = '<a target="_blank" href="'.ui_get_meta_url(
'index.php?sec=monitoring&sec2=monitoring/wizard/wizard'
).'">'.__('metaconsole').'</a>';
} else {
$url = __('any node');
$text_warning = __('any node');
}
ui_print_warning_message(
__(
'This node is configured with centralized mode. To delete agents go to %s',
$url
$text_warning
)
);
}
echo '<br />';
echo '<form method="post" id="form_options" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations">';
echo '<form method="post" id="form_options" action="'.$url.'">';
echo '<table border="0"><tr><td>';
echo __('Action');
echo '</td><td>';
@ -444,7 +436,7 @@ html_print_select(
false,
false
);
if ($option == 'edit_agents' || $option == 'edit_modules') {
if ($option === 'edit_agents' || $option === 'edit_modules') {
ui_print_help_tip(__('The blank fields will not be updated'));
}
@ -454,64 +446,64 @@ echo '<br />';
switch ($option) {
case 'delete_alerts':
include_once 'godmode/massive/massive_delete_alerts.php';
include_once $config['homedir'].'/godmode/massive/massive_delete_alerts.php';
break;
case 'add_alerts':
include_once 'godmode/massive/massive_add_alerts.php';
include_once $config['homedir'].'/godmode/massive/massive_add_alerts.php';
break;
case 'delete_action_alerts':
include_once 'godmode/massive/massive_delete_action_alerts.php';
include_once $config['homedir'].'/godmode/massive/massive_delete_action_alerts.php';
break;
case 'add_action_alerts':
include_once 'godmode/massive/massive_add_action_alerts.php';
include_once $config['homedir'].'/godmode/massive/massive_add_action_alerts.php';
break;
case 'enable_disable_alerts':
include_once 'godmode/massive/massive_enable_disable_alerts.php';
include_once $config['homedir'].'/godmode/massive/massive_enable_disable_alerts.php';
break;
case 'standby_alerts':
include_once 'godmode/massive/massive_standby_alerts.php';
include_once $config['homedir'].'/godmode/massive/massive_standby_alerts.php';
break;
case 'add_profiles':
include_once 'godmode/massive/massive_add_profiles.php';
include_once $config['homedir'].'/godmode/massive/massive_add_profiles.php';
break;
case 'delete_profiles':
include_once 'godmode/massive/massive_delete_profiles.php';
include_once $config['homedir'].'/godmode/massive/massive_delete_profiles.php';
break;
case 'delete_agents':
include_once 'godmode/massive/massive_delete_agents.php';
include_once $config['homedir'].'/godmode/massive/massive_delete_agents.php';
break;
case 'edit_agents':
include_once 'godmode/massive/massive_edit_agents.php';
include_once $config['homedir'].'/godmode/massive/massive_edit_agents.php';
break;
case 'delete_modules':
include_once 'godmode/massive/massive_delete_modules.php';
include_once $config['homedir'].'/godmode/massive/massive_delete_modules.php';
break;
case 'edit_modules':
include_once 'godmode/massive/massive_edit_modules.php';
include_once $config['homedir'].'/godmode/massive/massive_edit_modules.php';
break;
case 'copy_modules':
include_once 'godmode/massive/massive_copy_modules.php';
include_once $config['homedir'].'/godmode/massive/massive_copy_modules.php';
break;
case 'edit_plugins':
include_once 'godmode/massive/massive_edit_plugins.php';
include_once $config['homedir'].'/godmode/massive/massive_edit_plugins.php';
break;
default:
if (!enterprise_hook('massive_operations', [$option])) {
include_once 'godmode/massive/massive_config.php';
include_once $config['homedir'].'/godmode/massive/massive_config.php';
}
break;
}

116
pandora_console/godmode/reporting/graph_builder.graph_editor.php
View File

@ -327,59 +327,17 @@ echo '<br>';
// Configuration form.
echo '<span id ="none_text" class="invisible">'.__('None').'</span>';
echo "<form method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&add_module=1&edit_graph=1&id=".$id_graph."'>";
echo "<form id='agentmodules' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&add_module=1&edit_graph=1&id=".$id_graph."'>";
echo "<table width='100%' cellpadding='4' cellpadding='4' class='databox filters'>";
echo '<tr>';
echo "<td colspan='1'>".__('Filter group').'</td>';
echo '</tr><tr>';
echo "<td colspan='1'>".html_print_select_groups(
$config['id_user'],
($report_w == true) ? 'RW' : (($report_m == true) ? 'RM' : 'RW'),
true,
'group',
'',
'filterByGroup($(\'#group\').val());',
'',
0,
true
).'</td>';
echo '</tr><tr>';
echo "<td class='top'>".__('Agents').ui_print_help_tip(
__('If you select several agents, only the common modules will be displayed'),
true
).'</td>';
echo '<td></td>';
echo "<td class='top'>".__('Modules').'</td>';
echo '</tr><tr>';
echo '<td class="w50p">'.html_print_select(
agents_get_group_agents(),
'id_agents[]',
0,
false,
'',
'',
true,
true,
true,
'w100p',
false,
''
).'</td>';
echo '<td class="select_module_graph"></td>';
echo '<td class="w50p">'.html_print_select(
[],
'module[]',
0,
false,
'',
0,
true,
true,
true,
'w100p',
false,
''
echo '<td class="w50p pdd_50px" id="select_multiple_modules_filtered">'.html_print_input(
[
'type' => 'select_multiple_modules_filtered',
'uniqId' => 'modules',
'class' => 'flex flex-row',
'searchBar' => true,
]
).'</td>';
echo '</tr><tr>';
echo "<td colspan='3'>";
@ -403,52 +361,34 @@ ui_require_jquery_file('autocomplete');
$(document).ready (function () {
$(document).data('text_for_module', $("#none_text").html());
$("#id_agents").change(agent_changed_by_multiple_agents);
$("#submit-add").click(function() {
$('#module').map(function(){
if ($(this).val() != "0" )
$(this).prop('selected', true);
});
if($('#module')[0].childElementCount == 1 && ($('#module')[0].value == "" || $('#module')[0].value == "0")) {
if($('#filtered-module-modules-modules')[0].value == "" || $('#filtered-module-modules-modules')[0].value == "0") {
alert("<?php echo __('Please, select a module'); ?>");
return false;
}
var modules_selected = $(
"#filtered-module-modules-modules"
).val();
var agents_selected = $(
"#filtered-module-agents-modules"
).val();
$("#agentmodules").submit( function(eventObj) {
$("<input />").attr("type", "hidden")
.attr("value", agents_selected)
.attr("name", "id_agents")
.appendTo("#agentmodules");
$("<input />").attr("type", "hidden")
.attr("value", modules_selected)
.attr("name", "id_modules")
.appendTo("#agentmodules");
return true;
});
});
});
function filterByGroup(idGroup) {
$('#id_agents').empty ();
$('#module').empty();
$("#module").append ($("<option></option>").attr ("value", 0).html ('<?php echo __('None'); ?>'));
jQuery.post ("ajax.php",
{"page" : "godmode/groups/group_list",
"get_group_agents" : 1,
"id_group" : idGroup,
// Add a key prefix to avoid auto sorting in js object conversion
"keys_prefix" : "_"
},
function (data, status) {
i = 0
jQuery.each (data, function (id, value) {
// Remove keys_prefix from the index
id = id.substring(1);
i++;
$("#id_agents").append ($("<option></option>").attr ("value", id).html (value));
});
if (i == 0) {
$("#id_agents").append ($("<option></option>").attr ("value", 0).html ('<?php echo __('None'); ?>'));
}
},
"json"
);
}
function added_ids_sorted_items_to_hidden_input() {
var ids = '';
var first = true;

7
pandora_console/godmode/reporting/graph_builder.php
View File

@ -222,17 +222,14 @@ function add_quotes($item)
if ($add_module === true) {
$id_graph = get_parameter('id');
$id_modules = get_parameter('module');
$id_agents = get_parameter('id_agents');
$id_modules = explode(',', get_parameter('id_modules'));
$id_agents = explode(',', get_parameter('id_agents'));
$weight = get_parameter('weight');
// Id modules has double entities conversion.
// Safe output remove all entities.
io_safe_output_array($id_modules, '');
// We need to put the entities again
// to browse in db.
io_safe_input_array($id_modules);
$id_agent_modules = db_get_all_rows_sql(
'SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente IN ('.implode(',', $id_agents).") AND nombre IN ('".implode("','", $id_modules)."')"

20
pandora_console/include/functions_agents.php
View File

@ -1221,6 +1221,15 @@ function agents_get_group_agents(
}
}
if ((isset($search['disabled']) === true
&& $search['disabled'] === 2)
|| (isset($filter['disabled']) === true
&& $filter['disabled'] === 2)
) {
unset($search['disabled']);
unset($filter['disabled']);
}
if (isset($search['all_agents'])) {
unset($search['all_agents']);
}
@ -1313,16 +1322,19 @@ function agents_get_group_agents(
}
}
if (is_metaconsole() && isset($search['id_server'])) {
$filter['id_tmetaconsole_setup'] = $search['id_server'];
if (is_metaconsole() === true
&& isset($search['id_server']) === true
&& empty($search['id_server']) === false
) {
$filter['ta.id_tmetaconsole_setup'] = $search['id_server'];
if ($filter['id_tmetaconsole_setup'] == 0) {
// All nodes.
unset($filter['id_tmetaconsole_setup']);
}
}
unset($search['id_server']);
}
if (!$add_alert_bulk_op) {
// Add the rest of the filter from the search array.
@ -1336,7 +1348,7 @@ function agents_get_group_agents(
$filter['order'] = 'alias';
if (is_metaconsole()) {
if (is_metaconsole() === true) {
$table_name = 'tmetaconsole_agent ta LEFT JOIN tmetaconsole_agent_secondary_group tasg ON ta.id_agente = tasg.id_agent';
if ($meta_fields === true) {

29
pandora_console/include/functions_api.php
View File

@ -17548,6 +17548,35 @@ function api_get_event_mcid($server_id, $console_event_id, $trash2, $returnType)
}
/**
* Return whether or not a node is in centralized mode.
*
* @param [string] $server_id server id (node)
* @param [string] $thrash1 don't use
* @param [string] $thrash2 don't use
* @param [string] $returnType
*
* Example
* api.php?op=get&op2=is_centralized&id=3&apipass=1234&user=admin&pass=pandora
*
* @return void
*/
function api_get_is_centralized($server_id, $thrash1, $thrash2, $returnType)
{
if (is_metaconsole() === true) {
$unified = db_get_value_filter('unified', 'tmetaconsole_setup', ['id' => $server_id]);
if ($unified !== false) {
returnData($returnType, ['type' => 'string', 'data' => $unified]);
} else {
returnData($returnType, ['type' => 'string', 'data' => 'Node with ID '.$server_id.' does not exist']);
}
} else {
returnData($returnType, ['type' => 'string', 'data' => (int) is_centralized()]);
}
}
/**
* Function to set events in progress status.
*

65
pandora_console/include/functions_html.php
View File

@ -1480,11 +1480,43 @@ function html_print_select_multiple_modules_filtered(array $data):string
'return' => true,
'nothing' => __('All'),
'nothing_value' => 0,
'script' => 'fmModuleChange(\''.$uniqId.'\', '.is_metaconsole().')',
'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
]
);
$output .= '</div>';
if (empty($data['searchBar']) === false && $data['searchBar'] === true) {
$output .= '<div>';
$output .= '<div>';
$output .= html_print_input(
[
'type' => 'text',
'name' => 'agent-searchBar-'.$uniqId,
'onKeyUp' => 'searchAgent(\''.$uniqId.'\')',
'placeholder' => __('Type to search agents'),
'return' => true,
]
);
$output .= '</div>';
$output .= '<div>';
$output .= html_print_input(
[
'type' => 'text',
'name' => 'module-searchBar-'.$uniqId,
'onKeyUp' => 'searchModule(\''.$uniqId.'\')',
'return' => true,
'placeholder' => __('Type to search modules'),
]
);
$output .= '</div>';
$output .= '</div>';
}
$output .= '<div>';
// Agent.
$agents = agents_get_group_agents(
@ -1533,7 +1565,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
'return' => true,
'multiple' => true,
'style' => 'min-width: 200px;max-width:200px;',
'script' => 'fmModuleChange(\''.$uniqId.'\', '.is_metaconsole().')',
'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
]
);
@ -1550,7 +1582,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
'name' => 'filtered-module-show-common-modules-'.$uniqId,
'selected' => $data['mShowCommonModules'],
'return' => true,
'script' => 'fmModuleChange(\''.$uniqId.'\', '.is_metaconsole().')',
'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
]
);
@ -4218,6 +4250,33 @@ function html_html2rgb($htmlcolor)
}
/**
* Avoid autocomplete.
*
* @return void
*/
function html_print_avoid_autocomplete()
{
$output = '';
$output .= '<input type="text" style="display:none">';
$output .= '<input type="password" style="display:none">';
return $output;
}
/**
* Input password avoid autocomplete.
*
* @return void
*/
function html_print_input_password_avoid_autocomplete()
{
$output = '<input type="text" style="opacity: 0;position: absolute; width: 0px;">';
return $output;
}
/**
* Print a magic-ajax control to select the module.
*

18
pandora_console/include/functions_reporting.php
View File

@ -6868,7 +6868,7 @@ function reporting_advanced_sla(
$min_value_warning = $agentmodule_info['min_warning'];
$max_value_warning = $agentmodule_info['max_warning'];
} else {
$max_values = io_safe_output($agentmodule_info['str_critical']);
$max_value = io_safe_output($agentmodule_info['str_critical']);
$max_value_warning = io_safe_output($agentmodule_info['str_warning']);
}
@ -7412,23 +7412,25 @@ function reporting_advanced_sla(
}
// Take notice of $inverse_interval value.
if ($inverse_interval == 0) {
$sla_check_value = $match;
if ($inverse_interval === 1) {
// Is not inverse.
$sla_check_value = ($match === 1) ? false : true;
} else {
$sla_check_value = !$match;
// Is inverse.
$sla_check_value = ($match === 1) ? true : false;
}
// Warning SLA check.
if (empty($max_value_warning)) {
$match = preg_match('/^'.$max_value_warning.'$/', $current_data['datos']);
$match2 = preg_match('/^'.$max_value_warning.'$/', $current_data['datos']);
} else {
$match = preg_match('/'.$max_value_warning.'/', $current_data['datos']);
$match2 = preg_match('/'.$max_value_warning.'/', $current_data['datos']);
}
if ($inverse_interval_warning == 0) {
$sla_check_value_warning = $match;
$sla_check_value_warning = $match2;
} else {
$sla_check_value_warning = !$match;
$sla_check_value_warning = !$match2;
}
} else {
// OK SLA check.

382
pandora_console/include/javascript/jquery.pandora.controls.js
View File

@ -1,9 +1,10 @@
/* globals jQuery, js_html_entity_decode */
(function($) {
var dummyFunc = function () {
var dummyFunc = function() {
return true;
};
var _pandoraSelectGroupAgent = function (disabled) {
var _pandoraSelectGroupAgent = function(disabled) {
var that = this;
this.defaults = {
@ -19,134 +20,97 @@
debug: false,
disabled: disabled || false,
privilege: "",
serialized: false,
serialized_separator: "",
nodes: []
};
/* public methods */
this.construct = function (settings) {
return this.each (function() {
this.construct = function(settings) {
return this.each(function() {
this.config = {};
this.config = $.extend (this.config, that.defaults, settings);
this.config = $.extend(this.config, that.defaults, settings);
var config = this.config;
$(this).change (function () {
var $select = $(config.agentSelect).disable ();
$(config.loading).show ();
$("option[value!=0]", $select).remove ();
if (! config.callbackBefore (this))
return;
$(this).change(function() {
var $select = $(config.agentSelect).disable();
$(config.loading).show();
$("option[value!=0]", $select).remove();
if (!config.callbackBefore(this)) return;
var recursion_value;
if (typeof config.recursion === "function") {
// Perform this for those cases where recursion parameter is obtained through a function that returns a variable that is set in the lexical environment where this constructor is called.
var recursion_value = config.recursion();
// Perform this for those cases where recursion parameter
// is obtained through a function that returns a variable
// that is set in the lexical environment
// where this constructor is called.
recursion_value = config.recursion();
if (typeof recursion_value === "boolean") {
recursion_value = recursion_value ? 1 : 0;
}
} else {
var recursion_value = config.recursion;
recursion_value = config.recursion;
}
var opts = {
"page" : "godmode/groups/group_list",
"get_group_agents" : 1,
"id_group" : this.value,
"recursion" : recursion_value,
"filter_agents_json" : config.filter_agents_json,
"disabled" : (typeof config.disabled === "function")
? (config.disabled())
: (config.disabled),
"status_agents" : config.status_agents,
"add_alert_bulk_op" : config.add_alert_bulk_op,
"privilege" : config.privilege,
page: "godmode/groups/group_list",
get_group_agents: 1,
id_group: this.value,
recursion: recursion_value,
filter_agents_json: config.filter_agents_json,
disabled:
typeof config.disabled === "function"
? config.disabled()
: config.disabled,
status_agents: config.status_agents,
add_alert_bulk_op: config.add_alert_bulk_op,
privilege: config.privilege,
// Add a key prefix to avoid auto sorting in js object conversion
"keys_prefix" : "_"
keys_prefix: "_",
serialized: config.serialized,
serialized_separator: config.serialized_separator,
nodes:
typeof config.nodes === "function"
? config.nodes()
: config.disabled
};
if(opts['disabled'] == 1 || opts['disabled'] == 0){
jQuery.post ("ajax.php",
jQuery.post(
"ajax.php",
opts,
function (data, status) {
jQuery.each (data, function (id, value) {
// Remove keys_prefix from the index
function(data) {
jQuery.each(data, function(id, value) {
// Remove keys_prefix from the index.
id = id.substring(1);
if (id !== 'keycount') {
config.callbackPre ();
option = $("<option></option>")
.attr ("value", id)
.html (value);
config.callbackPost (id, value, option);
$(config.agentSelect).append (option);
if (id !== "keycount") {
config.callbackPre();
var option = $("<option></option>")
.attr("value", id)
.html(value);
config.callbackPost(id, value, option);
$(config.agentSelect).append(option);
}
});
$(config.loading).hide ();
$select.enable ();
config.callbackAfter ();
$(config.loading).hide();
$select.enable();
config.callbackAfter();
},
"json"
);
}
else{
opts['disabled'] = 0;
jQuery.post ("ajax.php",
opts,
function (data, status) {
jQuery.each (data, function (id, value) {
// Remove keys_prefix from the index
id = id.substring(1);
if (id !== 'keycount') {
config.callbackPre ();
option = $("<option></option>")
.attr ("value", id)
.html (value);
config.callbackPost (id, value, option);
$(config.agentSelect).append (option);
}
});
$(config.loading).hide ();
$select.enable ();
config.callbackAfter ();
},
"json"
);
opts['disabled'] = 1;
jQuery.post ("ajax.php",
opts,
function (data, status) {
jQuery.each (data, function (id, value) {
// Remove keys_prefix from the index
id = id.substring(1);
if (id !== 'keycount') {
config.callbackPre ();
option = $("<option></option>")
.attr ("value", id)
.html (value);
config.callbackPost (id, value, option);
$(config.agentSelect).append (option);
}
});
$(config.loading).hide ();
$select.enable ();
config.callbackAfter ();
},
"json"
);
}
});
});
};
};
$.extend ({
$.extend({
pandoraSelectGroupAgent: new _pandoraSelectGroupAgent(),
pandoraSelectGroupAgentDisabled: new _pandoraSelectGroupAgent(true),
pandoraSelectGroupAgentDisabled: new _pandoraSelectGroupAgent(true)
});
$.extend ({
pandoraSelectAgentModule: new function() {
$.extend({
pandoraSelectAgentModule: new (function() {
this.defaults = {
moduleSelect: "select#id_agent_module",
loading: "#module_loading",
@ -162,62 +126,67 @@
};
/* public methods */
this.construct = function (settings) {
return this.each (function() {
this.construct = function(settings) {
return this.each(function() {
this.config = {};
this.config = $.extend (this.config, $.pandoraSelectAgentModule.defaults, settings);
this.config = $.extend(
this.config,
$.pandoraSelectAgentModule.defaults,
settings
);
var config = this.config;
$(this).change (function () {
var $select = $(config.moduleSelect).disable ();
$(config.loading).show ();
$("option[value!=0]", $select).remove ();
if (! config.callbackBefore (this))
return;
$(this).change(function() {
var $select = $(config.moduleSelect).disable();
$(config.loading).show();
$("option[value!=0]", $select).remove();
if (!config.callbackBefore(this)) return;
jQuery.post ('ajax.php',
jQuery.post(
"ajax.php",
{
"page": "operation/agentes/ver_agente",
"get_agent_modules_json": 1,
"id_agent": this.value,
"disabled": config.moduleFilter.disabled,
"delete_pending": config.moduleFilter.deletePending
page: "operation/agentes/ver_agente",
get_agent_modules_json: 1,
id_agent: this.value,
disabled: config.moduleFilter.disabled,
delete_pending: config.moduleFilter.deletePending
},
function (data) {
jQuery.each (data, function (i, value) {
config.callbackPre ();
function(data) {
jQuery.each(data, function(i, value) {
config.callbackPre();
// Get the selected item from hidden field
selected = $('#hidden-'+config.moduleSelect.attr('id')+'_selected').val();
var selected = $(
"#hidden-" + config.moduleSelect.attr("id") + "_selected"
).val();
var option;
if (selected == i) {
option = $("<option></option>")
.prop ("selected", true)
.attr ("value", value['id_agente_modulo'])
.html (js_html_entity_decode (value['nombre']));
}
else {
.prop("selected", true)
.attr("value", value["id_agente_modulo"])
.html(js_html_entity_decode(value["nombre"]));
} else {
option = $("<option></option>")
.attr ("value", value['id_agente_modulo'])
.html (js_html_entity_decode (value['nombre']));
.attr("value", value["id_agente_modulo"])
.html(js_html_entity_decode(value["nombre"]));
}
config.callbackPost (i, value, option);
$(config.moduleSelect).append (option);
config.callbackPost(i, value, option);
$(config.moduleSelect).append(option);
});
$(config.loading).hide ();
$select.enable ();
config.callbackAfter ();
$(config.loading).hide();
$select.enable();
config.callbackAfter();
},
"json"
);
});
});
};
}
})()
});
$.extend ({
pandoraSelectAgentAlert: new function() {
$.extend({
pandoraSelectAgentAlert: new (function() {
this.defaults = {
alertSelect: "select#id_agent_module",
loading: "#alert_loading",
@ -229,50 +198,57 @@
};
/* public methods */
this.construct = function (settings) {
return this.each (function() {
this.construct = function(settings) {
return this.each(function() {
this.config = {};
this.config = $.extend (this.config, $.pandoraSelectAgentAlert.defaults, settings);
this.config = $.extend(
this.config,
$.pandoraSelectAgentAlert.defaults,
settings
);
var config = this.config;
$(this).change (function () {
var $select = $(config.alertSelect).disable ();
$(config.loading).show ();
$("option[value!=0]", $select).remove ();
if (! config.callbackBefore (this))
return;
$(this).change(function() {
var $select = $(config.alertSelect).disable();
$(config.loading).show();
$("option[value!=0]", $select).remove();
if (!config.callbackBefore(this)) return;
jQuery.post ('ajax.php',
{"page": "include/ajax/alert_list.ajax",
"get_agent_alerts_simple": 1,
"id_agent": this.value
jQuery.post(
"ajax.php",
{
page: "include/ajax/alert_list.ajax",
get_agent_alerts_simple: 1,
id_agent: this.value
},
function (data) {
jQuery.each (data, function (i, value) {
config.callbackPre ();
option = $("<option></option>")
.attr ("value", value['id'])
.html (js_html_entity_decode (value['template']['name']))
.append (" ("+js_html_entity_decode (value['module_name'])+")");
config.callbackPost (i, value, option);
$(config.alertSelect).append (option);
function(data) {
jQuery.each(data, function(i, value) {
config.callbackPre();
var option = $("<option></option>")
.attr("value", value["id"])
.html(js_html_entity_decode(value["template"]["name"]))
.append(
" (" + js_html_entity_decode(value["module_name"]) + ")"
);
config.callbackPost(i, value, option);
$(config.alertSelect).append(option);
});
$(config.loading).hide ();
$select.enable ();
config.callbackAfter ();
$(config.loading).hide();
$select.enable();
config.callbackAfter();
},
"json"
);
});
});
};
}
})()
});
$.extend ({
pandoraSelectOS: new function() {
$.extend({
pandoraSelectOS: new (function() {
this.defaults = {
alertSelect: "select#id_os",
spanPreview: "#os_preview",
@ -280,46 +256,45 @@
};
/* public methods */
this.construct = function (settings) {
return this.each (function() {
this.construct = function(settings) {
return this.each(function() {
this.config = {};
this.config = $.extend (this.config, $.pandoraSelectOS.defaults, settings);
this.config = $.extend(
this.config,
$.pandoraSelectOS.defaults,
settings
);
var config = this.config;
$(this).change (function () {
$(this).change(function() {
var id_os = this.value;
var home_url;
if (typeof(settings) == 'undefined')
home_url = './';
else
home_url = settings.home_url;
if (typeof settings == "undefined") home_url = "./";
else home_url = settings.home_url;
$(config.spanPreview).fadeOut ('fast', function () {
$("img", config.spanPreview).remove ();
jQuery.post (home_url + 'ajax.php',
{"page": "godmode/setup/setup",
"get_os_icon": 1,
"id_os": id_os
},
function (data) {
$(config.spanPreview).fadeOut("fast", function() {
$("img", config.spanPreview).remove();
jQuery.post(
home_url + "ajax.php",
{ page: "godmode/setup/setup", get_os_icon: 1, id_os: id_os },
function(data) {
$(config.spanPreview)
.append (data)
.fadeIn ('fast');
.append(data)
.fadeIn("fast");
},
"html"
);
});
});
});
};
}
})()
});
$.extend ({
pandoraSelectGroupIcon: new function() {
$.extend({
pandoraSelectGroupIcon: new (function() {
this.defaults = {
alertSelect: "select#id_group",
spanPreview: "#group_preview",
@ -327,45 +302,54 @@
};
/* public methods */
this.construct = function (settings) {
return this.each (function() {
this.construct = function(settings) {
return this.each(function() {
this.config = {};
this.config = $.extend (this.config, $.pandoraSelectGroupIcon.defaults, settings);
this.config = $.extend(
this.config,
$.pandoraSelectGroupIcon.defaults,
settings
);
var config = this.config;
$(this).change (function () {
$(this).change(function() {
var id_group = this.value;
$(config.spanPreview).fadeOut ('fast', function () {
$("img", config.spanPreview).remove ();
jQuery.post ('ajax.php',
{"page": "godmode/groups/group_list",
"get_group_json": 1,
"id_group": id_group
$(config.spanPreview).fadeOut("fast", function() {
$("img", config.spanPreview).remove();
jQuery.post(
"ajax.php",
{
page: "godmode/groups/group_list",
get_group_json: 1,
id_group: id_group
},
function (data) {
img = $("<img />").attr ("src", "images/groups_small/"+data["icon"]+".png");
function(data) {
var img = $("<img />").attr(
"src",
"images/groups_small/" + data["icon"] + ".png"
);
$(config.spanPreview)
.append (img)
.fadeIn ('fast');
.append(img)
.fadeIn("fast");
},
"json"
);
});
});
});
};
}
})()
});
$.fn.extend({
pandoraSelectGroupAgent: $.pandoraSelectGroupAgent.construct,
pandoraSelectGroupAgentDisabled: $.pandoraSelectGroupAgentDisabled.construct,
pandoraSelectGroupAgentDisabled:
$.pandoraSelectGroupAgentDisabled.construct,
pandoraSelectAgentModule: $.pandoraSelectAgentModule.construct,
pandoraSelectAgentAlert: $.pandoraSelectAgentAlert.construct,
pandoraSelectOS: $.pandoraSelectOS.construct,
pandoraSelectGroupIcon: $.pandoraSelectGroupIcon.construct
});
}) (jQuery);
})(jQuery);

2
pandora_console/include/javascript/massive_operations.js
View File

@ -1,4 +1,4 @@
/** global $ */
/* global $, confirmDialog, showSpinner, hideSpinner */
function massiveOperationValidation(contents, totalCount, limit, thisForm) {
var output = false;

49
pandora_console/include/javascript/multiselect_filtered.js
View File

@ -231,7 +231,7 @@ function fmModuleChange(uniqId, isMeta) {
if (data) {
jQuery.each(data, function(id, value) {
var option = $("<option></option>");
if (isMeta === true) {
if (isMeta === 1) {
option
.attr(
"value",
@ -251,3 +251,50 @@ function fmModuleChange(uniqId, isMeta) {
"json"
);
}
// Function to search in agents select.
function searchAgent(uniqId) {
// Declare variables
var agents = $("#filtered-module-agents-" + uniqId + " option");
// Loop through all list items, and hide those who don't match the search query
agents.each(function() {
var filter = $("#text-agent-searchBar-modules")
.val()
.toUpperCase();
if (
$(this)
.text()
.toUpperCase()
.indexOf(filter) > -1
) {
$(this).show();
} else {
$(this).hide();
}
});
}
// Function to search in modules select.
function searchModule(uniqId) {
// Declare variables
var modules = $("#filtered-module-modules-" + uniqId + " option");
// Loop through all list items, and hide those who don't match the search query
modules.each(function() {
var filter = $("#text-module-searchBar-modules")
.val()
.toUpperCase();
if (
$(this)
.text()
.toUpperCase()
.indexOf(filter) > -1
) {
$(this).show();
} else {
$(this).hide();
}
});
}

10
pandora_console/include/lib/Agent.php
View File

@ -590,15 +590,19 @@ class Agent extends Entity
/**
* Delete agent from db.
*
* @return void
* @return boolean
*/
public function delete()
{
// This function also mark modules for deletion.
\agents_delete_agent(
$res = (bool) \agents_delete_agent(
$this->fields['id_agente']
);
if ($res === false) {
return false;
}
// Delete modules.
if ($this->modules !== null) {
foreach ($this->modules as $module) {
@ -608,6 +612,8 @@ class Agent extends Entity
unset($this->fields);
unset($this->modules);
return $res;
}

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

@ -8485,3 +8485,40 @@ div#err_msg_centralised {
border-radius: 5px;
padding: 5px;
}
#select_multiple_modules_filtered > div {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin: 5px;
flex-wrap: wrap;
flex: 1 1 320px;
}
#select_multiple_modules_filtered > div > div {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
flex-wrap: wrap;
width: 250px;
}
#select_multiple_modules_filtered > div > div > * {
flex: auto;
}
#select_multiple_modules_filtered > div > div > select {
min-width: 250px !important;
}
#select_multiple_modules_filtered > div > div > .select2 {
min-width: 250px !important;
}
#select_multiple_modules_filtered > div > div > input {
max-width: 250px;
width: 95%;
height: 95%;
}

15
pandora_console/operation/tree.php
View File

@ -215,7 +215,7 @@ $agent_status_arr[AGENT_STATUS_NOT_INIT] = __('Not init');
$row = [];
$row[] = __('Search group');
$row[] = html_print_input_text('search_group', $search_group, '', is_metaconsole() ? 50 : 25, 30, true);
$row[] = html_print_input_text('search_group', $search_group, '', 25, 30, true);
if (is_metaconsole()) {
$row[] = __('Show not init modules');
@ -228,11 +228,16 @@ $table->data[] = $row;
$row = [];
$row[] = __('Search agent');
$row[] = html_print_input_text('search_agent', $search_agent, '', is_metaconsole() ? 50 : 25, 30, true);
$row[] = html_print_input_text('search_agent', $search_agent, '', 25, 30, true);
$row[] = __('Show not init agents');
$row[] = html_print_checkbox('show_not_init_agents', $show_not_init_agents, true, true);
if (is_metaconsole() === true) {
$table->data[] = $row;
$row = [];
}
$row[] = __('Show full hirearchy');
$row[] = html_print_checkbox('serach_hirearchy', $serach_hirearchy, false, true);
@ -241,8 +246,12 @@ $row[] = html_print_select($agent_status_arr, 'status_agent', $status_agent, '',
$row[] = html_print_input_hidden('show_not_init_modules_hidden', $show_not_init_modules, true);
// Button
if (is_metaconsole() === true) {
$table->data[] = $row;
$row = [];
}
$row[] = html_print_submit_button(__('Filter'), 'uptbutton', false, 'class="sub search"', true);
$table->rowspan[][(count($row) - 1)] = 2;
$table->data[] = $row;

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

@ -1262,6 +1262,13 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
$group = get_db_single_row ($dbh, 'SELECT * FROM tgrupo WHERE id_grupo = ?', $agent->{'id_grupo'});
}
my $agent_status;
if(ref ($module) eq "HASH") {
$agent_status = get_db_single_row ($dbh, 'SELECT * FROM tagente_estado WHERE id_agente_modulo = ?', $module->{'id_agente_modulo'});
}
my $time_down = (defined ($agent_status)) ? (time() - $agent_status->{'last_status_change'}) : undef;
if (is_numeric($data)) {
my $data_precision = $pa_config->{'graph_precision'};
$data = sprintf("%.$data_precision" . "f", $data);
@ -1274,7 +1281,8 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
# TODO: Reuse queries. For example, tag data can be extracted with a single query.
# Alert macros
my %macros = (_field1_ => $field1,
my %macros = (
_field1_ => $field1,
_field2_ => $field2,
_field3_ => $field3,
_field4_ => $field4,
@ -1345,6 +1353,12 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
_all_address_ => undef,
'_addressn_\d+_' => undef,
_secondarygroups_ => undef,
_time_down_seconds_ => (defined ($time_down)) ? int($time_down) : '',
_time_down_human_ => seconds_totime($time_down),
_warning_threshold_min_ => (defined ($module->{'min_warning'})) ? $module->{'min_warning'} : '',
_warning_threshold_max_ => (defined ($module->{'max_warning'})) ? $module->{'max_warning'} : '',
_critical_threshold_min_ => (defined ($module->{'min_critical'})) ? $module->{'min_critical'} : '',
_critical_threshold_max_ => (defined ($module->{'max_critical'})) ? $module->{'max_critical'} : '',
);
if ((defined ($extra_macros)) && (ref($extra_macros) eq "HASH")) {
@ -1357,7 +1371,6 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
load_module_macros ($module->{'module_macros'}, \%macros);
}
#logger($pa_config, "Clean name ".$clean_name, 10);
# User defined alert
if ($action->{'internal'} == 0) {

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

@ -147,6 +147,7 @@ our @EXPORT = qw(
ping
resolve_hostname
ticks_totime
seconds_totime
safe_input
safe_output
month_have_days
@ -1409,6 +1410,31 @@ sub ticks_totime ($){
return "$days days, $hours hours, $minutes minutes, $seconds seconds";
}
################################################################################
## SUB human_time_readable
# Transform a seconds count in a human readable date
################################################################################
sub seconds_totime ($){
my $SECONDS_PER_MINUTE = 60;
my $SECONDS_PER_HOUR = $SECONDS_PER_MINUTE * 60;
my $SECONDS_PER_DAY = $SECONDS_PER_HOUR * 24;
my $orig_seconds = shift;
if (!defined($orig_seconds)){
return "";
}
my $seconds = int($orig_seconds) % 60;
my $minutes = int($orig_seconds / $SECONDS_PER_MINUTE) % 60;
my $hours = int($orig_seconds / $SECONDS_PER_HOUR) % 24;
my $days = int($orig_seconds / $SECONDS_PER_DAY);
return "$days days, $hours hours, $minutes minutes, $seconds seconds";
}
################################################################################
=head2 C<< pandora_ping (I<$pa_config>, I<$host>) >>