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

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

This commit is contained in:
Alejandro Gallardo Escobar 2015-02-19 18:55:36 +01:00
parent 6744d4a6c5 66feffb0f7
commit 8b146da998
28 changed files with 115 additions and 96 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: 6.0dev-150218 Version: 6.0dev-150219
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="6.0dev-150218" pandora_version="6.0dev-150219"
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

@ -41,7 +41,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '6.0dev'; use constant AGENT_VERSION => '6.0dev';
use constant AGENT_BUILD => '150218'; use constant AGENT_BUILD => '150219';
# Commands to retrieve total memory information in kB # Commands to retrieve total memory information in kB
use constant TOTALMEMORY_CMDS => { use constant TOTALMEMORY_CMDS => {

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 6.0dev %define version 6.0dev
%define release 150218 %define release 150219
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 6.0dev %define version 6.0dev
%define release 150218 %define release 150219
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

@ -89,7 +89,7 @@ fi
[ "$4" ] && PANDORA_PERL_PATH=$4 [ "$4" ] && PANDORA_PERL_PATH=$4
# Check for Perl 5.6.x or higher available # Check for Perl 5.6.x or higher available
PERL_VERSION=`$PANDORA_PERL_PATH -v | egrep 'v5.6|v5.7|v5.8|v5.9|v5.1[0-9]' | grep perl` PERL_VERSION=`$PANDORA_PERL_PATH -v | egrep 'v5.[6-9]|v5.[12][0-9]' | grep perl`
if [ -z "$PERL_VERSION" ] if [ -z "$PERL_VERSION" ]
then then

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{150218} {150219}
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 ("6.0dev(Build 150218)") #define PANDORA_VERSION ("6.0dev(Build 150219)")
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", "(6.0dev(Build 150218))" VALUE "ProductVersion", "(6.0dev(Build 150219))"
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: 6.0dev-150218 Version: 6.0dev-150219
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="6.0dev-150218" pandora_version="6.0dev-150219"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

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 = 'PC150218'; $build_version = 'PC150219';
$pandora_version = 'v6.0dev'; $pandora_version = 'v6.0dev';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

8
pandora_console/include/functions_graph.php
View File

@ -773,7 +773,8 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
} }
// Build the data of the current period // Build the data of the current period
$data_returned = grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, $data_returned = grafico_modulo_sparse_data ($agent_module_id,
$period, $show_events,
$width, $height , $title, $unit_name, $width, $height , $title, $unit_name,
$show_alerts, $avg_only, $show_alerts, $avg_only,
$date, $unit, $baseline, $return_data, $show_title, $date, $unit, $baseline, $return_data, $show_title,
@ -801,8 +802,9 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
$flash_chart = false; $flash_chart = false;
} }
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", $water_mark = array('file' =>
'url' => ui_get_full_url("/images/logo_vertical_water.png")); $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png");
if ($compare === 'separated') { if ($compare === 'separated') {
return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend, return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,

97
pandora_console/include/functions_reporting.php
View File

@ -2530,7 +2530,9 @@ function reporting_alert_reporting ($id_group, $period = 0, $date = 0, $return =
$data[__('Alerts not fired')] = $not_fired_percentage; $data[__('Alerts not fired')] = $not_fired_percentage;
$output .= pie3d_graph(false, $data, 280, 150, $output .= pie3d_graph(false, $data, 280, 150,
__("other"), ui_get_full_url(false) . '/', $config['homedir'] . "/images/logo_vertical_water.png", __("other"),
ui_get_full_url(false, false, false, false) . '/',
ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
$output .= '<strong>'.__('Alerts fired').': '.sizeof ($alerts_fired).'</strong><br />'; $output .= '<strong>'.__('Alerts fired').': '.sizeof ($alerts_fired).'</strong><br />';
@ -2606,7 +2608,9 @@ function reporting_monitor_health ($id_group, $period = 0, $date = 0, $return =
$data[__('Monitors BAD')] = $not_down_percentage; $data[__('Monitors BAD')] = $not_down_percentage;
$output .= pie3d_graph(false, $data, 280, 150, $output .= pie3d_graph(false, $data, 280, 150,
__("other"), ui_get_full_url(false) . '/', $config['homedir'] . "/images/logo_vertical_water.png", __("other"),
ui_get_full_url(false, false, false, false) . '/',
ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
if (!$return) if (!$return)
@ -3503,20 +3507,20 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table->colspan[$next_row][0] = 3; $table->colspan[$next_row][0] = 3;
$table->cellstyle[$next_row][0] = 'text-align: center;'; $table->cellstyle[$next_row][0] = 'text-align: center;';
$data = array (); $data = array ();
$moduletype_name = modules_get_moduletype_name( $moduletype_name = modules_get_moduletype_name(
modules_get_agentmodule_type( modules_get_agentmodule_type(
$content['id_agent_module'])); $content['id_agent_module']));
$only_avg = true; $only_avg = true;
// Due to database compatibility problems, the 'only_avg' value // Due to database compatibility problems, the 'only_avg' value
// is stored into the json contained into the 'style' column. // is stored into the json contained into the 'style' column.
if (isset($content['style'])) { if (isset($content['style'])) {
$style_json = io_safe_output($content['style']); $style_json = io_safe_output($content['style']);
$style = json_decode($style_json, true); $style = json_decode($style_json, true);
if (isset($style['only_avg'])) { if (isset($style['only_avg'])) {
$only_avg = (bool) $style['only_avg']; $only_avg = (bool) $style['only_avg'];
} }
@ -3550,7 +3554,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
0, 0,
true, true,
$only_image, $only_image,
ui_get_full_url(false) . '/', ui_get_full_url(false, false, false, false),
1, 1,
false, false,
'', '',
@ -3609,7 +3613,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
0, 0,
$report["datetime"], $report["datetime"],
true, true,
ui_get_full_url(false) . '/', ui_get_full_url(false, false, false, false) . '/',
1, 1,
// Important parameter, this tell to graphic_combined_module function that is a projection graph // Important parameter, this tell to graphic_combined_module function that is a projection graph
$output_projection, $output_projection,
@ -3676,7 +3680,8 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$data = array (); $data = array ();
$data[0] = grafico_modulo_sparse($content['id_agent_module'], $content['period'], $data[0] = grafico_modulo_sparse($content['id_agent_module'], $content['period'],
false, $sizgraph_w, $sizgraph_h, '', '', false, true, true, false, $sizgraph_w, $sizgraph_h, '', '', false, true, true,
$report["datetime"], '', true, 0, true, $only_image, ui_get_full_url(false) . '/'); $report["datetime"], '', true, 0, true, $only_image,
ui_get_full_url(false, false, false, false));
/*$data[0] = graphic_combined_module( /*$data[0] = graphic_combined_module(
$modules, $modules,
@ -3748,7 +3753,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$graph["stacked"], $graph["stacked"],
$report["datetime"], $report["datetime"],
$only_image, $only_image,
ui_get_full_url(false) . '/'); ui_get_full_url(false, false, false, false));
array_push ($table->data, $data); array_push ($table->data, $data);
break; break;
@ -4271,47 +4276,13 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
// $data = array(); // $data = array();
// $data_pie_graph = json_encode ($data_graph); // $data_pie_graph = json_encode ($data_graph);
if ($show_graphs && !empty($slas)) { if ($show_graphs && !empty($slas)) {
// $data[0] = pie3d_graph(false, $data_graph,
// 500, 150, __("other"),
// ui_get_full_url(false, false, false, false),
// $config['homedir'] . "/images/logo_vertical_water.png",
// $config['fontpath'], $config['font_size']);
// //Print resume
// $table_resume = null;
// $table_resume->head[0] = __('Average Value');
// $table_resume->data[0][0] = '<span style="font: bold '.$sizem.'em Arial, Sans-serif; color: #000000;">';
// $table_resume->data[0][0] .= format_numeric($total_SLA / count($sla_showed), 2);
// $table_resume->data[0][0] .= "%</span>";
// $data[1] = html_print_table($table_resume, true);
// $table_resume = null;
// $table_resume->head[0] = __('SLA Compliance');
// if ($total_result_SLA == 'ok') {
// $table_resume->data[0][0] = '<span style="font: bold '.$sizem.'em Arial, Sans-serif; color: #000000;">'.__('OK').'</span>';
// }
// if ($total_result_SLA == 'fail') {
// $table_resume->data[0][0] = '<span style="font: bold '.$sizem.'em Arial, Sans-serif; color: #ff0000;">'.__('Fail').'</span>';
// }
// if ($total_result_SLA == 'unknown') {
// $table_resume->data[0][0] = '<span style="font: bold '.$sizem.'em Arial, Sans-serif; color: #736F6E;">'.__('Unknown').'</span>';
// }
// $data[2] = html_print_table($table_resume, true);
// $next_row++;
// array_push ($table->data, $data);
$table->colspan[$next_row][0] = 3; $table->colspan[$next_row][0] = 3;
$next_row++; $next_row++;
$data = array(); $data = array();
$data[0] = html_print_table($tableslice, true); $data[0] = html_print_table($tableslice, true);
array_push ($table->data, $data); array_push ($table->data, $data);
} }
if (!empty($table_planned_downtimes)) { if (!empty($table_planned_downtimes)) {
$data = array(); $data = array();
$data[0] = html_print_table($table_planned_downtimes, true); $data[0] = html_print_table($table_planned_downtimes, true);
@ -4563,7 +4534,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table_event_graph->data[0][0] = pie3d_graph( $table_event_graph->data[0][0] = pie3d_graph(
false, $data_graph, 500, 150, __("other"), "", false, $data_graph, 500, 150, __("other"), "",
$config['homedir'] . "/images/logo_vertical_water.png", ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
$data[0] = html_print_table($table_event_graph, true); $data[0] = html_print_table($table_event_graph, true);
@ -4591,7 +4562,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table_event_graph->data[0][0] = pie3d_graph( $table_event_graph->data[0][0] = pie3d_graph(
false, $data_graph, 500, 150, __("other"), "", false, $data_graph, 500, 150, __("other"), "",
$config['homedir'] . "/images/logo_vertical_water.png", ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], 1, false, $colors); $config['fontpath'], $config['font_size'], 1, false, $colors);
$data[0] = html_print_table($table_event_graph, true); $data[0] = html_print_table($table_event_graph, true);
@ -4617,7 +4588,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table_event_graph->data[0][0] = pie3d_graph( $table_event_graph->data[0][0] = pie3d_graph(
false, $data_graph, 500, 150, __("other"), "", false, $data_graph, 500, 150, __("other"), "",
$config['homedir'] . "/images/logo_vertical_water.png", ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
$data[0] = html_print_table($table_event_graph, true); $data[0] = html_print_table($table_event_graph, true);
@ -4764,7 +4735,13 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$data = array (); $data = array ();
$data[0] = graph_custom_sql_graph($content["id_rc"], $sizgraph_w, $sizgraph_h, $content["type"], true, ui_get_full_url(false) . '/'); $data[0] = graph_custom_sql_graph(
$content["id_rc"],
$sizgraph_w,
$sizgraph_h,
$content["type"],
true,
ui_get_full_url(false, false, false, false));
array_push($table->data, $data); array_push($table->data, $data);
break; break;
@ -4830,7 +4807,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table_event_graph->data[0][0] = pie3d_graph( $table_event_graph->data[0][0] = pie3d_graph(
false, $data_graph, 500, 150, __("other"), "", false, $data_graph, 500, 150, __("other"), "",
$config['homedir'] . "/images/logo_vertical_water.png", ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
$data[0] = html_print_table($table_event_graph, true); $data[0] = html_print_table($table_event_graph, true);
@ -4856,7 +4833,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table_event_graph->data[0][0] = pie3d_graph( $table_event_graph->data[0][0] = pie3d_graph(
false, $data_graph, 500, 150, __("other"), "", false, $data_graph, 500, 150, __("other"), "",
$config['homedir'] . "/images/logo_vertical_water.png", ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
$data[0] = html_print_table($table_event_graph, true); $data[0] = html_print_table($table_event_graph, true);
@ -4874,9 +4851,9 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$filter_event_critical, $filter_event_critical,
$filter_event_warning, $filter_event_warning,
$filter_event_no_validated); $filter_event_no_validated);
$colors = get_criticity_pie_colors($data_graph); $colors = get_criticity_pie_colors($data_graph);
$table_event_graph = null; $table_event_graph = null;
$table_event_graph->head[0] = __('Events by criticity'); $table_event_graph->head[0] = __('Events by criticity');
$table_event_graph->width = '100%'; $table_event_graph->width = '100%';
@ -4884,7 +4861,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table_event_graph->data[0][0] = pie3d_graph( $table_event_graph->data[0][0] = pie3d_graph(
false, $data_graph, 500, 150, __("other"), "", false, $data_graph, 500, 150, __("other"), "",
$config['homedir'] . "/images/logo_vertical_water.png", ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size'], 1, false, $colors); $config['fontpath'], $config['font_size'], 1, false, $colors);
$data[0] = html_print_table($table_event_graph, true); $data[0] = html_print_table($table_event_graph, true);
@ -4910,7 +4887,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table_event_graph->data[0][0] = pie3d_graph( $table_event_graph->data[0][0] = pie3d_graph(
false, $data_graph, 500, 150, __("other"), "", false, $data_graph, 500, 150, __("other"), "",
$config['homedir'] . "/images/logo_vertical_water.png", ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
$data[0] = html_print_table($table_event_graph, true); $data[0] = html_print_table($table_event_graph, true);
@ -6136,7 +6113,8 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$data[0] = pie3d_graph(false, $data_pie_graph, $data[0] = pie3d_graph(false, $data_pie_graph,
$sizgraph_w, $sizgraph_h, __("other"), $sizgraph_w, $sizgraph_h, __("other"),
ui_get_full_url(false, true, false, false) . '/', $config['homedir'] . "/images/logo_vertical_water.png", ui_get_full_url(false, true, false, false) . '/',
ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
@ -6531,7 +6509,9 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$data = array(); $data = array();
if ($show_graph == 1 || $show_graph == 2) { if ($show_graph == 1 || $show_graph == 2) {
$data[0] = pie3d_graph(false, $data_pie_graph, $data[0] = pie3d_graph(false, $data_pie_graph,
600, 150, __("other"), ui_get_full_url(false) . '/', $config['homedir'] . "/images/logo_vertical_water.png", 600, 150, __("other"),
ui_get_full_url(false, false, false, false),
ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png",
$config['fontpath'], $config['font_size']); $config['fontpath'], $config['font_size']);
array_push ($table->data, $data); array_push ($table->data, $data);
//Display bars graph //Display bars graph
@ -6540,7 +6520,10 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$height = count($data_pie_graph) * 20 + 85; $height = count($data_pie_graph) * 20 + 85;
$data = array(); $data = array();
$data[0] = hbar_graph(false, $data_hbar, 600, $height, array(), array(), "", "", true, ui_get_full_url(false) . '/', $config['homedir'] . "/images/logo_vertical_water.png", '', '', true, 1, true); $data[0] = hbar_graph(false, $data_hbar, 600, $height,
array(), array(), "", "", true,
ui_get_full_url(false, false, false, false),
ui_get_full_url(false, false, false, false) . "/images/logo_vertical_water.png", '', '', true, 1, true);
array_push ($table->data, $data); array_push ($table->data, $data);
} }

8
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -736,7 +736,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
var stack = 0, bars = true, lines = false, steps = false; var stack = 0, bars = true, lines = false, steps = false;
var plot = $.plot($('#'+graph_id), datas, options); var plot = $.plot($('#' + graph_id), datas, options);
// Adjust the overview plot to the width and position of the main plot // Adjust the overview plot to the width and position of the main plot
adjust_left_width_canvas(graph_id, 'overview_'+graph_id); adjust_left_width_canvas(graph_id, 'overview_'+graph_id);
@ -789,7 +789,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
})); }));
$('#menu_cancelzoom_' + graph_id) $('#menu_cancelzoom_' + graph_id)
.attr('src',homeurl + '/images/zoom_cross.png'); .attr('src', homeurl + '/images/zoom_cross.png');
currentRanges = ranges; currentRanges = ranges;
// don't fire event on the overview to prevent eternal loop // don't fire event on the overview to prevent eternal loop
@ -896,7 +896,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
} }
// Events // Events
$('#'+graph_id).bind('plothover', function (event, pos, item) { $('#' + graph_id).bind('plothover', function (event, pos, item) {
overview.setCrosshair({ x: pos.x, y: 0 }); overview.setCrosshair({ x: pos.x, y: 0 });
currentPlot = plot; currentPlot = plot;
latestPosition = pos; latestPosition = pos;
@ -906,7 +906,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
}); });
$('#'+graph_id).bind("plotclick", function (event, pos, item) { $('#' + graph_id).bind("plotclick", function (event, pos, item) {
plot.unhighlight(); plot.unhighlight();
if (item && item.series.label != '' && (item.series.label == legend_events || item.series.label == legend_events+series_suffix_str || item.series.label == legend_alerts || item.series.label == legend_alerts+series_suffix_str)) { if (item && item.series.label != '' && (item.series.label == legend_events || item.series.label == legend_events+series_suffix_str || item.series.label == legend_alerts || item.series.label == legend_alerts+series_suffix_str)) {
plot.unhighlight(); plot.unhighlight();

10
pandora_console/include/graphs/functions_flot.php
View File

@ -292,7 +292,13 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
} }
$menu_width = 25 * $nbuttons + 15; $menu_width = 25 * $nbuttons + 15;
$return .= "<div id='menu_$graph_id' class='menu_graph' style='display:none; text-align:center; width:".$menu_width."px; border: solid 1px #666; border-bottom: 0px; padding: 4px 4px 4px 4px'> $return .= "<div id='menu_$graph_id' class='menu_graph' " .
"style='display: none; " .
"text-align: center; " .
"width: " . $menu_width . "px; ".
"border: solid 1px #666; ".
"border-bottom: 0px; " .
"padding: 4px 4px 4px 4px'>
<a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$homeurl."images/zoom_cross.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>"; <a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$homeurl."images/zoom_cross.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
if ($threshold) { if ($threshold) {
$return .= "<a href='javascript:'><img id='menu_threshold_$graph_id' src='".$homeurl."images/chart_curve_threshold.png' alt='".__('Warning and Critical thresholds')."' title='".__('Warning and Critical thresholds')."'></a>"; $return .= "<a href='javascript:'><img id='menu_threshold_$graph_id' src='".$homeurl."images/chart_curve_threshold.png' alt='".__('Warning and Critical thresholds')."' title='".__('Warning and Critical thresholds')."'></a>";
@ -382,7 +388,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
"$watermark, " . "$watermark, " .
"$width, " . "$width, " .
"$max_x, " . "$max_x, " .
"'" . $config['homeurl'] . "', " . "'" . $homeurl . "', " .
"'$unit', " . "'$unit', " .
"$font_size, " . "$font_size, " .
"$menu, " . "$menu, " .

2
pandora_console/install.php
View File

@ -63,7 +63,7 @@
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '6.0dev'; $version = '6.0dev';
$build = '150218'; $build = '150219';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

42
pandora_console/operation/agentes/status_monitor.php
View File

@ -45,6 +45,8 @@ else {
ui_meta_print_header(__("Monitor view")); ui_meta_print_header(__("Monitor view"));
} }
$ag_freestring = get_parameter ('ag_freestring'); $ag_freestring = get_parameter ('ag_freestring');
$ag_modulename = (string) get_parameter ('ag_modulename'); $ag_modulename = (string) get_parameter ('ag_modulename');
if (!defined('METACONSOLE')) { if (!defined('METACONSOLE')) {
@ -220,8 +222,10 @@ if ($tag_filter !== 0) {
} }
} }
// 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"]); $groups = users_get_groups($config["id_user"]);
if ($ag_group !== 0) { if ($ag_group !== 0) {
$sql_conditions_tags = tags_get_acl_tags($config['id_user'], $ag_group, 'AR', 'module_condition', 'AND', 'tagente_modulo', true, array(), true); $sql_conditions_tags = tags_get_acl_tags($config['id_user'], $ag_group, 'AR', 'module_condition', 'AND', 'tagente_modulo', true, array(), true);
} else { } else {
@ -345,7 +349,9 @@ if (defined('METACONSOLE')) {
// Get all info for filters of all nodes // Get all info for filters of all nodes
$modules_temp = db_get_all_rows_sql($sql); $modules_temp = db_get_all_rows_sql($sql);
$rows_temp = db_get_all_rows_sql("SELECT distinct name $rows_temp = db_get_all_rows_sql("SELECT distinct name
FROM tmodule_group FROM tmodule_group
ORDER BY name"); ORDER BY name");
@ -390,9 +396,11 @@ echo '
false, 'width:150px;', false, false, false, 'width:150px;', false, false,
'id_grupo', $strict_user) . ' 'id_grupo', $strict_user) . '
</td>'; </td>';
echo '<td>' . __('Monitor status') . "</td>"; echo '<td>' . __('Monitor status') . "</td>";
echo "<td>"; echo "<td>";
$fields = array (); $fields = array ();
@ -407,6 +415,8 @@ html_print_select ($fields, "status", $status, '', __('All'), -1,
false, false, true, '', false, 'width: 150px;'); false, false, true, '', false, 'width: 150px;');
echo '</td>'; echo '</td>';
echo '<td valign="middle">' . __('Module group') . '</td>'; echo '<td valign="middle">' . __('Module group') . '</td>';
echo '<td valign="middle">'; echo '<td valign="middle">';
if (!defined('METACONSOLE')) { if (!defined('METACONSOLE')) {
@ -424,10 +434,14 @@ $rows_select[0] = __('Not assigned');
html_print_select($rows_select, 'modulegroup', $modulegroup, '', __('All'),-1,false, false, true, '', false, 'width: 120px;'); html_print_select($rows_select, 'modulegroup', $modulegroup, '', __('All'),-1,false, false, true, '', false, 'width: 120px;');
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
echo '<td valign="middle">' . __('Module name') . '</td>'; echo '<td valign="middle">' . __('Module name') . '</td>';
echo '<td valign="middle">'; echo '<td valign="middle">';
@ -440,6 +454,7 @@ html_print_select (index_array ($modules, 'nombre', 'nombre'), "ag_modulename",
echo '</td>'; echo '</td>';
echo '<td valign="middle" align="right">' . echo '<td valign="middle" align="right">' .
__('Search') . __('Search') .
'</td>'; '</td>';
@ -458,11 +473,17 @@ if (empty($tags)) {
echo __('No tags'); echo __('No tags');
} }
else { else {
html_print_select ($tags, "tag_filter", $tag_filter, '', __('All'), '', false, false, true, '', false, 'width: 150px;'); html_print_select ($tags, "tag_filter",
$tag_filter, '', __('All'), '', false, false, true, '', false, 'width: 150px;');
} }
echo '</td>'; echo '</td>';
echo '<td valign="middle">'; echo '<td valign="middle">';
html_print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"'); html_print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"');
echo "</td>"; echo "</td>";
@ -807,7 +828,7 @@ else {
WHERE disabled = 0"); WHERE disabled = 0");
if ($servers === false) if ($servers === false)
$servers = array(); $servers = array();
$result = array(); $result = array();
$count_modules = 0; $count_modules = 0;
foreach ($servers as $server) { foreach ($servers as $server) {
@ -1251,6 +1272,8 @@ foreach ($result as $row) {
} }
} }
if ($module_value == $sub_string) { if ($module_value == $sub_string) {
$salida = $module_value; $salida = $module_value;
} }
@ -1329,7 +1352,7 @@ ui_require_javascript_file('pandora_modules');
$("#tag_td").css('display', ''); $("#tag_td").css('display', '');
} }
}); });
function toggle_full_value(id) { function toggle_full_value(id) {
text = $("#hidden_value_module_" + id).html(); text = $("#hidden_value_module_" + id).html();
old_text = $("#value_module_text_" + id).html(); old_text = $("#value_module_text_" + id).html();
@ -1342,7 +1365,12 @@ ui_require_javascript_file('pandora_modules');
// Show the modal window of an module // Show the modal window of an module
function show_module_detail_dialog(module_id, id_agent, server_name, offset, period) { function show_module_detail_dialog(module_id, id_agent, server_name, offset, period) {
if (period == -1) { if (period == -1) {
period = $('#period').val(); if ($("#period").length == 1) {
period = $('#period').val();
}
else {
period = <?php echo SECONDS_1DAY; ?>;
}
} }
$.ajax({ $.ajax({

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 6.0dev %define version 6.0dev
%define release 150218 %define release 150219
# 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 6.0dev %define version 6.0dev
%define release 150218 %define release 150219
%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_console/pandoradb_data.sql
View File

@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('graph_res','5'), ('graph_res','5'),
('step_compact','1'), ('step_compact','1'),
('db_scheme_version','6.0dev'), ('db_scheme_version','6.0dev'),
('db_scheme_build','PD150218'), ('db_scheme_build','PD150219'),
('show_unknown','0'), ('show_unknown','0'),
('show_lastalerts','1'), ('show_lastalerts','1'),
('style','pandora'), ('style','pandora'),

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 6.0dev-150218 Version: 6.0dev-150219
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="6.0dev-150218" pandora_version="6.0dev-150219"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

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

@ -43,7 +43,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 = "6.0dev"; my $pandora_version = "6.0dev";
my $pandora_build = "150218"; my $pandora_build = "150219";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 6.0dev %define version 6.0dev
%define release 150218 %define release 150219
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 6.0dev %define version 6.0dev
%define release 150218 %define release 150219
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/util/pandora_db.pl
View File

@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "6.0dev PS150218"; my $version = "6.0dev PS150219";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -34,7 +34,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "6.0dev PS150218"; my $version = "6.0dev PS150219";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);