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

Merge remote-tracking branch 'origin/develop' into 3000-lost-in-stash

This commit is contained in:
fbsanchez 2018-11-06 14:48:14 +01:00
parent 8fe82add30 4102f11f6b
commit bfc669225c
35 changed files with 81 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.728-181030 Version: 7.0NG.728-181105
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

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

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

2
pandora_agents/unix/pandora_agent
View File

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

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

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

2
pandora_agents/unix/pandora_agent.spec
View File

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

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.728" PI_VERSION="7.0NG.728"
PI_BUILD="181030" PI_BUILD="181105"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{181030} {181105}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

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

2
pandora_agents/win32/versioninfo.rc
View File

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

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.728-181030 Version: 7.0NG.728-181105
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

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

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

@ -481,8 +481,7 @@ if ($agents !== false) {
if($agent["id_os"] == 100){ if($agent["id_os"] == 100){
$cluster = db_get_row_sql('select id from tcluster where id_agent = '.$agent['id_agente']); $cluster = db_get_row_sql('select id from tcluster where id_agent = '.$agent['id_agente']);
echo '<a href="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$cluster['id'].'&step=1&update=1">'.$agent['nombre'].'</a>'; echo '<a href="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$cluster['id'].'&step=1&update=1">'.$agent['alias'].'</a>';
}else{ }else{
echo "<a alt =".$agent["nombre"]." href='index.php?sec=gagente& echo "<a alt =".$agent["nombre"]." href='index.php?sec=gagente&
sec2=godmode/agentes/configurar_agente&tab=$main_tab& sec2=godmode/agentes/configurar_agente&tab=$main_tab&

9
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -175,6 +175,7 @@ if ($update) {
} }
} }
$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%';
@ -235,7 +236,7 @@ switch ($config["dbtype"]) {
if ($module_types === false) if ($module_types === false)
$module_types = array (); $module_types = array ();
$types = ''; $types = array();
foreach ($module_types as $type) { foreach ($module_types as $type) {
$types[$type['id_tipo']] = $type['description']; $types[$type['id_tipo']] = $type['description'];
} }
@ -248,22 +249,18 @@ $snmp_versions['3'] = 'v. 3';
$table->width = '100%'; $table->width = '100%';
$table->data = array (); $table->data = array ();
$table->data['selection_mode'][0] = __('Selection mode'); $table->data['selection_mode'][0] = __('Selection mode');
$table->data['selection_mode'][1] = '<span style="width:110px;display:inline-block;">'.__('Select modules first ') . '</span>' . $table->data['selection_mode'][1] = '<span style="width:110px;display:inline-block;">'.__('Select modules first ') . '</span>' .
html_print_radio_button_extended ("selection_mode", 'modules', '', $selection_mode, false, '', 'style="margin-right: 40px;"', true).'<br>'; html_print_radio_button_extended ("selection_mode", 'modules', '', $selection_mode, false, '', 'style="margin-right: 40px;"', true).'<br>';
$table->data['selection_mode'][1] .= '<span style="width:110px;display:inline-block;">'.__('Select agents first ') . '</span>' . $table->data['selection_mode'][1] .= '<span style="width:110px;display:inline-block;">'.__('Select agents first ') . '</span>' .
html_print_radio_button_extended ("selection_mode", 'agents', '', $selection_mode, false, '', 'style="margin-right: 40px;"', true); html_print_radio_button_extended ("selection_mode", 'agents', '', $selection_mode, false, '', 'style="margin-right: 40px;"', true);
$table->rowclass['form_modules_1'] = 'select_modules_row'; $table->rowclass['form_modules_1'] = 'select_modules_row';
$table->data['form_modules_1'][0] = __('Module type'); $table->data['form_modules_1'][0] = __('Module type');
$table->data['form_modules_1'][0] .= '<span id="module_loading" class="invisible">'; $table->data['form_modules_1'][0] .= '<span id="module_loading" class="invisible">';
$table->data['form_modules_1'][0] .= html_print_image('images/spinner.png', true); $table->data['form_modules_1'][0] .= html_print_image('images/spinner.png', true);
$table->data['form_modules_1'][0] .= '</span>'; $table->data['form_modules_1'][0] .= '</span>';
$types[0] = __('All'); $types[0] = __('All');
$table->colspan['form_modules_1'][1] = 2; $table->colspan['form_modules_1'][1] = 2;
$table->data['form_modules_1'][1] = html_print_select ($types, $table->data['form_modules_1'][1] = html_print_select ($types,

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

@ -539,14 +539,6 @@ if ($list_modules) {
break; break;
} }
switch ($config["dbtype"]) {
case "oracle":
if (isset($order['field']) && $order['field'] == 'tagente_modulo.nombre') {
$order['field'] = 'dbms_lob.substr(tagente_modulo.nombre,4000,1)';
}
break;
}
// Fix: for tag functionality groups have to be all user_groups (propagate ACL funct!) // Fix: for tag functionality groups have to be all user_groups (propagate ACL funct!)
$groups = users_get_groups($config["id_user"], $access); $groups = users_get_groups($config["id_user"], $access);
@ -599,8 +591,7 @@ if ($list_modules) {
//Count monitors/modules //Count monitors/modules
$order_sql = $order['field'] . " " . $order['order']; $order_sql = $order['field'] . " " . $order['order'];
$sql = "SELECT COUNT(*) $sql_condition = "FROM tagente_modulo
FROM tagente_modulo
$tags_join $tags_join
INNER JOIN tagente_estado INNER JOIN tagente_estado
ON tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo ON tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
@ -609,13 +600,14 @@ if ($list_modules) {
WHERE tagente_modulo.id_agente = $id_agente WHERE tagente_modulo.id_agente = $id_agente
AND nombre LIKE '$status_text_monitor_sql' AND nombre LIKE '$status_text_monitor_sql'
AND delete_pending = 0 AND delete_pending = 0
AND disabled = 0
AND $status_filter_sql AND $status_filter_sql
$tags_sql $tags_sql
AND tagente_estado.estado != $monitor_filter AND tagente_estado.estado != $monitor_filter
GROUP BY tagente_modulo.id_agente_modulo GROUP BY tagente_modulo.id_agente_modulo
"; ";
$count_modules = db_get_all_rows_sql($sql); $count_modules = db_get_all_rows_sql('SELECT COUNT(*)' . $sql_condition);
if (isset($count_modules[0])) if (isset($count_modules[0]))
$count_modules = reset($count_modules[0]); $count_modules = reset($count_modules[0]);
else else
@ -623,22 +615,7 @@ if ($list_modules) {
//Get monitors/modules //Get monitors/modules
// Get all module from agent // Get all module from agent
$sql = "SELECT tagente_estado.*, tagente_modulo.*, tmodule_group.* $sql_modules_info = 'SELECT tagente_estado.*, tagente_modulo.*, tmodule_group.*' . $sql_condition;
FROM tagente_modulo
$tags_join
INNER JOIN tagente_estado
ON tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
LEFT JOIN tmodule_group
ON tagente_modulo.id_module_group = tmodule_group.id_mg
WHERE tagente_modulo.id_agente = $id_agente
AND nombre LIKE '$status_text_monitor_sql'
AND delete_pending = 0
AND $status_filter_sql
$tags_sql
AND tagente_estado.estado != $monitor_filter
GROUP BY tagente_modulo.id_agente_modulo
ORDER BY tmodule_group.name, $order_sql
";
if ($monitors_change_filter) { if ($monitors_change_filter) {
$limit = " LIMIT " . $config['block_size'] . " OFFSET 0"; $limit = " LIMIT " . $config['block_size'] . " OFFSET 0";
@ -651,10 +628,10 @@ if ($list_modules) {
$paginate_module = $config['paginate_module']; $paginate_module = $config['paginate_module'];
if ($paginate_module) { if ($paginate_module) {
$modules = db_get_all_rows_sql ($sql . $limit); $modules = db_get_all_rows_sql ($sql_modules_info . $limit);
} }
else { else {
$modules = db_get_all_rows_sql ($sql); $modules = db_get_all_rows_sql ($sql_modules_info);
} }
if (empty ($modules)) { if (empty ($modules)) {
$modules = array (); $modules = array ();

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC181030'; $build_version = 'PC181105';
$pandora_version = 'v7.0NG.728'; $pandora_version = 'v7.0NG.728';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

8
pandora_console/include/functions_treeview.php
View File

@ -486,16 +486,22 @@ function treeview_printTable($id_agente, $server_data = array(), $no_head = fals
if ($agent == false) return; if ($agent == false) return;
// Check all groups // Check all groups
$groups = agents_get_all_groups_agent($id_agente, $agent["id_grupo"], is_metaconsole()); $groups = agents_get_all_groups_agent($id_agente, $agent["id_grupo"]);
if (! check_acl_one_of_groups ($config["id_user"], $groups, "AR") && ! check_acl_one_of_groups ($config["id_user"], $groups, "AW") && !$is_extra) { if (! check_acl_one_of_groups ($config["id_user"], $groups, "AR") && ! check_acl_one_of_groups ($config["id_user"], $groups, "AW") && !$is_extra) {
db_pandora_audit("ACL Violation", db_pandora_audit("ACL Violation",
"Trying to access Agent General Information"); "Trying to access Agent General Information");
require_once ("general/noaccess.php"); require_once ("general/noaccess.php");
if (!empty($server_data) && is_metaconsole()) {
metaconsole_restore_db();
}
return; return;
} }
if ($agent === false) { if ($agent === false) {
ui_print_error_message(__('There was a problem loading agent')); ui_print_error_message(__('There was a problem loading agent'));
if (!empty($server_data) && is_metaconsole()) {
metaconsole_restore_db();
}
return; return;
} }

3
pandora_console/include/functions_ui.php
View File

@ -3849,8 +3849,7 @@ function ui_print_module_string_value($value, $id_agente_module,
'id_module' => $id_agente_module, 'id_module' => $id_agente_module,
'last_data' => $value, 'last_data' => $value,
'interval' => $current_interval, 'interval' => $current_interval,
'module_name' => $module_name, 'module_name' => $module_name
'timestamp' => db_get_value('timestamp', 'tagente_estado', 'id_agente_modulo', $id_agente_module)
)); ));
$salida = ui_get_snapshot_image($link, $is_snapshot) . '&nbsp;&nbsp;'; $salida = ui_get_snapshot_image($link, $is_snapshot) . '&nbsp;&nbsp;';
} else { } else {

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

@ -4809,3 +4809,12 @@ tr:last-child > td > a.down_arrow, tr:first-child > td > a.up_arrow {
float: left; float: left;
margin-right: 5px; margin-right: 5px;
} }
/* Message list popup */
div#dialog_messages table th {
text-align: left;
}
div#dialog_messages table th:last-child {
text-align: right;
}

2
pandora_console/install.php
View File

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

4
pandora_console/operation/agentes/estado_agente.php
View File

@ -623,7 +623,7 @@ foreach ($agents as $agent) {
$data[0] = '<div class="left_' . $agent["id_agente"] . '">'; $data[0] = '<div class="left_' . $agent["id_agente"] . '">';
$data[0] .= '<span>'; $data[0] .= '<span>';
$data[0] .= '<a href="index.php?sec=view&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'"> <span style="font-size: 7pt;font-weight:bold" title ="' . $agent["nombre"]. '">'.$agent["alias"].'</span></a>'; $data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'"> <span style="font-size: 7pt;font-weight:bold" title ="' . $agent["nombre"]. '">'.$agent["alias"].'</span></a>';
$data[0] .= '</span>'; $data[0] .= '</span>';
if ($agent['quiet']) { if ($agent['quiet']) {
@ -642,7 +642,7 @@ foreach ($agents as $agent) {
$data[0] .= '<a href="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_view&id='.$cluster['id'].'">'.__('View').'</a>'; $data[0] .= '<a href="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_view&id='.$cluster['id'].'">'.__('View').'</a>';
} }
else{ else{
$data[0] .= '<a href="index.php?sec=view&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'">'.__('View').'</a>'; $data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'">'.__('View').'</a>';
} }
if (check_acl ($config['id_user'], $agent["id_grupo"], "AW")) { if (check_acl ($config['id_user'], $agent["id_grupo"], "AW")) {

24
pandora_console/operation/agentes/group_view.php
View File

@ -343,7 +343,7 @@ if (!empty($result_groups)) {
href='index.php?sec=monitoring&sec2=operation/tree&tag_id=".$data['_id_']. "&status=" . AGENT_STATUS_NORMAL ."'>"; href='index.php?sec=monitoring&sec2=operation/tree&tag_id=".$data['_id_']. "&status=" . AGENT_STATUS_NORMAL ."'>";
} else { } else {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_NORMAL ."'>"; href='index.php?sec=view&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_NORMAL ."'>";
} }
if (($data["_id_"] == 0) && ($agents_ok != 0)) { if (($data["_id_"] == 0) && ($agents_ok != 0)) {
echo $link . $agents_ok . "</a>"; echo $link . $agents_ok . "</a>";
@ -361,7 +361,7 @@ if (!empty($result_groups)) {
href='index.php?sec=monitoring&sec2=operation/tree&tag_id=".$data['_id_']. "&status=" . AGENT_STATUS_WARNING ."'>"; href='index.php?sec=monitoring&sec2=operation/tree&tag_id=".$data['_id_']. "&status=" . AGENT_STATUS_WARNING ."'>";
} else { } else {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_WARNING ."'>"; href='index.php?sec=view&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_WARNING ."'>";
} }
if (($data["_id_"] == 0) && ($agents_warning != 0)) { if (($data["_id_"] == 0) && ($agents_warning != 0)) {
echo $link . $agents_warning . "</a>"; echo $link . $agents_warning . "</a>";
@ -394,10 +394,10 @@ if (!empty($result_groups)) {
echo "<td class='group_view_data group_view_data_unk $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>"; echo "<td class='group_view_data group_view_data_unk $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
if (!isset($data['_is_tag_'])) { if (!isset($data['_is_tag_'])) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_UNKNOWN . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_UNKNOWN . "'>";
} else { } else {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_UNKNOWN . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_UNKNOWN . "'>";
} }
if (($data["_id_"] == 0) && ($monitor_unknown != 0)) { if (($data["_id_"] == 0) && ($monitor_unknown != 0)) {
echo $link . $monitor_unknown . "</a>"; echo $link . $monitor_unknown . "</a>";
@ -411,10 +411,10 @@ if (!empty($result_groups)) {
echo "<td class='group_view_data group_view_data_unk $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>"; echo "<td class='group_view_data group_view_data_unk $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
if (!isset($data['_is_tag_'])) { if (!isset($data['_is_tag_'])) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_NOT_INIT . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_NOT_INIT . "'>";
} else { } else {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_NOT_INIT . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_NOT_INIT . "'>";
} }
if (($data["_id_"] == 0) && ($monitor_not_init != 0)) { if (($data["_id_"] == 0) && ($monitor_not_init != 0)) {
echo $link . $monitor_not_init . "</a>"; echo $link . $monitor_not_init . "</a>";
@ -428,10 +428,10 @@ if (!empty($result_groups)) {
echo "<td class='group_view_data group_view_data_ok $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>"; echo "<td class='group_view_data group_view_data_ok $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
if (!isset($data['_is_tag_'])) { if (!isset($data['_is_tag_'])) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_NORMAL . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_NORMAL . "'>";
} else { } else {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_NORMAL . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_NORMAL . "'>";
} }
if (($data["_id_"] == 0) && ($monitor_ok != 0)) { if (($data["_id_"] == 0) && ($monitor_ok != 0)) {
echo $link . $monitor_ok . "</a>"; echo $link . $monitor_ok . "</a>";
@ -445,10 +445,10 @@ if (!empty($result_groups)) {
echo "<td class='group_view_data group_view_data_warn $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>"; echo "<td class='group_view_data group_view_data_warn $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
if (!isset($data['_is_tag_'])) { if (!isset($data['_is_tag_'])) {
$link = "<a class='group_view_data group_view_data_warn $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data group_view_data_warn $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_WARNING . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_WARNING . "'>";
} else { } else {
$link = "<a class='group_view_data group_view_data_warn $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data group_view_data_warn $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_WARNING . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_WARNING . "'>";
} }
if (($data["_id_"] == 0) && ($monitor_warning != 0)) { if (($data["_id_"] == 0) && ($monitor_warning != 0)) {
echo $link . $monitor_warning . "</a>"; echo $link . $monitor_warning . "</a>";
@ -462,10 +462,10 @@ if (!empty($result_groups)) {
echo "<td class='group_view_data group_view_data_crit $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>"; echo "<td class='group_view_data group_view_data_crit $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'>";
if (!isset($data['_is_tag_'])) { if (!isset($data['_is_tag_'])) {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_CRITICAL_BAD . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&ag_group=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_CRITICAL_BAD . "'>";
} else { } else {
$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' $link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;'
href='index.php?sec=estado&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_CRITICAL_BAD . "'>"; href='index.php?sec=view&sec2=operation/agentes/status_monitor&tag_filter=".$data['_id_']."&status=" . AGENT_MODULE_STATUS_CRITICAL_BAD . "'>";
} }
if (($data["_id_"] == 0) && ($monitor_critical != 0)) { if (($data["_id_"] == 0) && ($monitor_critical != 0)) {
echo $link . $monitor_critical . "</a>"; echo $link . $monitor_critical . "</a>";

2
pandora_console/operation/agentes/pandora_networkmap.php
View File

@ -639,7 +639,7 @@ switch ($tab) {
} }
} }
else { else {
$data['nodes'] = $count - 1; //PandoraFMS node is not an agent $data['nodes'] = ($network_map['id_group'] == 0) ? $count - 1 : $count; //PandoraFMS node is not an agent
} }
} }

2
pandora_console/operation/agentes/snapshot_view.php
View File

@ -56,7 +56,7 @@ $utimestamp = get_parameter("timestamp", '');
if($utimestamp == '') { if($utimestamp == '') {
// Retrieve last data // Retrieve last data
$row_state = db_get_row('tagente_estado', 'id_agente_modulo', $id); $row_state = db_get_row('tagente_estado', 'id_agente_modulo', $id);
$last_timestamp = $row_state['timestamp']; $last_timestamp = date("Y-m-d H:i:s", $row_state['utimestamp']);
} else { } else {
// Retrieve target data // Retrieve target data
$state = db_get_row('tagente_estado', 'id_agente_modulo', $id, array('id_agente')); $state = db_get_row('tagente_estado', 'id_agente_modulo', $id, array('id_agente'));

2
pandora_console/operation/messages/message_list.php
View File

@ -111,7 +111,7 @@ else {
$table->align[1] = "left"; $table->align[1] = "left";
$table->align[2] = "left"; $table->align[2] = "left";
$table->align[3] = "left"; $table->align[3] = "left";
$table->align[4] = "left"; $table->align[4] = "right";
$table->size[0] = "20px"; $table->size[0] = "20px";
$table->size[1] = "100px"; $table->size[1] = "100px";

2
pandora_console/pandora_console.redhat.spec
View File

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

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.728 %define version 7.0NG.728
%define release 181030 %define release 181105
%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

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.728-181030 Version: 7.0NG.728-181105
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

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

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

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

14
pandora_server/lib/PandoraFMS/PluginTools.pm
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.728"; my $pandora_version = "7.0NG.728";
my $pandora_build = "181030"; my $pandora_build = "181105";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );
@ -936,7 +936,10 @@ sub call_url {
if ($response->is_success){ if ($response->is_success){
return $response->decoded_content; return $response->decoded_content;
} elsif (!empty($response->{'_msg'})) {
print_stderror($conf, 'Failed: ' . $response->{'_msg'});
} }
return undef; return undef;
} }
@ -958,7 +961,10 @@ sub post_url {
if ($response->is_success){ if ($response->is_success){
return $response->decoded_content; return $response->decoded_content;
} elsif (!empty($response->{'_msg'})) {
print_stderror($conf, 'Failed: ' . $response->{'_msg'});
} }
return undef; return undef;
} }
@ -987,6 +993,12 @@ sub init {
# Disable verify host certificate (only needed for self-signed cert) # Disable verify host certificate (only needed for self-signed cert)
$conf->{'__system'}->{ua}->ssl_opts( 'verify_hostname' => 0 ); $conf->{'__system'}->{ua}->ssl_opts( 'verify_hostname' => 0 );
$conf->{'__system'}->{ua}->ssl_opts( 'SSL_verify_mode' => 0x00 ); $conf->{'__system'}->{ua}->ssl_opts( 'SSL_verify_mode' => 0x00 );
# Disable library extra checks
BEGIN {
$ENV{PERL_NET_HTTPS_SSL_SOCKET_CLASS} = "Net::SSL";
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
}
} }
} }
}; };

2
pandora_server/pandora_server.redhat.spec
View File

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

2
pandora_server/pandora_server.spec
View File

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

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
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.728 PS181030"; my $version = "7.0NG.728 PS181105";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

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