Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'

# Conflicts:
#   pandora_console/godmode/massive/massive_delete_agents.php
This commit is contained in:
José González 2022-02-01 12:45:17 +00:00
commit 36bef528ab
44 changed files with 1153 additions and 860 deletions

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.759-220131 Version: 7.0NG.759-220201
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

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

View File

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

View File

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

View File

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

View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.759" PI_VERSION="7.0NG.759"
PI_BUILD="220131" PI_BUILD="220201"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{220131} {220201}
ViewReadme ViewReadme
{Yes} {Yes}

View File

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

View File

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

View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.759-220131 Version: 7.0NG.759-220201
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

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

View File

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

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 * Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -26,10 +26,13 @@
* ============================================================================ * ============================================================================
*/ */
use PandoraFMS\Agent;
use PandoraFMS\Enterprise\Metaconsole\Node;
// Begin. // Begin.
check_login(); check_login();
if (! check_acl($config['id_user'], 0, 'AW')) { if ((bool) check_acl($config['id_user'], 0, 'AW') === false) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
'Trying to access massive agent deletion section' 'Trying to access massive agent deletion section'
@ -38,30 +41,63 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
return; return;
} }
require_once 'include/functions_agents.php'; require_once $config['homedir'].'/include/functions_agents.php';
require_once 'include/functions_alerts.php'; require_once $config['homedir'].'/include/functions_alerts.php';
require_once 'include/functions_modules.php'; require_once $config['homedir'].'/include/functions_modules.php';
require_once 'include/functions_users.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) function process_manage_delete($id_agents)
{ {
if (empty($id_agents)) { if (empty($id_agents) === true) {
ui_print_error_message(__('No agents selected')); ui_print_error_message(__('No agents selected'));
return false; return false;
} }
$id_agents = (array) $id_agents; $id_agents = (array) $id_agents;
$copy_modules = (bool) get_parameter('copy_modules');
$copy_alerts = (bool) get_parameter('copy_alerts');
$error = false;
$count_deleted = 0; $count_deleted = 0;
$agent_id_restore = 0; $agent_id_restore = 0;
foreach ($id_agents as $id_agent) { foreach ($id_agents as $id_agent) {
$success = agents_delete_agent($id_agent); if (is_metaconsole() === true) {
if (! $success) { $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; $agent_id_restore = $id_agent;
break; break;
} }
@ -69,11 +105,22 @@ function process_manage_delete($id_agents)
$count_deleted++; $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( ui_print_error_message(
sprintf( sprintf(
__('There was an error deleting the agent, the operation has been cancelled Could not delete agent %s'), __('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,14 +143,14 @@ function process_manage_delete($id_agents)
$id_group = (int) get_parameter('id_group'); $id_group = (int) get_parameter('id_group');
$id_agents = get_parameter('id_agents'); $id_agents = get_parameter('id_agents');
$recursion = get_parameter('recursion'); $recursion = get_parameter('recursion');
$delete = (bool) get_parameter_post('delete'); $delete = (bool) get_parameter_post('delete');
if ($delete) { if ($delete === true) {
$result = process_manage_delete($id_agents); $result = process_manage_delete($id_agents);
$info = '{"Agent":"'.implode(',', $id_agents).'"}'; $info = '{"Agent":"'.implode(',', $id_agents).'"}';
if ($result) {
if ($result === true) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_MASSIVE_MANAGEMENT, AUDIT_LOG_MASSIVE_MANAGEMENT,
'Delete agent ', 'Delete agent ',
@ -122,8 +169,7 @@ if ($delete) {
} }
} }
$groups = users_get_groups(); $table = new stdClass;
$table->id = 'delete_table'; $table->id = 'delete_table';
$table->class = 'databox filters'; $table->class = 'databox filters';
$table->width = '100%'; $table->width = '100%';
@ -189,31 +235,98 @@ $table->data[1][3] = html_print_select(
__('All'), __('All'),
2, 2,
true, true,
false,
true,
'', '',
'', false,
'',
'',
'width:30%;' 'width:30%;'
); );
$table->data[2][0] = __('Agents'); if (is_metaconsole() === true) {
$table->data[2][0] .= '<span id="agent_loading" class="invisible">'; $servers = metaconsole_get_servers();
$table->data[2][0] .= html_print_image('images/spinner.png', true); $server_fields = [];
$table->data[2][0] .= '</span>'; foreach ($servers as $key => $server) {
$table->data[2][1] = html_print_select( $server_fields[$key] = $server['server_name'];
agents_get_group_agents(array_keys(users_get_groups($config['id_user'], 'AW', false)), false, 'none'), }
$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[]', 'id_agents[]',
0, 0,
false, false,
'', '',
'', '',
true, true,
true,
true,
'',
false,
'min-width: 500px; max-width: 500px; max-height: 100px',
false,
false,
false,
'',
false,
false,
false,
false,
true,
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); html_print_table($table);
if (is_management_allowed() === true) {
if (is_metaconsole() === true || is_management_allowed() === true) {
attachActionButton('delete', 'delete', $table->width); attachActionButton('delete', 'delete', $table->width);
} }
@ -227,25 +340,34 @@ ui_require_jquery_file('pandora.controls');
<script type="text/javascript"> <script type="text/javascript">
$(document).ready (function () { $(document).ready (function () {
// Check Metaconsole.
var metaconsole = '<?php echo (is_metaconsole() === true) ? 1 : 0; ?>';
// Listeners.
var recursion; var recursion;
$("#checkbox-recursion").click(function () { $("#checkbox-recursion").click(function () {
recursion = this.checked ? 1 : 0; recursion = this.checked ? 1 : 0;
$("#id_group").trigger("change"); $("#id_group").trigger("change");
}); });
var disabled; var disabled;
$("#disabled").change(function () {
$("#disabled").click(function () {
disabled = this.value; disabled = this.value;
$("#id_group").trigger("change"); $("#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 () { status_agents: function () {
return $("#status_agents").val(); return $("#status_agents").val();
}, },
@ -256,16 +378,18 @@ ui_require_jquery_file('pandora.controls');
}, },
disabled: function() { disabled: function() {
return disabled; return disabled;
},
} }
});
$("#status_agents").change(function() { if (metaconsole == 1) {
$("#id_group").trigger("change"); data.serialized = true;
}); data.serialized_separator = '|';
data.nodes = function() {
disabled = 2; return nodes;
};
$("#id_group").trigger("change"); }
// Change agents.
$("#id_group").pandoraSelectGroupAgent(data);
}); });
</script> </script>

View File

@ -38,13 +38,13 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
return; return;
} }
require_once 'include/functions_agents.php'; require_once $config['homedir'].'/include/functions_agents.php';
require_once 'include/functions_ui.php'; require_once $config['homedir'].'/include/functions_ui.php';
require_once 'include/functions_alerts.php'; require_once $config['homedir'].'/include/functions_alerts.php';
require_once 'include/functions_modules.php'; require_once $config['homedir'].'/include/functions_modules.php';
require_once 'include/functions_servers.php'; require_once $config['homedir'].'/include/functions_servers.php';
require_once 'include/functions_gis.php'; require_once $config['homedir'].'/include/functions_gis.php';
require_once 'include/functions_users.php'; require_once $config['homedir'].'/include/functions_users.php';
enterprise_include_once('include/functions_config_agents.php'); enterprise_include_once('include/functions_config_agents.php');
if (is_ajax()) { if (is_ajax()) {
@ -171,7 +171,7 @@ if ($update_agents) {
} }
} }
// CONF FILE DELETION // CONF FILE DELETION.
if (isset($values['delete_conf'])) { if (isset($values['delete_conf'])) {
unset($values['delete_conf']); unset($values['delete_conf']);
$n_deleted = 0; $n_deleted = 0;
@ -345,7 +345,7 @@ if ($update_agents) {
} }
$info = []; $info = [];
// Update Custom Fields // Update Custom Fields.
foreach ($fields as $field) { foreach ($fields as $field) {
$info[$field['id_field']] = $field['name']; $info[$field['id_field']] = $field['name'];
$value = get_parameter('customvalue_'.$field['id_field']); $value = get_parameter('customvalue_'.$field['id_field']);
@ -360,7 +360,7 @@ if ($update_agents) {
); );
if ($old_value === false) { if ($old_value === false) {
// Create custom field if not exist // Create custom field if not exist.
$result = db_process_sql_insert( $result = db_process_sql_insert(
'tagent_custom_data', 'tagent_custom_data',
[ [
@ -418,8 +418,6 @@ if ($update_agents) {
$id_group = 0; $id_group = 0;
$groups = users_get_groups();
$table = new StdClass(); $table = new StdClass();
$table->id = 'delete_table'; $table->id = 'delete_table';
$table->class = 'databox filters'; $table->class = 'databox filters';
@ -486,18 +484,22 @@ $table->data[1][3] = html_print_select(
__('All'), __('All'),
2, 2,
true, true,
false,
true,
'', '',
'', false,
'',
'',
'width:30%;' 'width:30%;'
); );
$table->data[2][0] = __('Agents'); $table->data[2][0] = __('Agents');
$table->data[2][0] .= '<span id="agent_loading" class="invisible">'; $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] .= html_print_image('images/spinner.png', true);
$table->data[2][0] .= '</span>'; $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(
$all_agents = (agents_get_group_agents(array_keys(users_get_groups($config['id_user'], 'AW', false)), ['disabled' => 1], 'none') + $enabled_agents); array_keys(users_get_groups($config['id_user'], 'AW', false)),
['disabled' => 2],
'none'
);
$table->data[2][1] = html_print_select( $table->data[2][1] = html_print_select(
$all_agents, $all_agents,
@ -507,10 +509,27 @@ $table->data[2][1] = html_print_select(
'', '',
'', '',
true, true,
true,
true,
'',
false,
'min-width: 500px; max-width: 500px; max-height: 100px',
false,
false,
false,
'',
false,
false,
false,
false,
true,
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); html_print_table($table);
$nombre_agente = ''; $nombre_agente = '';
@ -540,9 +559,6 @@ $table->size[3] = '35%';
$table->data = []; $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( $modules = db_get_all_rows_sql(
'SELECT id_agente_modulo as id_module, nombre as name FROM tagente_modulo 'SELECT id_agente_modulo as id_module, nombre as name FROM tagente_modulo
WHERE id_agente = '.$id_parent WHERE id_agente = '.$id_parent
@ -627,7 +643,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] .= ui_print_os_icon($id_os, false, true);
$table->data[3][1] .= '</span>'; $table->data[3][1] .= '</span>';
// Network server // Network server.
$none = ''; $none = '';
if ($server_name == '' && $id_agente) { if ($server_name == '' && $id_agente) {
$none = __('None'); $none = __('None');
@ -649,7 +665,7 @@ $table->data[4][1] = html_print_select(
'width: 150px;' 'width: 150px;'
); );
// Description // Description.
$table->data[5][0] = __('Description'); $table->data[5][0] = __('Description');
$table->data[5][1] = html_print_input_text('description', $description, '', 45, 255, true); $table->data[5][1] = html_print_input_text('description', $description, '', 45, 255, true);
@ -680,27 +696,27 @@ $table->style = [];
$table->style[0] = 'font-weight: bold; width: 150px;'; $table->style[0] = 'font-weight: bold; width: 150px;';
$table->data = []; $table->data = [];
// Custom ID // Custom ID.
$table->data[0][0] = __('Custom ID'); $table->data[0][0] = __('Custom ID');
$table->data[0][1] = html_print_input_text('custom_id', $custom_id, '', 16, 255, true); $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][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] = __('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] .= __('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] .= __('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); $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][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] = __('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] .= __('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); $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'); $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] = '<div id="delete_configurations" class="invisible">'.__('Delete available remote configurations').' (';
$table->data[3][1] .= '<span id="n_configurations"></span>'; $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>'; $table->data[3][1] .= ') '.html_print_checkbox_extended('delete_conf', 1, 0, false, '', 'class="mrgn_right_40px"', true).'</div>';
@ -718,7 +734,7 @@ $path = 'images/gis_map/icons/';
// TODO set better method the path // TODO set better method the path
if ($icon_path == '') { if ($icon_path == '') {
$display_icons = 'none'; $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_without = 'images/spinner.png';
$path_default = 'images/spinner.png'; $path_default = 'images/spinner.png';
$path_ok = 'images/spinner.png'; $path_ok = 'images/spinner.png';
@ -819,7 +835,8 @@ foreach ($fields as $field) {
} }
if ($field['is_password_type']) { 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'], 'customvalue_'.$field['id_field'],
$custom_value, $custom_value,
'customvalue_'.$field['id_field'], 'customvalue_'.$field['id_field'],
@ -882,7 +899,6 @@ var limit_parameters_massive = <?php echo $config['limit_parameters_massive']; ?
//Use this function for change 3 icons when change the selectbox //Use this function for change 3 icons when change the selectbox
$(document).ready (function () { $(document).ready (function () {
var checked = $("#cascade_protection").val(); var checked = $("#cascade_protection").val();
$("#cascade_protection_module").attr("disabled", 'disabled'); $("#cascade_protection_module").attr("disabled", 'disabled');
$("#cascade_protection").change(function () { $("#cascade_protection").change(function () {
@ -944,7 +960,6 @@ $(document).ready (function () {
); );
} }
$("#form_agent").submit(function() { $("#form_agent").submit(function() {
var get_parameters_count = window.location.href.slice( var get_parameters_count = window.location.href.slice(
window.location.href.indexOf('?') + 1).split('&').length; window.location.href.indexOf('?') + 1).split('&').length;
@ -960,11 +975,8 @@ $(document).ready (function () {
}); });
var disabled; var disabled;
$("#disabled").change(function () {
$("#disabled").click(function () {
disabled = this.value; disabled = this.value;
$("#id_group").trigger("change"); $("#id_group").trigger("change");
}); });
@ -1029,10 +1041,9 @@ $(document).ready (function () {
$("#id_group").trigger("change"); $("#id_group").trigger("change");
}); });
disabled = 2; disabled = 2;
$("#id_group").trigger("change"); //$("#id_group").trigger("change");
}); });

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 * Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -29,6 +29,8 @@
// Begin. // Begin.
check_login(); check_login();
global $config;
if (! check_acl($config['id_user'], 0, 'AW')) { if (! check_acl($config['id_user'], 0, 'AW')) {
db_pandora_audit( db_pandora_audit(
AUDIT_LOG_ACL_VIOLATION, AUDIT_LOG_ACL_VIOLATION,
@ -38,16 +40,20 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
return; return;
} }
require_once 'include/functions_agents.php'; require_once $config['homedir'].'/include/functions_agents.php';
require_once 'include/functions_alerts.php'; require_once $config['homedir'].'/include/functions_alerts.php';
require_once 'include/functions_modules.php'; require_once $config['homedir'].'/include/functions_modules.php';
require_once 'include/functions_massive_operations.php'; require_once $config['homedir'].'/include/functions_massive_operations.php';
enterprise_include('godmode/massive/massive_operations.php'); enterprise_include('godmode/massive/massive_operations.php');
$tab = (string) get_parameter('tab', 'massive_agents'); $tab = (string) get_parameter('tab', 'massive_agents');
$option = (string) get_parameter('option'); $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 = [ $options_alerts = [
'add_alerts' => __('Bulk alert add'), 'add_alerts' => __('Bulk alert add'),
@ -62,6 +68,11 @@ $options_agents = [
'edit_agents' => __('Bulk agent edit'), 'edit_agents' => __('Bulk agent edit'),
'delete_agents' => __('Bulk agent delete'), 'delete_agents' => __('Bulk agent delete'),
]; ];
if (is_metaconsole() === true) {
$options_agents = [
'delete_agents' => __('Bulk agent delete'),
];
}
if (check_acl($config['id_user'], 0, 'UM')) { if (check_acl($config['id_user'], 0, 'UM')) {
$options_users = [ $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'; $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'; $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'; $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'; $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'; $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'; $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'; $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'; $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'; $tab = 'massive_services';
} }
if ($tab == 'massive_agents' && $option == '') { if ($tab === 'massive_agents' && empty($option) === true) {
$option = 'edit_agents'; $option = 'edit_agents';
if (is_metaconsole() === true) {
$option = 'delete_agents';
}
} }
if ($tab == 'massive_modules' && $option == '') { if ($tab == 'massive_modules' && $option == '') {
@ -212,7 +226,7 @@ if ($option == '') {
} }
$alertstab = [ $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', 'images/bell.png',
true, true,
[ [
@ -224,7 +238,7 @@ $alertstab = [
]; ];
$userstab = [ $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', 'images/user.png',
true, true,
[ [
@ -236,7 +250,7 @@ $userstab = [
]; ];
$agentstab = [ $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', 'images/agent.png',
true, true,
[ [
@ -248,7 +262,7 @@ $agentstab = [
]; ];
$modulestab = [ $modulestab = [
'text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_modules">'.html_print_image( 'text' => '<a href="'.$url.'&tab=massive_modules">'.html_print_image(
'images/module.png', 'images/module.png',
true, true,
[ [
@ -260,7 +274,7 @@ $agentstab = [
]; ];
$pluginstab = [ $pluginstab = [
'text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_plugins">'.html_print_image( 'text' => '<a href="'.$url.'&tab=massive_plugins">'.html_print_image(
'images/plugin.png', 'images/plugin.png',
true, true,
[ [
@ -309,15 +323,8 @@ $agentstab = [
$onheader['satellite'] = $satellitetab; $onheader['satellite'] = $satellitetab;
$onheader['services'] = $servicestab; $onheader['services'] = $servicestab;
/* // Header.
Hello there! :) if (is_metaconsole() === false) {
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.
*/
ui_print_page_header( ui_print_page_header(
__('Bulk operations').' &raquo; '.$options[$option], __('Bulk operations').' &raquo; '.$options[$option],
'images/gm_massive_operations.png', 'images/gm_massive_operations.png',
@ -328,6 +335,9 @@ $agentstab = [
false, false,
'massivemodal' 'massivemodal'
); );
} else {
massive_meta_print_header();
}
// Checks if the PHP configuration is correctly. // Checks if the PHP configuration is correctly.
if ((get_cfg_var('max_execution_time') != 0) if ((get_cfg_var('max_execution_time') != 0)
@ -338,24 +348,6 @@ $agentstab = [
echo '</div>'; 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. // Catch all submit operations in this view to display Wait banner.
$submit_action = get_parameter('go'); $submit_action = get_parameter('go');
$submit_update = get_parameter('updbutton'); $submit_update = get_parameter('updbutton');
@ -411,25 +403,25 @@ $agentstab = [
</script> </script>
<?php <?php
if (is_management_allowed() === false && $option == 'delete_agents') { if (is_management_allowed() === false) {
if (is_metaconsole() === 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' 'index.php?sec=monitoring&sec2=monitoring/wizard/wizard'
).'">'.__('metaconsole').'</a>'; ).'">'.__('metaconsole').'</a>';
} else { } else {
$url = __('any node'); $text_warning = __('any node');
} }
ui_print_warning_message( ui_print_warning_message(
__( __(
'This node is configured with centralized mode. To delete agents go to %s', 'This node is configured with centralized mode. To delete agents go to %s',
$url $text_warning
) )
); );
} }
echo '<br />'; 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 '<table border="0"><tr><td>';
echo __('Action'); echo __('Action');
echo '</td><td>'; echo '</td><td>';
@ -444,7 +436,7 @@ html_print_select(
false, false,
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')); ui_print_help_tip(__('The blank fields will not be updated'));
} }
@ -454,64 +446,64 @@ echo '<br />';
switch ($option) { switch ($option) {
case 'delete_alerts': case 'delete_alerts':
include_once 'godmode/massive/massive_delete_alerts.php'; include_once $config['homedir'].'/godmode/massive/massive_delete_alerts.php';
break; break;
case 'add_alerts': case 'add_alerts':
include_once 'godmode/massive/massive_add_alerts.php'; include_once $config['homedir'].'/godmode/massive/massive_add_alerts.php';
break; break;
case 'delete_action_alerts': 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; break;
case 'add_action_alerts': 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; break;
case 'enable_disable_alerts': 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; break;
case 'standby_alerts': case 'standby_alerts':
include_once 'godmode/massive/massive_standby_alerts.php'; include_once $config['homedir'].'/godmode/massive/massive_standby_alerts.php';
break; break;
case 'add_profiles': case 'add_profiles':
include_once 'godmode/massive/massive_add_profiles.php'; include_once $config['homedir'].'/godmode/massive/massive_add_profiles.php';
break; break;
case 'delete_profiles': case 'delete_profiles':
include_once 'godmode/massive/massive_delete_profiles.php'; include_once $config['homedir'].'/godmode/massive/massive_delete_profiles.php';
break; break;
case 'delete_agents': case 'delete_agents':
include_once 'godmode/massive/massive_delete_agents.php'; include_once $config['homedir'].'/godmode/massive/massive_delete_agents.php';
break; break;
case 'edit_agents': case 'edit_agents':
include_once 'godmode/massive/massive_edit_agents.php'; include_once $config['homedir'].'/godmode/massive/massive_edit_agents.php';
break; break;
case 'delete_modules': case 'delete_modules':
include_once 'godmode/massive/massive_delete_modules.php'; include_once $config['homedir'].'/godmode/massive/massive_delete_modules.php';
break; break;
case 'edit_modules': case 'edit_modules':
include_once 'godmode/massive/massive_edit_modules.php'; include_once $config['homedir'].'/godmode/massive/massive_edit_modules.php';
break; break;
case 'copy_modules': case 'copy_modules':
include_once 'godmode/massive/massive_copy_modules.php'; include_once $config['homedir'].'/godmode/massive/massive_copy_modules.php';
break; break;
case 'edit_plugins': case 'edit_plugins':
include_once 'godmode/massive/massive_edit_plugins.php'; include_once $config['homedir'].'/godmode/massive/massive_edit_plugins.php';
break; break;
default: default:
if (!enterprise_hook('massive_operations', [$option])) { if (!enterprise_hook('massive_operations', [$option])) {
include_once 'godmode/massive/massive_config.php'; include_once $config['homedir'].'/godmode/massive/massive_config.php';
} }
break; break;
} }

View File

@ -327,59 +327,17 @@ echo '<br>';
// Configuration form. // Configuration form.
echo '<span id ="none_text" class="invisible">'.__('None').'</span>'; 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 "<table width='100%' cellpadding='4' cellpadding='4' class='databox filters'>";
echo '<tr>'; echo '<tr>';
echo "<td colspan='1'>".__('Filter group').'</td>'; echo '<td class="w50p pdd_50px" id="select_multiple_modules_filtered">'.html_print_input(
echo '</tr><tr>'; [
echo "<td colspan='1'>".html_print_select_groups( 'type' => 'select_multiple_modules_filtered',
$config['id_user'], 'uniqId' => 'modules',
($report_w == true) ? 'RW' : (($report_m == true) ? 'RM' : 'RW'), 'class' => 'flex flex-row',
true, 'searchBar' => 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,
''
).'</td>'; ).'</td>';
echo '</tr><tr>'; echo '</tr><tr>';
echo "<td colspan='3'>"; echo "<td colspan='3'>";
@ -403,52 +361,34 @@ ui_require_jquery_file('autocomplete');
$(document).ready (function () { $(document).ready (function () {
$(document).data('text_for_module', $("#none_text").html()); $(document).data('text_for_module', $("#none_text").html());
$("#id_agents").change(agent_changed_by_multiple_agents);
$("#submit-add").click(function() { $("#submit-add").click(function() {
$('#module').map(function(){ if($('#filtered-module-modules-modules')[0].value == "" || $('#filtered-module-modules-modules')[0].value == "0") {
if ($(this).val() != "0" )
$(this).prop('selected', true);
});
if($('#module')[0].childElementCount == 1 && ($('#module')[0].value == "" || $('#module')[0].value == "0")) {
alert("<?php echo __('Please, select a module'); ?>"); alert("<?php echo __('Please, select a module'); ?>");
return false; 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() { function added_ids_sorted_items_to_hidden_input() {
var ids = ''; var ids = '';
var first = true; var first = true;

View File

@ -221,17 +221,14 @@ function add_quotes($item)
if ($add_module === true) { if ($add_module === true) {
$id_graph = get_parameter('id'); $id_graph = get_parameter('id');
$id_modules = get_parameter('module'); $id_modules = explode(',', get_parameter('id_modules'));
$id_agents = get_parameter('id_agents'); $id_agents = explode(',', get_parameter('id_agents'));
$weight = get_parameter('weight'); $weight = get_parameter('weight');
// Id modules has double entities conversion. // Id modules has double entities conversion.
// Safe output remove all entities. // Safe output remove all entities.
io_safe_output_array($id_modules, ''); 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( $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)."')" 'SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente IN ('.implode(',', $id_agents).") AND nombre IN ('".implode("','", $id_modules)."')"

View File

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

View File

@ -1224,6 +1224,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'])) { if (isset($search['all_agents'])) {
unset($search['all_agents']); unset($search['all_agents']);
} }
@ -1316,16 +1325,19 @@ function agents_get_group_agents(
} }
} }
if (is_metaconsole() && isset($search['id_server'])) { if (is_metaconsole() === true
$filter['id_tmetaconsole_setup'] = $search['id_server']; && isset($search['id_server']) === true
&& empty($search['id_server']) === false
) {
$filter['ta.id_tmetaconsole_setup'] = $search['id_server'];
if ($filter['id_tmetaconsole_setup'] == 0) { if ($filter['id_tmetaconsole_setup'] == 0) {
// All nodes. // All nodes.
unset($filter['id_tmetaconsole_setup']); unset($filter['id_tmetaconsole_setup']);
} }
}
unset($search['id_server']); unset($search['id_server']);
}
if (!$add_alert_bulk_op) { if (!$add_alert_bulk_op) {
// Add the rest of the filter from the search array. // Add the rest of the filter from the search array.
@ -1339,7 +1351,7 @@ function agents_get_group_agents(
$filter['order'] = 'alias'; $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'; $table_name = 'tmetaconsole_agent ta LEFT JOIN tmetaconsole_agent_secondary_group tasg ON ta.id_agente = tasg.id_agent';
if ($meta_fields === true) { if ($meta_fields === true) {

View File

@ -17601,6 +17601,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. * Function to set events in progress status.
* *

View File

@ -1480,11 +1480,43 @@ function html_print_select_multiple_modules_filtered(array $data):string
'return' => true, 'return' => true,
'nothing' => __('All'), 'nothing' => __('All'),
'nothing_value' => 0, 'nothing_value' => 0,
'script' => 'fmModuleChange(\''.$uniqId.'\', '.is_metaconsole().')', 'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
] ]
); );
$output .= '</div>'; $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>'; $output .= '<div>';
// Agent. // Agent.
$agents = agents_get_group_agents( $agents = agents_get_group_agents(
@ -1533,7 +1565,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
'return' => true, 'return' => true,
'multiple' => true, 'multiple' => true,
'style' => 'min-width: 200px;max-width:200px;', '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, 'name' => 'filtered-module-show-common-modules-'.$uniqId,
'selected' => $data['mShowCommonModules'], 'selected' => $data['mShowCommonModules'],
'return' => true, '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. * Print a magic-ajax control to select the module.
* *

View File

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

View File

@ -1,3 +1,4 @@
/* globals jQuery, js_html_entity_decode */
(function($) { (function($) {
var dummyFunc = function() { var dummyFunc = function() {
return true; return true;
@ -19,6 +20,9 @@
debug: false, debug: false,
disabled: disabled || false, disabled: disabled || false,
privilege: "", privilege: "",
serialized: false,
serialized_separator: "",
nodes: []
}; };
/* public methods */ /* public methods */
@ -33,45 +37,56 @@
var $select = $(config.agentSelect).disable(); var $select = $(config.agentSelect).disable();
$(config.loading).show(); $(config.loading).show();
$("option[value!=0]", $select).remove(); $("option[value!=0]", $select).remove();
if (! config.callbackBefore (this)) if (!config.callbackBefore(this)) return;
return;
var recursion_value;
if (typeof config.recursion === "function") { 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. // Perform this for those cases where recursion parameter
var recursion_value = config.recursion(); // 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") { if (typeof recursion_value === "boolean") {
recursion_value = recursion_value ? 1 : 0; recursion_value = recursion_value ? 1 : 0;
} }
} else { } else {
var recursion_value = config.recursion; recursion_value = config.recursion;
} }
var opts = { var opts = {
"page" : "godmode/groups/group_list", page: "godmode/groups/group_list",
"get_group_agents" : 1, get_group_agents: 1,
"id_group" : this.value, id_group: this.value,
"recursion" : recursion_value, recursion: recursion_value,
"filter_agents_json" : config.filter_agents_json, filter_agents_json: config.filter_agents_json,
"disabled" : (typeof config.disabled === "function") disabled:
? (config.disabled()) typeof config.disabled === "function"
: (config.disabled), ? config.disabled()
"status_agents" : config.status_agents, : config.disabled,
"add_alert_bulk_op" : config.add_alert_bulk_op, status_agents: config.status_agents,
"privilege" : config.privilege, add_alert_bulk_op: config.add_alert_bulk_op,
privilege: config.privilege,
// Add a key prefix to avoid auto sorting in js object conversion // 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, opts,
function (data, status) { function(data) {
jQuery.each(data, function(id, value) { jQuery.each(data, function(id, value) {
// Remove keys_prefix from the index // Remove keys_prefix from the index.
id = id.substring(1); id = id.substring(1);
if (id !== 'keycount') { if (id !== "keycount") {
config.callbackPre(); config.callbackPre();
option = $("<option></option>") var option = $("<option></option>")
.attr("value", id) .attr("value", id)
.html(value); .html(value);
config.callbackPost(id, value, option); config.callbackPost(id, value, option);
@ -84,57 +99,6 @@
}, },
"json" "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"
);
}
}); });
}); });
}; };
@ -142,11 +106,11 @@
$.extend({ $.extend({
pandoraSelectGroupAgent: new _pandoraSelectGroupAgent(), pandoraSelectGroupAgent: new _pandoraSelectGroupAgent(),
pandoraSelectGroupAgentDisabled: new _pandoraSelectGroupAgent(true), pandoraSelectGroupAgentDisabled: new _pandoraSelectGroupAgent(true)
}); });
$.extend({ $.extend({
pandoraSelectAgentModule: new function() { pandoraSelectAgentModule: new (function() {
this.defaults = { this.defaults = {
moduleSelect: "select#id_agent_module", moduleSelect: "select#id_agent_module",
loading: "#module_loading", loading: "#module_loading",
@ -166,39 +130,45 @@
return this.each(function() { return this.each(function() {
this.config = {}; this.config = {};
this.config = $.extend (this.config, $.pandoraSelectAgentModule.defaults, settings); this.config = $.extend(
this.config,
$.pandoraSelectAgentModule.defaults,
settings
);
var config = this.config; var config = this.config;
$(this).change(function() { $(this).change(function() {
var $select = $(config.moduleSelect).disable(); var $select = $(config.moduleSelect).disable();
$(config.loading).show(); $(config.loading).show();
$("option[value!=0]", $select).remove(); $("option[value!=0]", $select).remove();
if (! config.callbackBefore (this)) if (!config.callbackBefore(this)) return;
return;
jQuery.post ('ajax.php', jQuery.post(
"ajax.php",
{ {
"page": "operation/agentes/ver_agente", page: "operation/agentes/ver_agente",
"get_agent_modules_json": 1, get_agent_modules_json: 1,
"id_agent": this.value, id_agent: this.value,
"disabled": config.moduleFilter.disabled, disabled: config.moduleFilter.disabled,
"delete_pending": config.moduleFilter.deletePending delete_pending: config.moduleFilter.deletePending
}, },
function(data) { function(data) {
jQuery.each(data, function(i, value) { jQuery.each(data, function(i, value) {
config.callbackPre(); config.callbackPre();
// Get the selected item from hidden field // 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) { if (selected == i) {
option = $("<option></option>") option = $("<option></option>")
.prop("selected", true) .prop("selected", true)
.attr ("value", value['id_agente_modulo']) .attr("value", value["id_agente_modulo"])
.html (js_html_entity_decode (value['nombre'])); .html(js_html_entity_decode(value["nombre"]));
} } else {
else {
option = $("<option></option>") option = $("<option></option>")
.attr ("value", value['id_agente_modulo']) .attr("value", value["id_agente_modulo"])
.html (js_html_entity_decode (value['nombre'])); .html(js_html_entity_decode(value["nombre"]));
} }
config.callbackPost(i, value, option); config.callbackPost(i, value, option);
$(config.moduleSelect).append(option); $(config.moduleSelect).append(option);
@ -211,13 +181,12 @@
); );
}); });
}); });
}; };
} })()
}); });
$.extend({ $.extend({
pandoraSelectAgentAlert: new function() { pandoraSelectAgentAlert: new (function() {
this.defaults = { this.defaults = {
alertSelect: "select#id_agent_module", alertSelect: "select#id_agent_module",
loading: "#alert_loading", loading: "#alert_loading",
@ -233,7 +202,11 @@
return this.each(function() { return this.each(function() {
this.config = {}; this.config = {};
this.config = $.extend (this.config, $.pandoraSelectAgentAlert.defaults, settings); this.config = $.extend(
this.config,
$.pandoraSelectAgentAlert.defaults,
settings
);
var config = this.config; var config = this.config;
@ -241,21 +214,24 @@
var $select = $(config.alertSelect).disable(); var $select = $(config.alertSelect).disable();
$(config.loading).show(); $(config.loading).show();
$("option[value!=0]", $select).remove(); $("option[value!=0]", $select).remove();
if (! config.callbackBefore (this)) if (!config.callbackBefore(this)) return;
return;
jQuery.post ('ajax.php', jQuery.post(
{"page": "include/ajax/alert_list.ajax", "ajax.php",
"get_agent_alerts_simple": 1, {
"id_agent": this.value page: "include/ajax/alert_list.ajax",
get_agent_alerts_simple: 1,
id_agent: this.value
}, },
function(data) { function(data) {
jQuery.each(data, function(i, value) { jQuery.each(data, function(i, value) {
config.callbackPre(); config.callbackPre();
option = $("<option></option>") var option = $("<option></option>")
.attr ("value", value['id']) .attr("value", value["id"])
.html (js_html_entity_decode (value['template']['name'])) .html(js_html_entity_decode(value["template"]["name"]))
.append (" ("+js_html_entity_decode (value['module_name'])+")"); .append(
" (" + js_html_entity_decode(value["module_name"]) + ")"
);
config.callbackPost(i, value, option); config.callbackPost(i, value, option);
$(config.alertSelect).append(option); $(config.alertSelect).append(option);
}); });
@ -268,11 +244,11 @@
}); });
}); });
}; };
} })()
}); });
$.extend({ $.extend({
pandoraSelectOS: new function() { pandoraSelectOS: new (function() {
this.defaults = { this.defaults = {
alertSelect: "select#id_os", alertSelect: "select#id_os",
spanPreview: "#os_preview", spanPreview: "#os_preview",
@ -283,7 +259,11 @@
this.construct = function(settings) { this.construct = function(settings) {
return this.each(function() { return this.each(function() {
this.config = {}; this.config = {};
this.config = $.extend (this.config, $.pandoraSelectOS.defaults, settings); this.config = $.extend(
this.config,
$.pandoraSelectOS.defaults,
settings
);
var config = this.config; var config = this.config;
@ -291,35 +271,30 @@
var id_os = this.value; var id_os = this.value;
var home_url; var home_url;
if (typeof(settings) == 'undefined') if (typeof settings == "undefined") home_url = "./";
home_url = './'; else home_url = settings.home_url;
else
home_url = settings.home_url;
$(config.spanPreview).fadeOut ('fast', function () { $(config.spanPreview).fadeOut("fast", function() {
$("img", config.spanPreview).remove(); $("img", config.spanPreview).remove();
jQuery.post (home_url + 'ajax.php', jQuery.post(
{"page": "godmode/setup/setup", home_url + "ajax.php",
"get_os_icon": 1, { page: "godmode/setup/setup", get_os_icon: 1, id_os: id_os },
"id_os": id_os
},
function(data) { function(data) {
$(config.spanPreview) $(config.spanPreview)
.append(data) .append(data)
.fadeIn ('fast'); .fadeIn("fast");
}, },
"html" "html"
); );
}); });
}); });
}); });
}; };
} })()
}); });
$.extend({ $.extend({
pandoraSelectGroupIcon: new function() { pandoraSelectGroupIcon: new (function() {
this.defaults = { this.defaults = {
alertSelect: "select#id_group", alertSelect: "select#id_group",
spanPreview: "#group_preview", spanPreview: "#group_preview",
@ -330,39 +305,48 @@
this.construct = function(settings) { this.construct = function(settings) {
return this.each(function() { return this.each(function() {
this.config = {}; this.config = {};
this.config = $.extend (this.config, $.pandoraSelectGroupIcon.defaults, settings); this.config = $.extend(
this.config,
$.pandoraSelectGroupIcon.defaults,
settings
);
var config = this.config; var config = this.config;
$(this).change(function() { $(this).change(function() {
var id_group = this.value; var id_group = this.value;
$(config.spanPreview).fadeOut ('fast', function () { $(config.spanPreview).fadeOut("fast", function() {
$("img", config.spanPreview).remove(); $("img", config.spanPreview).remove();
jQuery.post ('ajax.php', jQuery.post(
{"page": "godmode/groups/group_list", "ajax.php",
"get_group_json": 1, {
"id_group": id_group page: "godmode/groups/group_list",
get_group_json: 1,
id_group: id_group
}, },
function(data) { function(data) {
img = $("<img />").attr ("src", "images/groups_small/"+data["icon"]+".png"); var img = $("<img />").attr(
"src",
"images/groups_small/" + data["icon"] + ".png"
);
$(config.spanPreview) $(config.spanPreview)
.append(img) .append(img)
.fadeIn ('fast'); .fadeIn("fast");
}, },
"json" "json"
); );
}); });
}); });
}); });
}; };
} })()
}); });
$.fn.extend({ $.fn.extend({
pandoraSelectGroupAgent: $.pandoraSelectGroupAgent.construct, pandoraSelectGroupAgent: $.pandoraSelectGroupAgent.construct,
pandoraSelectGroupAgentDisabled: $.pandoraSelectGroupAgentDisabled.construct, pandoraSelectGroupAgentDisabled:
$.pandoraSelectGroupAgentDisabled.construct,
pandoraSelectAgentModule: $.pandoraSelectAgentModule.construct, pandoraSelectAgentModule: $.pandoraSelectAgentModule.construct,
pandoraSelectAgentAlert: $.pandoraSelectAgentAlert.construct, pandoraSelectAgentAlert: $.pandoraSelectAgentAlert.construct,
pandoraSelectOS: $.pandoraSelectOS.construct, pandoraSelectOS: $.pandoraSelectOS.construct,

View File

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

View File

@ -231,7 +231,7 @@ function fmModuleChange(uniqId, isMeta) {
if (data) { if (data) {
jQuery.each(data, function(id, value) { jQuery.each(data, function(id, value) {
var option = $("<option></option>"); var option = $("<option></option>");
if (isMeta === true) { if (isMeta === 1) {
option option
.attr( .attr(
"value", "value",
@ -251,3 +251,50 @@ function fmModuleChange(uniqId, isMeta) {
"json" "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();
}
});
}

View File

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

View File

@ -8469,3 +8469,40 @@ div#err_msg_centralised {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
#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%;
}

View File

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

View File

@ -215,7 +215,7 @@ $agent_status_arr[AGENT_STATUS_NOT_INIT] = __('Not init');
$row = []; $row = [];
$row[] = __('Search group'); $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()) { if (is_metaconsole()) {
$row[] = __('Show not init modules'); $row[] = __('Show not init modules');
@ -228,11 +228,16 @@ $table->data[] = $row;
$row = []; $row = [];
$row[] = __('Search agent'); $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[] = __('Show not init agents');
$row[] = html_print_checkbox('show_not_init_agents', $show_not_init_agents, true, true); $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[] = __('Show full hirearchy');
$row[] = html_print_checkbox('serach_hirearchy', $serach_hirearchy, false, true); $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); $row[] = html_print_input_hidden('show_not_init_modules_hidden', $show_not_init_modules, true);
// Button // Button
if (is_metaconsole() === true) {
$table->data[] = $row;
$row = [];
}
$row[] = html_print_submit_button(__('Filter'), 'uptbutton', false, 'class="sub search"', true); $row[] = html_print_submit_button(__('Filter'), 'uptbutton', false, 'class="sub search"', true);
$table->rowspan[][(count($row) - 1)] = 2;
$table->data[] = $row; $table->data[] = $row;

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.759-220131 Version: 7.0NG.759-220201
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

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

View File

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

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'}); $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)) { if (is_numeric($data)) {
my $data_precision = $pa_config->{'graph_precision'}; my $data_precision = $pa_config->{'graph_precision'};
$data = sprintf("%.$data_precision" . "f", $data); $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. # TODO: Reuse queries. For example, tag data can be extracted with a single query.
# Alert macros # Alert macros
my %macros = (_field1_ => $field1, my %macros = (
_field1_ => $field1,
_field2_ => $field2, _field2_ => $field2,
_field3_ => $field3, _field3_ => $field3,
_field4_ => $field4, _field4_ => $field4,
@ -1345,6 +1353,12 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
_all_address_ => undef, _all_address_ => undef,
'_addressn_\d+_' => undef, '_addressn_\d+_' => undef,
_secondarygroups_ => 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")) { if ((defined ($extra_macros)) && (ref($extra_macros) eq "HASH")) {
@ -1357,7 +1371,6 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
load_module_macros ($module->{'module_macros'}, \%macros); load_module_macros ($module->{'module_macros'}, \%macros);
} }
#logger($pa_config, "Clean name ".$clean_name, 10); #logger($pa_config, "Clean name ".$clean_name, 10);
# User defined alert # User defined alert
if ($action->{'internal'} == 0) { if ($action->{'internal'} == 0) {

View File

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

View File

@ -147,6 +147,7 @@ our @EXPORT = qw(
ping ping
resolve_hostname resolve_hostname
ticks_totime ticks_totime
seconds_totime
safe_input safe_input
safe_output safe_output
month_have_days month_have_days
@ -1409,6 +1410,31 @@ sub ticks_totime ($){
return "$days days, $hours hours, $minutes minutes, $seconds seconds"; 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>) >> =head2 C<< pandora_ping (I<$pa_config>, I<$host>) >>

View File

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

View File

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

View File

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

View File

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

View File

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