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

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

This commit is contained in:
Tatiana Llorente 2019-10-08 08:59:39 +02:00
parent 9875b7c701 cb6b48aa3f
commit 8a85edac93
45 changed files with 7310 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.739-190930
Version: 7.0NG.739-191007
Architecture: all
Priority: optional
Section: admin

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

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

2
pandora_agents/unix/pandora_agent
View File

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

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

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

2
pandora_agents/unix/pandora_agent.spec
View File

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

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.739"
PI_BUILD="190930"
PI_BUILD="191007"
OS_NAME=`uname -s`
FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{190930}
{191007}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

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

2
pandora_agents/win32/versioninfo.rc
View File

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

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.739-190930
Version: 7.0NG.739-191007
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

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

17
pandora_console/extensions/resource_exportation.php
View File

@ -239,17 +239,18 @@ function output_xml_report($id)
echo '<column_separator><![CDATA['.io_safe_output($item['header_definition']).']]></column_separator>';
break;
case 'TTRT':
break;
/*
case 'TTRT':
break;
case 'TTO':
break;
case 'TTO':
break;
case 'MTBF':
break;
case 'MTBF':
break;
case 'MTTR':
break;
case 'MTTR':
break;*/
}
echo "</item>\n";

17
pandora_console/extensions/resource_registration.php
View File

@ -376,17 +376,18 @@ function process_upload_xml_report($xml, $group_filter=0)
$values['column_separator'] = io_safe_input($item['column_separator']);
break;
case 'TTRT':
break;
/*
case 'TTRT':
break;
case 'TTO':
break;
case 'TTO':
break;
case 'MTBF':
break;
case 'MTBF':
break;
case 'MTTR':
break;
case 'MTTR':
break;*/
}
if (empty($agents_item)) {

19
pandora_console/godmode/reporting/graphs.php
View File

@ -257,11 +257,6 @@ $table_aux = new stdClass();
$table->cellspacing = 0;
$table->align = [];
$table->head = [];
if ($report_w || $report_m) {
$table->align[5] = 'left';
$table->head[5] = html_print_checkbox('all_delete', 0, false, true, false);
$table->size[5] = '20px';
}
$table->head[0] = __('Graph name');
$table->head[1] = __('Description');
@ -280,6 +275,12 @@ $table_aux = new stdClass();
$table->size[4] = '90px';
}
if ($report_w || $report_m) {
$table->align[5] = 'left';
$table->head[5] = html_print_checkbox('all_delete', 0, false, true, false);
$table->size[5] = '20px';
}
$table->data = [];
$result_graphs = array_slice($graphs, $offset, $config['block_size']);
@ -287,10 +288,6 @@ $table_aux = new stdClass();
foreach ($result_graphs as $graph) {
$data = [];
if ($report_m) {
$data[5] .= html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true);
}
$data[0] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.$graph['id_graph'].'">'.ui_print_truncate_text($graph['name'], 70).'</a>';
$data[1] = ui_print_truncate_text($graph['description'], 70);
@ -309,6 +306,10 @@ $table_aux = new stdClass();
return false;">'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete')]).'</a>';
}
if ($report_m) {
$data[5] .= html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true);
}
array_push($table->data, $data);
}

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

@ -233,6 +233,8 @@ switch ($action) {
$style = json_decode(io_safe_output($item['style']), true);
$name_from_template = $style['name_label'];
$show_in_same_row = $style['show_in_same_row'];
$show_in_landscape = $style['show_in_landscape'];
$hide_notinit_agents = $style['hide_notinit_agents'];
@ -480,7 +482,8 @@ switch ($action) {
$period = $item['period'];
break;
case 'TTRT':
/*
case 'TTRT':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter(
@ -489,9 +492,9 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule]
);
$period = $item['period'];
break;
break;
case 'TTO':
case 'TTO':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter(
@ -500,9 +503,9 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule]
);
$period = $item['period'];
break;
break;
case 'MTBF':
case 'MTBF':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter(
@ -511,9 +514,9 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule]
);
$period = $item['period'];
break;
break;
case 'MTTR':
case 'MTTR':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter(
@ -522,8 +525,8 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule]
);
$period = $item['period'];
break;
break;
*/
case 'alert_report_module':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
@ -788,10 +791,11 @@ switch ($action) {
case 'avg_value':
case 'projection_graph':
case 'prediction_date':
case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
/*
case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':*/
case 'simple_baseline_graph':
case 'event_report_log':
case 'increment':
@ -869,18 +873,33 @@ $class = 'databox filters';
</td>
<td style="">
<?php
html_print_input_text(
'name',
$name,
'',
80,
100,
false,
false,
false,
'',
'fullwidth'
);
if ($name_from_template != '') {
html_print_input_text(
'name',
$name_from_template,
'',
80,
100,
false,
false,
false,
'',
'fullwidth'
);
} else {
html_print_input_text(
'name',
$name,
'',
80,
100,
false,
false,
false,
'',
'fullwidth'
);
}
?>
</td>
</tr>
@ -3738,10 +3757,10 @@ $(document).ready (function () {
case 'event_report_module':
case 'simple_graph':
case 'simple_baseline_graph':
case 'TTRT':
/* case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
case 'MTTR':*/
case 'prediction_date':
case 'projection_graph':
case 'avg_value':
@ -3779,10 +3798,10 @@ $(document).ready (function () {
case 'event_report_module':
case 'simple_graph':
case 'simple_baseline_graph':
case 'TTRT':
/* case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
case 'MTTR':*/
case 'prediction_date':
case 'projection_graph':
case 'avg_value':
@ -4814,7 +4833,7 @@ function chooseType() {
$("#row_period").show();
$("#row_historical_db_check").hide();
break;
/*
case 'TTRT':
$("#row_description").show();
$("#row_agent").show();
@ -4845,7 +4864,7 @@ function chooseType() {
$("#row_module").show();
$("#row_period").show();
$("#row_historical_db_check").hide();
break;
break;*/
case 'alert_report_module':
$("#row_description").show();
@ -5199,10 +5218,10 @@ function chooseType() {
case 'min_value':
case 'max_value':
case 'avg_value':
case 'TTRT':
/* case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
case 'MTTR':*/
case 'simple_baseline_graph':
$("#row_label").show();
break;

15
pandora_console/godmode/reporting/reporting_builder.list_items.php
View File

@ -489,11 +489,18 @@ foreach ($items as $item) {
$row[4] = '-';
}
if ($item['name'] == '' && $item['description'] == '') {
$row[5] = '-';
} else {
$text = empty($item['name']) ? $item['description'] : $item['name'];
$style = json_decode(io_safe_output($item['style']), true);
if ($style['name_label'] != '') {
$text = empty($style['name_label']) ? $item['description'] : $style['name_label'];
$row[5] = ui_print_truncate_text($text, 'description', true, true);
} else {
if ($item['name'] == '' && $item['description'] == '') {
$row[5] = '-';
} else {
$text = empty($item['name']) ? $item['description'] : $item['name'];
$row[5] = ui_print_truncate_text($text, 'description', true, true);
}
}
$row[6] = '';

18
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -2006,10 +2006,11 @@ switch ($action) {
case 'avg_value':
case 'projection_graph':
case 'prediction_date':
case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
/*
case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':*/
case 'simple_baseline_graph':
case 'nt_top_n':
if ($label != '') {
@ -2612,10 +2613,11 @@ switch ($action) {
case 'avg_value':
case 'projection_graph':
case 'prediction_date':
case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
/*
case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':*/
case 'simple_baseline_graph':
case 'nt_top_n':
if ($label != '') {

2
pandora_console/godmode/users/configure_user.php
View File

@ -828,7 +828,7 @@ $values = [
0 => __('No'),
];
$table->data[12][0] = __('Home screen').ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true);
$table->data[12][0] = __('Home screen').ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=1 to show agent detail view'), true);
$values = [
'Default' => __('Default'),
'Visual console' => __('Visual console'),

2
pandora_console/include/class/Tree.class.php
View File

@ -1075,6 +1075,8 @@ class Tree
ON ta.id_agente = tasg.id_agent
LEFT JOIN talert_template_modules tatm
ON tatm.id_agent_module = tam.id_agente_modulo
AND tatm.id_alert_template = 1
OR tatm.id_alert_template = NULL
$inner
WHERE tam.disabled = 0 AND ta.disabled = 0
$condition

2
pandora_console/include/config_process.php
View File

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

20
pandora_console/include/functions_custom_graphs.php
View File

@ -124,8 +124,26 @@ function custom_graphs_get_user($id_user=0, $only_names=false, $returnAllGroup=t
}
$groups = users_get_groups($id_user, $privileges, $returnAllGroup);
$all_graphs = [];
if (is_metaconsole()) {
$servers = metaconsole_get_connection_names();
foreach ($servers as $key => $server) {
$connection = metaconsole_get_connection($server);
if (metaconsole_connect($connection) != NOERR) {
continue;
}
$all_graph = db_get_all_rows_in_table('tgraph', 'name');
if ($all_graph !== false) {
$all_graphs = array_merge($all_graphs, $all_graph);
}
metaconsole_restore_db();
}
} else {
$all_graphs = db_get_all_rows_in_table('tgraph', 'name');
}
$all_graphs = db_get_all_rows_in_table('tgraph', 'name');
if ($all_graphs === false) {
return [];
}

53
pandora_console/include/functions_events.php
View File

@ -6879,3 +6879,56 @@ function events_get_field_value_by_event_id(
return $value;
}
function events_get_instructions($event)
{
if (!is_array($event)) {
return '';
}
switch ($event['event_type']) {
case 'going_unknown':
if ($event['unknown_instructions'] != '') {
$value = str_replace("\n", '<br>', io_safe_output($event['unknown_instructions']));
}
break;
case 'going_up_warning':
case 'going_down_warning':
if ($event['warning_instructions'] != '') {
$value = str_replace("\n", '<br>', io_safe_output($event['warning_instructions']));
}
break;
case 'going_up_critical':
case 'going_down_critical':
if ($event['critical_instructions'] != '') {
$value = str_replace("\n", '<br>', io_safe_output($event['critical_instructions']));
}
break;
}
if (!isset($value)) {
return '';
}
$max_text_length = 300;
$over_text = io_safe_output($value);
if (strlen($over_text) > ($max_text_length + 3)) {
$over_text = substr($over_text, 0, $max_text_length).'...';
}
$output = '<div id="hidden_event_instructions_'.$event['id_evento'].'"';
$output .= ' style="display: none; width: 100%; height: 100%; overflow: auto; padding: 10px; font-size: 14px; line-height: 16px; font-family: mono,monospace; text-align: left">';
$output .= $value;
$output .= '</div>';
$output .= '<center>';
$output .= '<span id="value_event_'.$event['id_evento'].'" style="white-space: nowrap;">';
$output .= '<span id="value_event_text_'.$event['id_evento'].'"></span>';
$output .= '<a href="javascript:show_instructions('.$event['id_evento'].')">';
$output .= html_print_image('images/default_list.png', true, ['title' => $over_text]).'</a></span>';
$output .= '</center>';
return $output;
}

6934
pandora_console/include/functions_events.php.orig Normal file
View File

File diff suppressed because it is too large Load Diff

159
pandora_console/include/functions_graph.php
View File

@ -1522,7 +1522,8 @@ function graphic_combined_module(
$array_data,
$params_combined['average'],
$params_combined['summatory'],
$params_combined['modules_series']
$params_combined['modules_series'],
$date_array
);
}
}
@ -2223,7 +2224,7 @@ function graphic_combined_module(
* @param boolean $average Average.
* @param boolean $summatory Summatory.
* @param boolean $modules_series Series module.
* @param boolean $baseline Baseline data.
* @param array $date_array Date data.
*
* @return array Data.
*/
@ -2232,106 +2233,82 @@ function combined_graph_summatory_average(
$average=false,
$summatory=false,
$modules_series=false,
$baseline=false
$date_array=[]
) {
if (isset($array_data) && is_array($array_data)) {
$reduce_array = [];
foreach ($array_data as $key => $value) {
if (strpos($key, 'sum') !== false) {
$data_array_reverse[$key] = array_reverse($value['data']);
if (!$modules_series) {
unset($array_data[$key]);
}
$last = $date_array['start_date'];
$reduce_array = array_reduce(
$value['data'],
function ($carry, $item) use ($date_array, $last, $reduce_array) {
$slice_start = $date_array['start_date'];
$iterator = $last;
// JS to PHP timestamp format.
$item[0] /= 1000;
while ($iterator <= $date_array['final_date']) {
if ($item[0] >= $slice_start && $item[0] < $iterator) {
$array = [];
$val = 0;
$n = 0;
if (is_array($reduce_array[$slice_start])) {
$val = $reduce_array[$slice_start]['value'];
$n = ($reduce_array[$slice_start]['n'] + 1);
}
$array['value'] = ($item[1] + $val);
$array['n'] = $n;
$array['t'] = ($slice_start * 1000);
$carry[$slice_start] = $array;
$last = $iterator;
break;
} else {
$slice_start = $iterator;
$iterator += 300;
}
}
$i++;
return $carry;
},
$reduce_array
);
}
if (!$modules_series) {
unset($array_data[$key]);
}
}
if (isset($data_array_reverse) && is_array($data_array_reverse)) {
$array_sum_reverse = [];
$array_avg_reverse = [];
$data_array_prev = false;
$data_array_pop = [];
$count = 0;
$reduce_array_summatory = [];
$reduce_array_average = [];
$i = 0;
foreach ($reduce_array as $item) {
$reduce_array_summatory[$i][0] = $item['t'];
$reduce_array_summatory[$i][1] = $item['value'];
$count_data_array_reverse = count($data_array_reverse['sum0']);
while ($count_data_array_reverse > 0) {
foreach ($data_array_reverse as $key_reverse => $value_reverse) {
if (is_array($value_reverse) && count($value_reverse) > 0) {
$data_array_pop[$key_reverse] = array_pop(
$data_array_reverse[$key_reverse]
);
}
}
$reduce_array_average[$i][0] = $item['t'];
$reduce_array_average[$i][1] = ($item['value'] / ($item['n'] + 1));
if (isset($data_array_pop) && is_array($data_array_pop)) {
$acum_data = 0;
$acum_array = [];
$sum_data = 0;
$count_pop = 0;
foreach ($data_array_pop as $key_pop => $value_pop) {
if ($value_pop[0] > $acum_data) {
if ($acum_data != 0) {
$sum_data = ($sum_data + $data_array_prev[$key_pop][1]);
$data_array_reverse[$key_pop][] = $value_pop;
$data_array_prev[$acum_key] = $acum_array;
} else {
if ($data_array_prev[$key_pop] == false) {
$data_array_prev[$key_pop] = $value_pop;
}
$i++;
}
$acum_key = $key_pop;
$acum_data = $value_pop[0];
$acum_array = $value_pop;
$sum_data = $value_pop[1];
}
} else if ($value_pop[0] < $acum_data) {
$sum_data = ($sum_data + $data_array_prev[$key_pop][1]);
$data_array_reverse[$acum_key][] = $acum_array;
$data_array_prev[$key_pop] = $value_pop;
$acum_key = $key_pop;
$acum_data = $value_pop[0];
$acum_array = $value_pop;
} else if ($value_pop[0] == $acum_data) {
$data_array_prev[$key_pop] = $value_pop;
$sum_data += $value_pop[1];
}
if ($summatory && isset($reduce_array_summatory)
&& is_array($reduce_array_summatory)
&& count($reduce_array_summatory) > 0
) {
$array_data['summatory']['data'] = $reduce_array_summatory;
}
$count_pop++;
}
if ($summatory) {
$array_sum_reverse[$count][0] = $acum_data;
$array_sum_reverse[$count][1] = $sum_data;
}
if ($average) {
$array_avg_reverse[$count][0] = $acum_data;
$array_avg_reverse[$count][1] = ($sum_data / $count_pop);
}
}
$count++;
$count_data_array_reverse--;
}
if ($summatory && isset($array_sum_reverse)
&& is_array($array_sum_reverse)
&& count($array_sum_reverse) > 0
) {
$array_data['summatory']['data'] = $array_sum_reverse;
$array_data['summatory']['color'] = 'purple';
}
if ($average && isset($array_avg_reverse)
&& is_array($array_avg_reverse)
&& count($array_avg_reverse) > 0
) {
if ($baseline) {
$array_data['baseline']['data'] = $array_avg_reverse;
$array_data['baseline']['color'] = 'green';
} else {
$array_data['average']['data'] = $array_avg_reverse;
$array_data['average']['color'] = 'orange';
}
}
if ($average && isset($reduce_array_average)
&& is_array($reduce_array_average)
&& count($reduce_array_average) > 0
) {
$array_data['average']['data'] = $reduce_array_average;
}
return $array_data;

91
pandora_console/include/functions_reporting.php
View File

@ -505,42 +505,43 @@ function reporting_make_reporting_data(
);
break;
case 'MTTR':
/*
case 'MTTR':
$report['contents'][] = reporting_value(
$report,
$content,
'MTTR',
$pdf
);
break;
break;
case 'MTBF':
case 'MTBF':
$report['contents'][] = reporting_value(
$report,
$content,
'MTBF',
$pdf
);
break;
break;
case 'TTO':
case 'TTO':
$report['contents'][] = reporting_value(
$report,
$content,
'TTO',
$pdf
);
break;
break;
case 'TTRT':
case 'TTRT':
$report['contents'][] = reporting_value(
$report,
$content,
'TTRT',
$pdf
);
break;
break;
*/
case 'agent_configuration':
$report['contents'][] = io_safe_output(
reporting_agent_configuration(
@ -3105,6 +3106,13 @@ function reporting_historical_data($report, $content)
$content['name'] = __('Historical data');
}
if (is_metaconsole()) {
$id_meta = metaconsole_get_id_server($content['server_name']);
$server = metaconsole_get_connection_by_id($id_meta);
$connection = metaconsole_connect($server);
}
$id_agent = agents_get_module_id(
$content['id_agent_module']
);
@ -3196,6 +3204,10 @@ function reporting_historical_data($report, $content)
$return['data'] = $data;
if (is_metaconsole() && $connection > 0) {
metaconsole_restore_db();
}
return reporting_check_structure_content($return);
}
@ -4691,21 +4703,22 @@ function reporting_value($report, $content, $type, $pdf=false)
$return['type'] = 'sumatory';
break;
case 'MTTR':
/*
case 'MTTR':
$return['type'] = 'MTTR';
break;
break;
case 'MTBF':
case 'MTBF':
$return['type'] = 'MTBF';
break;
break;
case 'TTO':
case 'TTO':
$return['type'] = 'TTO';
break;
break;
case 'TTRT':
case 'TTRT':
$return['type'] = 'TTRT';
break;
break;*/
}
if (empty($content['name'])) {
@ -4726,21 +4739,22 @@ function reporting_value($report, $content, $type, $pdf=false)
$content['name'] = __('Summatory');
break;
case 'MTTR':
/*
case 'MTTR':
$content['name'] = __('MTTR');
break;
break;
case 'MTBF':
case 'MTBF':
$content['name'] = __('MTBF');
break;
break;
case 'TTO':
case 'TTO':
$content['name'] = __('TTO');
break;
break;
case 'TTRT':
case 'TTRT':
$content['name'] = __('TTRT');
break;
break;*/
}
}
@ -4913,25 +4927,26 @@ function reporting_value($report, $content, $type, $pdf=false)
}
break;
case 'MTTR':
/*
case 'MTTR':
$value = reporting_get_agentmodule_mttr(
$content['id_agent_module'],
$content['period'],
$report['datetime']
);
$formated_value = null;
break;
break;
case 'MTBF':
case 'MTBF':
$value = reporting_get_agentmodule_mtbf(
$content['id_agent_module'],
$content['period'],
$report['datetime']
);
$formated_value = null;
break;
break;
case 'TTO':
case 'TTO':
$value = reporting_get_agentmodule_tto(
$content['id_agent_module'],
$content['period'],
@ -4942,9 +4957,9 @@ function reporting_value($report, $content, $type, $pdf=false)
} else {
$formated_value = human_time_description_raw($value);
}
break;
break;
case 'TTRT':
case 'TTRT':
$value = reporting_get_agentmodule_ttr(
$content['id_agent_module'],
$content['period'],
@ -4955,7 +4970,7 @@ function reporting_value($report, $content, $type, $pdf=false)
} else {
$formated_value = human_time_description_raw($value);
}
break;
break;*/
}
$return['data'] = [
@ -7488,10 +7503,12 @@ function reporting_custom_graph(
if ($type_report == 'custom_graph') {
if (is_metaconsole()) {
$id_meta = metaconsole_get_id_server($content['server_name']);
$server = metaconsole_get_connection_by_id($id_meta);
if (metaconsole_connect($server) != NOERR) {
return false;
$servers = metaconsole_get_connection_names();
foreach ($servers as $server) {
$connection = metaconsole_get_connection($server);
if (metaconsole_connect($connection) != NOERR) {
continue;
}
}
}
}

58
pandora_console/include/functions_reporting_html.php
View File

@ -251,6 +251,7 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
reporting_html_sql($table, $item);
break;
case 'simple_baseline_graph':
case 'simple_graph':
reporting_html_graph($table, $item);
break;
@ -287,22 +288,23 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
reporting_html_sum_value($table, $item, $mini);
break;
case 'MTTR':
/*
case 'MTTR':
reporting_html_MTTR_value($table, $item, $mini, true, true);
break;
break;
case 'MTBF':
case 'MTBF':
reporting_html_MTBF_value($table, $item, $mini, true, true);
break;
break;
case 'TTO':
case 'TTO':
reporting_html_TTO_value($table, $item, $mini, false, true);
break;
break;
case 'TTRT':
case 'TTRT':
reporting_html_TTRT_value($table, $item, $mini, false, true);
break;
break;
*/
case 'agent_configuration':
reporting_html_agent_configuration($table, $item);
break;
@ -315,10 +317,6 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
reporting_html_prediction_date($table, $item, $mini);
break;
case 'simple_baseline_graph':
reporting_html_graph($table, $item);
break;
case 'netflow_area':
case 'netflow_data':
case 'netflow_summary':
@ -2207,12 +2205,15 @@ function reporting_html_database_serialized($table, $item, $pdf=0)
{
$table1 = new stdClass();
$table1->width = '100%';
$table1->head = [__('Date')];
$table1->head = [
__('Date'),
__('Data'),
];
if (!empty($item['keys'])) {
$table1->head = array_merge($table1->head, $item['keys']);
}
$table1->style[0] = 'text-align: left';
$table1->style[0] = 'text-align: center';
$table1->data = [];
foreach ($item['data'] as $data) {
@ -2728,29 +2729,30 @@ function reporting_html_agent_configuration(
}
function reporting_html_TTRT_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
/*
function reporting_html_TTRT_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
reporting_html_value($table, $item, $mini, $only_value, $check_empty);
}
}
function reporting_html_TTO_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
function reporting_html_TTO_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
reporting_html_value($table, $item, $mini, $only_value, $check_empty);
}
}
function reporting_html_MTBF_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
function reporting_html_MTBF_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
reporting_html_value($table, $item, $mini, $only_value, $check_empty);
}
}
function reporting_html_MTTR_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
function reporting_html_MTTR_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
reporting_html_value($table, $item, $mini, $only_value, $check_empty);
}
}
*/
function reporting_html_sum_value(&$table, $item, $mini)
{

19
pandora_console/include/functions_reports.php
View File

@ -679,23 +679,24 @@ function reports_get_report_types($template=false, $not_editor=false)
'name' => __('Module Histogram graph'),
];
$types['TTRT'] = [
/*
$types['TTRT'] = [
'optgroup' => __('ITIL'),
'name' => __('TTRT'),
];
$types['TTO'] = [
];
$types['TTO'] = [
'optgroup' => __('ITIL'),
'name' => __('TTO'),
];
$types['MTBF'] = [
];
$types['MTBF'] = [
'optgroup' => __('ITIL'),
'name' => __('MTBF'),
];
$types['MTTR'] = [
];
$types['MTTR'] = [
'optgroup' => __('ITIL'),
'name' => __('MTTR'),
];
];
*/
$types['SLA'] = [
'optgroup' => __('SLA'),
'name' => __('S.L.A.'),

7
pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
View File

@ -159,10 +159,9 @@
if (custom_graph) {
dataObject = retrieveDataOject(dataObjects,0);
//dataObjects.forEach(function (element) {
//elements.push(processDataObject(element));
//});
elements.push(processDataObject(dataObject));
dataObjects.forEach(function (element) {
elements.push(processDataObject(element));
});
graphData = elements;
}
else {

2
pandora_console/install.php
View File

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

9
pandora_console/operation/events/events.php
View File

@ -315,6 +315,8 @@ if (is_ajax()) {
$tmp->data = format_numeric($tmp->data, 1);
$tmp->instructions = events_get_instructions($item);
$tmp->b64 = base64_encode(json_encode($tmp));
$carry[] = $tmp;
@ -2398,5 +2400,12 @@ function datetime_picker_callback() {
datetime_picker_callback();
function show_instructions(id){
title = "<?php echo __('Instructions'); ?>";
$('#hidden_event_instructions_' + id).dialog({
title: title,
width: 600
});
}
</script>

2
pandora_console/operation/users/user_edit.php
View File

@ -333,7 +333,7 @@ $id_usr = $config['id_user'];
if (!$meta) {
$home_screen = '<div class="label_select"><p class="edit_user_labels">'.__('Home screen').ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true).'</p>';
$home_screen = '<div class="label_select"><p class="edit_user_labels">'.__('Home screen').ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=1 to show agent detail view'), true).'</p>';
$values = [
'Default' => __('Default'),
'Visual console' => __('Visual console'),

2
pandora_console/pandora_console.redhat.spec
View File

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

2
pandora_console/pandora_console.rhel7.spec
View File

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

2
pandora_console/pandora_console.spec
View File

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

BIN
pandora_console/vendor/mpdf/mpdf/ttfonts/smallfont.ttf vendored Normal file
View File

Binary file not shown.

BIN
pandora_console/vendor/mpdf/mpdf/ttfonts/unicode.ttf vendored Executable file
View File

Binary file not shown.

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.739-190930
Version: 7.0NG.739-191007
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.739-190930"
pandora_version="7.0NG.739-191007"
package_cpan=0
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
my $pandora_version = "7.0NG.739";
my $pandora_build = "190930";
my $pandora_build = "191007";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

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

2
pandora_server/pandora_server.redhat.spec
View File

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

2
pandora_server/pandora_server.spec
View File

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

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
View File

@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.739 PS190930";
my $version = "7.0NG.739 PS191007";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

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