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

Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop' 

Unified default netflow interval and deleted from console setup

See merge request artica/pandorafms!5614
This commit is contained in:
Matias Didier 2023-03-30 12:39:06 +00:00
parent ca3ad36fb6 284e20fc8a
commit 9344bd16c9
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/godmode/setup/setup_netflow.php
View File

@ -46,12 +46,8 @@ $table->data[0][] = html_print_label_input_block(
html_print_input_text('netflow_name_dir', $config['netflow_name_dir'], 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)
);

8
pandora_console/include/functions_config.php
View File

@ -1540,10 +1540,6 @@ function config_update_config()
}
}
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');
}
@ -2886,10 +2882,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');
}

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

@ -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');
# Sflow configuration options