From db3e276195dc28afd1cbc31cf4f75d4fe7c775b1 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 16 Apr 2015 10:50:43 +0200 Subject: [PATCH 1/4] Fixed error when flash_chart is false, colors of pie bad drawn, tiquet: #2107 --- pandora_console/include/functions_graph.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index c07af3b298..d05132630b 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1555,10 +1555,14 @@ function graph_agent_status ($id_agent = false, $width = 300, $height = 200, $re $water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png", 'url' => ui_get_full_url("images/logo_vertical_water.png", false, false, false)); - $colors = array(COL_CRITICAL, COL_WARNING, COL_NORMAL, COL_UNKNOWN); + //$colors = array(COL_CRITICAL, COL_WARNING, COL_NORMAL, COL_UNKNOWN); + $colors[__('Critical')] = COL_CRITICAL; + $colors[__('Warning')] = COL_WARNING; + $colors[__('Normal')] = COL_NORMAL; + $colors[__('Unknown')] = COL_UNKNOWN; if ($show_not_init) { - $colors[] = COL_NOTINIT; + $colors[__('Not init')] = COL_NOTINIT; } if (array_sum($data) == 0) { From 79afef8cf8f81dbf4f524888695497d0989404e6 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 15 Apr 2015 11:02:44 +0200 Subject: [PATCH 2/4] Added support for metaconsole servers. --- pandora_server/bin/pandora_server | 22 ++++++++++++++-------- pandora_server/lib/PandoraFMS/Tools.pm | 4 ++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index 272f75e89b..e4d79dac6f 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -104,15 +104,21 @@ sub pandora_startup () { pandora_audit (\%Config, 'Pandora FMS Server Daemon starting', 'SYSTEM', 'System', $DBH); # Load servers - pandora_reset_server (\%Config, $DBH); - push (@Servers, new PandoraFMS::DataServer (\%Config, $DBH)); - push (@Servers, new PandoraFMS::NetworkServer (\%Config, $DBH)); - push (@Servers, new PandoraFMS::ReconServer (\%Config, $DBH)); - push (@Servers, new PandoraFMS::SNMPServer (\%Config, $DBH)); - push (@Servers, new PandoraFMS::WMIServer (\%Config, $DBH)); - push (@Servers, new PandoraFMS::PluginServer (\%Config, $DBH)); - push (@Servers, new PandoraFMS::PredictionServer (\%Config, $DBH)); + if ($Config{"license_type"} != METACONSOLE_LICENSE) { + pandora_reset_server (\%Config, $DBH); + push (@Servers, new PandoraFMS::DataServer (\%Config, $DBH)); + push (@Servers, new PandoraFMS::NetworkServer (\%Config, $DBH)); + push (@Servers, new PandoraFMS::ReconServer (\%Config, $DBH)); + push (@Servers, new PandoraFMS::SNMPServer (\%Config, $DBH)); + push (@Servers, new PandoraFMS::WMIServer (\%Config, $DBH)); + push (@Servers, new PandoraFMS::PluginServer (\%Config, $DBH)); + push (@Servers, new PandoraFMS::PredictionServer (\%Config, $DBH)); + } else { + # Metaconsole service modules are run by the prediction server + push (@Servers, new PandoraFMS::PredictionServer (\%Config, $DBH)); + } + # There are enterprise metaconsole servers! enterprise_hook('load_enterprise_servers', [\@Servers, \%Config, $DBH]); # Start the netflow daemon if necessary diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index 6dc2b7dae9..265374fb6a 100644 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -56,6 +56,7 @@ our @EXPORT = qw( EVENTSERVER ICMPSERVER SNMPSERVER + METACONSOLE_LICENSE $DEVNULL cron_get_closest_in_range cron_next_execution @@ -106,6 +107,9 @@ use constant EVENTSERVER => 10; use constant ICMPSERVER => 11; use constant SNMPSERVER => 12; +# Value for a metaconsole license type +use constant METACONSOLE_LICENSE => 0x01; + # /dev/null our $DEVNULL = ($^O eq 'MSWin32') ? '/Nul' : '/dev/null'; From 4f94d5bb50485ae629916d184d8e1d19f30d237b Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 15 Apr 2015 12:31:31 +0200 Subject: [PATCH 3/4] Do not displayed advanced filters if custom filters are disabled. Small fixes. --- pandora_console/include/functions_netflow.php | 11 ++++++-- .../operation/netflow/nf_live_view.php | 25 ++++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index aded2a30cc..40dbd99f75 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -1103,6 +1103,12 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi $aggregate = $filter['aggregate']; $unit = $filter['output']; $interval = $end_date - $start_date; + if (defined ('METACONSOLE')) { + $width = 950; + } else { + $width = 850; + } + $height = 320; // Process item switch ($type) { @@ -1119,7 +1125,8 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi if ($interval_length != 0) { $html .= " " . _('Resolution') . ": $interval_length " . __('seconds'); } - $html .= graph_netflow_aggregate_area ($data, $interval, 850, 320, netflow_format_unit ($unit)); + + $html .= graph_netflow_aggregate_area ($data, $interval, $width, $height, netflow_format_unit ($unit)); return $html; } else if ($output == 'PDF') { @@ -1128,7 +1135,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi if ($interval_length != 0) { $html .= " " . _('Resolution') . ": $interval_length " . __('seconds'); } - $html .= graph_netflow_aggregate_area ($data, $interval, 850, 320, netflow_format_unit ($unit), 2, true); + $html .= graph_netflow_aggregate_area ($data, $interval, $width, $height, netflow_format_unit ($unit), 2, true); return $html; } else if ($output == 'XML') { diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index 894e226952..f37aa3762f 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -90,6 +90,7 @@ $time = get_parameter_post ('time', date (TIME_FORMAT, get_system_time ())); $connection_name = get_parameter('connection_name', ''); $interval_length = (int) get_parameter('interval_length', 300); $address_resolution = (int) get_parameter('address_resolution', $config['netflow_get_ip_hostname']); +$filter_selected = (int) get_parameter('filter_selected', 0); // Read buttons $draw = get_parameter('draw_button', ''); @@ -317,8 +318,9 @@ echo '
" . html_print_select_from_sql ($sql, 'filter_id', $filter_id, '', __('none'), 0, true) . ""; - + echo "" . html_print_select_from_sql ($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true); + html_print_input_hidden("filter_selected", $filter_selected, false); + echo ""; echo ""; @@ -367,8 +369,13 @@ echo '"; echo ""; - echo "" . ui_print_help_icon ('pcap_filter', true, ui_get_full_url(false, false, false, false)) . ""; - echo "" . html_print_textarea ('advanced_filter', 4, 40, $filter['advanced_filter'], "style='min-height: 0px; width: 90%;'", true) . ""; + if ($netflow_disable_custom_lvfilters) { + echo ""; + echo ""; + } else { + echo "" . ui_print_help_icon ('pcap_filter', true, ui_get_full_url(false, false, false, false)) . ""; + echo "" . html_print_textarea ('advanced_filter', 4, 40, $filter['advanced_filter'], "style='min-height: 0px; width: 90%;'", true) . ""; + } echo ""; echo ""; @@ -411,9 +418,17 @@ echo'
'; if ($draw != '') { // Draw echo "
"; + + // No filter selected + if ($netflow_disable_custom_lvfilters && $filter_selected == 0) { + ui_print_error_message(__('No filter selected')); + } + // Draw the netflow chart + else { echo netflow_draw_item ($start_date, $end_date, $interval_length, $chart_type, $filter, $max_aggregates, $connection_name, 'HTML', $address_resolution); + } } enterprise_hook('close_meta_frame'); @@ -482,6 +497,7 @@ ui_include_time_picker(); // Check right filter type $("#radiobtn0001").attr("checked", "checked"); + $("#hidden-filter_selected").val(0); $("#text-ip_dst").val(''); $("#text-ip_src").val(''); $("#text-dst_port").val(''); @@ -496,6 +512,7 @@ ui_include_time_picker(); } else { // Load fields from DB + $("#hidden-filter_selected").val(1); // Get filter type Date: Thu, 16 Apr 2015 12:37:42 +0200 Subject: [PATCH 4/4] Fixed bug loading ajax. --- pandora_console/ajax.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php index d7d51a453c..e5bef6b0c9 100644 --- a/pandora_console/ajax.php +++ b/pandora_console/ajax.php @@ -18,17 +18,14 @@ if ((! file_exists("include/config.php")) || (! is_readable("include/config.php" exit; } +// Real start +session_start(); + require_once ('include/config.php'); require_once ('include/functions.php'); require_once ('include/functions_db.php'); require_once ('include/auth/mysql.php'); -// Real start - -if (session_id() == '') { - session_start(); -} - // Hash login process if (isset ($_GET["loginhash"])) {