From 284e20fc8a1deeae3e5942c466e8eb193a47c867 Mon Sep 17 00:00:00 2001 From: Calvo Date: Fri, 17 Mar 2023 10:58:58 +0100 Subject: [PATCH] Unified default netflow interval and deleted from console setup --- pandora_console/godmode/setup/setup_netflow.php | 12 ++++-------- pandora_console/include/functions_config.php | 8 -------- pandora_server/lib/PandoraFMS/Config.pm | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/pandora_console/godmode/setup/setup_netflow.php b/pandora_console/godmode/setup/setup_netflow.php index fbecfa766d..e986f79244 100644 --- a/pandora_console/godmode/setup/setup_netflow.php +++ b/pandora_console/godmode/setup/setup_netflow.php @@ -46,12 +46,8 @@ $table->data[0][] = html_print_label_input_block( html_print_input_text('netflow_path', $config['netflow_path'], false, 50, 200, true) ); -$table->data[0][] = html_print_label_input_block( - __('Daemon interval'), - html_print_input_text('netflow_interval', $config['netflow_interval'], false, 50, 200, true) -); -$table->data[1][] = html_print_label_input_block( +$table->data[0][] = html_print_label_input_block( __('Daemon binary path'), html_print_input_text('netflow_daemon', $config['netflow_daemon'], false, 50, 200, true) ); @@ -61,7 +57,7 @@ $table->data[1][] = html_print_label_input_block( html_print_input_text('netflow_nfdump', $config['netflow_nfdump'], false, 50, 200, true) ); -$table->data[2][] = html_print_label_input_block( +$table->data[1][] = html_print_label_input_block( __('Nfexpire binary path'), html_print_input_text('netflow_nfexpire', $config['netflow_nfexpire'], false, 50, 200, true) ); @@ -71,7 +67,7 @@ $table->data[2][] = html_print_label_input_block( html_print_input_text('netflow_max_resolution', $config['netflow_max_resolution'], false, 50, 200, true) ); -$table->data[3][] = html_print_label_input_block( +$table->data[2][] = html_print_label_input_block( __('Disable custom live view filters'), html_print_checkbox_switch('netflow_disable_custom_lvfilters', 1, $config['netflow_disable_custom_lvfilters'], true) ); @@ -82,7 +78,7 @@ $table->data[3][] = html_print_label_input_block( ); $onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;"; -$table->data[4][] = html_print_label_input_block( +$table->data[3][] = html_print_label_input_block( __('Name resolution for IP address'), html_print_checkbox_switch_extended('netflow_get_ip_hostname', 1, $config['netflow_get_ip_hostname'], false, $onclick, '', true) ); diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 057572a863..ce5cae371b 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -1505,10 +1505,6 @@ function config_update_config() $error_update[] = __('Data storage path'); } - if (config_update_value('netflow_interval', (int) get_parameter('netflow_interval'), true) === false) { - $error_update[] = __('Daemon interval'); - } - if (config_update_value('netflow_daemon', get_parameter('netflow_daemon'), true) === false) { $error_update[] = __('Daemon binary path'); } @@ -2778,10 +2774,6 @@ function config_process_config() config_update_value('netflow_path', $default); } - if (!isset($config['netflow_interval'])) { - config_update_value('netflow_interval', SECONDS_10MINUTES); - } - if (!isset($config['netflow_daemon'])) { config_update_value('netflow_daemon', '/usr/bin/nfcapd'); } diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 5f08898b08..66c62da2f7 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -141,7 +141,7 @@ sub pandora_get_sharedconfig ($$) { # Netflow configuration options $pa_config->{"activate_netflow"} = pandora_get_tconfig_token ($dbh, 'activate_netflow', 0); $pa_config->{"netflow_path"} = pandora_get_tconfig_token ($dbh, 'netflow_path', '/var/spool/pandora/data_in/netflow'); - $pa_config->{"netflow_interval"} = pandora_get_tconfig_token ($dbh, 'netflow_interval', 300); + $pa_config->{"netflow_interval"} = pandora_get_tconfig_token ($dbh, 'netflow_interval', 3600); $pa_config->{"netflow_daemon"} = pandora_get_tconfig_token ($dbh, 'netflow_daemon', '/usr/bin/nfcapd'); # Log module configuration