Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos

Conflicts:
	pandora_console/operation/events/events.php
This commit is contained in:
Tatiana Llorente 2019-10-08 09:14:08 +02:00
commit d2dc6ba9c1
35 changed files with 201 additions and 118 deletions

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.739-191007 Version: 7.0NG.739-191008
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.739-191007" pandora_version="7.0NG.739-191008"
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

@ -42,7 +42,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.739'; use constant AGENT_VERSION => '7.0NG.739';
use constant AGENT_BUILD => '191007'; use constant AGENT_BUILD => '191008';
# 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.739 %define version 7.0NG.739
%define release 191007 %define release 191008
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.739 %define version 7.0NG.739
%define release 191007 %define release 191008
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.739" PI_VERSION="7.0NG.739"
PI_BUILD="191007" PI_BUILD="191008"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{191007} {191008}
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.739(Build 191007)") #define PANDORA_VERSION ("7.0NG.739(Build 191008)")
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.739(Build 191007))" VALUE "ProductVersion", "(7.0NG.739(Build 191008))"
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.739-191007 Version: 7.0NG.739-191008
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.739-191007" pandora_version="7.0NG.739-191008"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

View File

@ -1191,49 +1191,54 @@ $table_relations->data[-1][3] .= html_print_image('images/lock.png', true).'</a>
$table_relations->data[-1][4] = '<a id="delete_relation_button" href="">'; $table_relations->data[-1][4] = '<a id="delete_relation_button" href="">';
$table_relations->data[-1][4] .= html_print_image('images/cross.png', true).'</a>'; $table_relations->data[-1][4] .= html_print_image('images/cross.png', true).'</a>';
$module_relations = modules_get_relations(['id_module' => $id_agent_module]);
if (!$module_relations) {
$module_relations = [];
}
$relations_count = 0; $relations_count = 0;
foreach ($module_relations as $key => $module_relation) { if ($id_agent_module) {
if ($module_relation['module_a'] == $id_agent_module) { $module_relations = modules_get_relations(['id_module' => $id_agent_module]);
$module_id = $module_relation['module_b'];
$agent_id = modules_give_agent_id_from_module_id( if (!$module_relations) {
$module_relation['module_b'] $module_relations = [];
);
} else {
$module_id = $module_relation['module_a'];
$agent_id = modules_give_agent_id_from_module_id(
$module_relation['module_a']
);
} }
$agent_name = ui_print_agent_name($agent_id, true); $relations_count = 0;
foreach ($module_relations as $key => $module_relation) {
if ($module_relation['module_a'] == $id_agent_module) {
$module_id = $module_relation['module_b'];
$agent_id = modules_give_agent_id_from_module_id(
$module_relation['module_b']
);
} else {
$module_id = $module_relation['module_a'];
$agent_id = modules_give_agent_id_from_module_id(
$module_relation['module_a']
);
}
$module_name = modules_get_agentmodule_name($module_id); $agent_name = ui_print_agent_name($agent_id, true);
if (empty($module_name) || $module_name == 'false') {
$module_name = $module_id; $module_name = modules_get_agentmodule_name($module_id);
if (empty($module_name) || $module_name == 'false') {
$module_name = $module_id;
}
if ($module_relation['disable_update']) {
$disabled_update_class = '';
} else {
$disabled_update_class = 'alpha50';
}
// Agent name.
$table_relations->data[$relations_count][0] = $agent_name;
// Module name.
$table_relations->data[$relations_count][1] = "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=".$agent_id.'&tab=module&edit_module=1&id_agent_module='.$module_id."'>".ui_print_truncate_text($module_name, 'module_medium', true, true, true, '[&hellip;]').'</a>';
// Type.
$table_relations->data[$relations_count][2] = ($module_relation['type'] === 'direct') ? __('Direct') : __('Failover');
// Lock relationship updates.
$table_relations->data[$relations_count][3] = '<a id="disable_updates_button" class="'.$disabled_update_class.'"href="javascript: change_lock_relation('.$relations_count.', '.$module_relation['id'].');">'.html_print_image('images/lock.png', true).'</a>';
// Delete relationship.
$table_relations->data[$relations_count][4] = '<a id="delete_relation_button" href="javascript: delete_relation('.$relations_count.', '.$module_relation['id'].');">'.html_print_image('images/cross.png', true).'</a>';
$relations_count++;
} }
if ($module_relation['disable_update']) {
$disabled_update_class = '';
} else {
$disabled_update_class = 'alpha50';
}
// Agent name.
$table_relations->data[$relations_count][0] = $agent_name;
// Module name.
$table_relations->data[$relations_count][1] = "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=".$agent_id.'&tab=module&edit_module=1&id_agent_module='.$module_id."'>".ui_print_truncate_text($module_name, 'module_medium', true, true, true, '[&hellip;]').'</a>';
// Type.
$table_relations->data[$relations_count][2] = ($module_relation['type'] === 'direct') ? __('Direct') : __('Failover');
// Lock relationship updates.
$table_relations->data[$relations_count][3] = '<a id="disable_updates_button" class="'.$disabled_update_class.'"href="javascript: change_lock_relation('.$relations_count.', '.$module_relation['id'].');">'.html_print_image('images/lock.png', true).'</a>';
// Delete relationship.
$table_relations->data[$relations_count][4] = '<a id="delete_relation_button" href="javascript: delete_relation('.$relations_count.', '.$module_relation['id'].');">'.html_print_image('images/cross.png', true).'</a>';
$relations_count++;
} }
html_print_input_hidden('module_relations_count', $relations_count); html_print_input_hidden('module_relations_count', $relations_count);

View File

@ -209,6 +209,12 @@ class ConsoleSupervisor
$this->getUMMessages(); $this->getUMMessages();
/*
* Check if the Server and Console has
* the same versions.
*/
$this->checkConsoleServerVersions();
} }
@ -435,6 +441,12 @@ class ConsoleSupervisor
$this->getUMMessages(); $this->getUMMessages();
/*
* Check if the Server and Console has
* the same versions.
*/
$this->checkConsoleServerVersions();
} }
@ -2334,4 +2346,35 @@ class ConsoleSupervisor
} }
/**
* Check if all servers and console versions are the same
*
* @return void
*/
public function checkConsoleServerVersions()
{
global $config;
// List all servers except satellite server
$server_version_list = db_get_all_rows_sql(
'SELECT name, version FROM tserver WHERE server_type != '.SERVER_TYPE_ENTERPRISE_SATELLITE
);
foreach ($server_version_list as $server) {
if (strpos($server['version'], $config['current_package_enterprise']) === false) {
$title_ver_misaligned = $server['name'].' version misaligned with Console';
$message_ver_misaligned = 'Server '.$server['name'].' and this console have different versions. This might cause several malfunctions. Please, update this server.';
$this->notify(
[
'type' => 'NOTIF.SERVER.MISALIGNED',
'title' => __($title_ver_misaligned),
'message' => __($message_ver_misaligned),
'url' => ui_get_full_url('index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online'),
]
);
}
}
}
} }

View File

@ -104,7 +104,7 @@ class TreeService extends Tree
break; break;
case SERVICE_STATUS_WARNING: case SERVICE_STATUS_WARNING:
$processed_items[$row['id']][$key]['statusImageHTML'] = '<img src="images/status_sets/default/agent_warning_ball.png" data-title="WARNING status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />'; $processed_items[$row['id']]['statusImageHTML'] = '<img src="images/status_sets/default/agent_warning_ball.png" data-title="WARNING status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />';
break; break;
case SERVICE_STATUS_UNKNOWN: case SERVICE_STATUS_UNKNOWN:

View File

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

View File

@ -4382,7 +4382,7 @@ function events_page_general($event)
$data = []; $data = [];
$data[0] = __('Event name'); $data[0] = __('Event name');
$data[1] = events_display_name($event['evento']); $data[1] = '<span style="word-break: break-word;">'.events_display_name($event['evento']).'</span>';
$table_general->data[] = $data; $table_general->data[] = $data;
$data = []; $data = [];

View File

@ -295,20 +295,40 @@ function grafico_modulo_sparse_data(
return false; return false;
} }
$array_data['sum'.$series_suffix]['agent_module_id'] = $agent_module_id; $array_data = series_suffix_leyend(
$array_data['sum'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type']; 'sum',
$array_data['sum'.$series_suffix]['agent_name'] = $data_module_graph['agent_name']; $series_suffix,
$array_data['sum'.$series_suffix]['module_name'] = $data_module_graph['module_name']; $agent_module_id,
$array_data['sum'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias']; $data_module_graph,
$array_data['sum'.$series_suffix]['unit'] = $data_module_graph['unit']; $array_data
);
if ($params['percentil']) { if ($params['percentil']) {
$array_data['percentil'.$series_suffix]['agent_module_id'] = $agent_module_id; $array_data = series_suffix_leyend(
$array_data['percentil'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type']; 'percentil',
$array_data['percentil'.$series_suffix]['agent_name'] = $data_module_graph['agent_name']; $series_suffix,
$array_data['percentil'.$series_suffix]['module_name'] = $data_module_graph['module_name']; $agent_module_id,
$array_data['percentil'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias']; $data_module_graph,
$array_data['percentil'.$series_suffix]['unit'] = $data_module_graph['unit']; $array_data
);
}
if ($params['type_mode_graph']) {
$array_data = series_suffix_leyend(
'min',
$series_suffix,
$agent_module_id,
$data_module_graph,
$array_data
);
$array_data = series_suffix_leyend(
'max',
$series_suffix,
$agent_module_id,
$data_module_graph,
$array_data
);
} }
// This is for a specific type of report that consists in passing // This is for a specific type of report that consists in passing
@ -3169,6 +3189,21 @@ function graphic_incident_source($width=320, $height=200)
} }
function series_suffix_leyend($series_name, $series_suffix, $id_agent, $data_module_graph, $array_data)
{
global $config;
$array_data[$series_name.$series_suffix]['agent_module_id'] = $id_agent;
$array_data[$series_name.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
$array_data[$series_name.$series_suffix]['agent_name'] = $data_module_graph['agent_name'];
$array_data[$series_name.$series_suffix]['module_name'] = $data_module_graph['module_name'];
$array_data[$series_name.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias'];
$array_data[$series_name.$series_suffix]['unit'] = $data_module_graph['unit'];
return $array_data;
}
function graph_events_validated($width=300, $height=200, $extra_filters=[], $meta=false, $history=false) function graph_events_validated($width=300, $height=200, $extra_filters=[], $meta=false, $history=false)
{ {
global $config; global $config;

View File

@ -2654,21 +2654,18 @@ function modules_get_relations($params=[])
} }
$modules_type = ''; $modules_type = '';
$modules_type_filter = '';
if (isset($params['modules_type'])) { if (isset($params['modules_type'])) {
$modules_type = $params['modules_type']; $module_type = 'INNER JOIN ttipo_modulo ttm ON tam.id_tipo_modulo = ttm.id_tipo';
$modules_type_filter = sprintf(
"AND ttm.nombre = '%s'",
$params['modules_type']
);
} }
$sql = 'SELECT DISTINCT tmr.id, tmr.module_a, tmr.module_b, $distinct = '';
tmr.disable_update, tmr.type if (empty($params)) {
FROM tmodule_relationship tmr, $distinct = 'DISTINCT';
tagente_modulo tam,
tagente ta,
ttipo_modulo ttm
WHERE ';
$agent_filter = '';
if ($id_agent > 0) {
$agent_filter = sprintf('AND ta.id_agente = %d', $id_agent);
} }
$module_a_filter = ''; $module_a_filter = '';
@ -2678,6 +2675,11 @@ function modules_get_relations($params=[])
$module_b_filter = sprintf('AND tmr.module_b = %d', $id_module); $module_b_filter = sprintf('AND tmr.module_b = %d', $id_module);
} }
$agent_filter = '';
if ($id_agent > 0) {
$agent_filter = sprintf('AND ta.id_agente = %d', $id_agent);
}
$disabled_update_filter = ''; $disabled_update_filter = '';
if ($disabled_update >= 0) { if ($disabled_update >= 0) {
$disabled_update_filter = sprintf( $disabled_update_filter = sprintf(
@ -2686,22 +2688,25 @@ function modules_get_relations($params=[])
); );
} }
$modules_type_filter = ''; $sql = sprintf(
if ($modules_type != '') { 'SELECT %s tmr.id, tmr.module_a, tmr.module_b,
$modules_type_filter = sprintf( tmr.disable_update, tmr.type
"AND (tam.id_tipo_modulo = ttm.id_tipo AND ttm.nombre = '%s')", FROM tmodule_relationship tmr
$modules_type INNER JOIN tagente_modulo tam
); ON (tmr.module_a = tam.id_agente_modulo %s)
} OR (tmr.module_b = tam.id_agente_modulo %s)
INNER JOIN tagente ta
$sql .= "( (tmr.module_a = tam.id_agente_modulo ON tam.id_agente = ta.id_agente
$module_a_filter) %s
OR (tmr.module_b = tam.id_agente_modulo WHERE 1=1 %s %s %s',
$module_b_filter) ) $distinct,
AND tam.id_agente = ta.id_agente $module_a_filter,
$agent_filter $module_b_filter,
$disabled_update_filter $module_type,
$modules_type_filter"; $agent_filter,
$disabled_update_filter,
$modules_type_filter
);
return db_get_all_rows_sql($sql); return db_get_all_rows_sql($sql);
} }

View File

@ -162,6 +162,10 @@ function ui_print_truncate_text($text, $numChars=GENERIC_SIZE_TEXT, $showTextInA
} }
if ($showTextInAToopTip) { if ($showTextInAToopTip) {
if (is_string($showTextInAToopTip)) {
$text = ui_print_truncate_text($showTextInAToopTip, ($numChars * 2), false, true, false);
}
$truncateText = $truncateText.ui_print_help_tip(htmlspecialchars($text), true); $truncateText = $truncateText.ui_print_help_tip(htmlspecialchars($text), true);
} else { } else {
if ($style !== false) { if ($style !== false) {

View File

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

View File

@ -280,7 +280,6 @@ if (is_ajax()) {
$events, $events,
function ($carry, $item) { function ($carry, $item) {
$tmp = (object) $item; $tmp = (object) $item;
$tmp->hint = '';
$tmp->meta = is_metaconsole(); $tmp->meta = is_metaconsole();
if (is_metaconsole()) { if (is_metaconsole()) {
if ($tmp->server_name !== null) { if ($tmp->server_name !== null) {
@ -289,14 +288,9 @@ if (is_ajax()) {
} }
} }
$tmp->evento = str_replace('"', '', io_safe_output($tmp->evento));
if (strlen($tmp->evento) >= 255) { if (strlen($tmp->evento) >= 255) {
$tmp->hint = io_safe_output(chunk_split(substr($tmp->evento, 0, 600), 80, '<br>').'(...)'); $tmp->evento = ui_print_truncate_text($tmp->evento, 255, $tmp->evento, true, false);
$tmp->evento = io_safe_output(substr($tmp->evento, 0, 253).'(...)');
if (strpos($tmp->evento, ' ') === false) {
$tmp->evento = substr($tmp->evento, 0, 80).'(...)';
}
} else {
$tmp->evento = io_safe_output($tmp->evento);
} }
if ($tmp->module_name) { if ($tmp->module_name) {
@ -1678,10 +1672,6 @@ function process_datatables_item(item) {
evn += '('+item.event_rep+') '; evn += '('+item.event_rep+') ';
} }
evn += item.evento+'</a>'; evn += item.evento+'</a>';
if(item.hint !== ''){
let ruta = item.meta == true ? '../../images/tip_help.png' : 'images/tip_help.png';
evn += '&nbsp;<img src="'+ruta+'" data-title="'+item.hint+'" data-use_title_for_force_title="1" class="forced_title" alt="'+item.hint+'">';
}
item.mini_severity = '<div class="event flex-row h100p nowrap">'; item.mini_severity = '<div class="event flex-row h100p nowrap">';
item.mini_severity += output; item.mini_severity += output;

View File

@ -956,7 +956,8 @@ if ($traps !== false) {
} }
} else { } else {
$agent_trap_group = db_get_value('id_grupo', 'tagente', 'nombre', $trap['source']); $agent_trap_group = db_get_value('id_grupo', 'tagente', 'nombre', $trap['source']);
if ((check_acl($config['id_user'], $agent_trap_group, 'AW'))) {
if ((check_acl($config['id_user'], $agent_trap_group, 'IM'))) {
$data[8] .= '<a href="'.$urlPagination.'&delete='.$trap['id_trap'].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image('images/cross.png', true, ['border' => '0', 'title' => __('Delete')]).'</a> '; $data[8] .= '<a href="'.$urlPagination.'&delete='.$trap['id_trap'].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image('images/cross.png', true, ['border' => '0', 'title' => __('Delete')]).'</a> ';
} }
} }

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.739 %define version 7.0NG.739
%define release 191007 %define release 191008
# 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.739 %define version 7.0NG.739
%define release 191007 %define release 191008
# 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.739 %define version 7.0NG.739
%define release 191007 %define release 191008
%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.739-191007 Version: 7.0NG.739-191008
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.739-191007" pandora_version="7.0NG.739-191008"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

View File

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

View File

@ -4094,7 +4094,7 @@ sub on_demand_macro($$$$$$;$) {
my $unit_mod = get_db_value ($dbh, 'SELECT unit FROM tagente_modulo WHERE id_agente_modulo = ?', $id_mod); my $unit_mod = get_db_value ($dbh, 'SELECT unit FROM tagente_modulo WHERE id_agente_modulo = ?', $id_mod);
my $field_value = ""; my $field_value = "";
if ($type_mod eq 3){ if ($type_mod eq 3 || $type_mod eq 23|| $type_mod eq 17 || $type_mod eq 10 || $type_mod eq 33 ){
$field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos_string where id_agente_modulo = ? order by utimestamp desc limit 1', $id_mod); $field_value = get_db_value($dbh, 'SELECT datos FROM tagente_datos_string where id_agente_modulo = ? order by utimestamp desc limit 1', $id_mod);
} }
else{ else{

View File

@ -32,7 +32,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.739"; my $pandora_version = "7.0NG.739";
my $pandora_build = "191007"; my $pandora_build = "191008";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.739 %define version 7.0NG.739
%define release 191007 %define release 191008
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.739 %define version 7.0NG.739
%define release 191007 %define release 191008
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

View File

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

View File

@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.739 PS191007"; my $version = "7.0NG.739 PS191008";
# 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.739 PS191007"; my $version = "7.0NG.739 PS191008";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);