Wip: trending prediction modules

This commit is contained in:
Calvo 2021-12-01 11:34:11 +01:00
parent 7d8a5b029e
commit a38503491a
3 changed files with 22 additions and 8 deletions

View File

@ -1788,7 +1788,7 @@ if ($update_module) {
"Fail to try update module '".io_safe_output($name)."' for agent ".io_safe_output($agent['alias']) "Fail to try update module '".io_safe_output($name)."' for agent ".io_safe_output($agent['alias'])
); );
} else { } else {
if ($prediction_module == 3) { if ($prediction_module == MODULE_PREDICTION_SYNTHETIC) {
enterprise_hook( enterprise_hook(
'modules_create_synthetic_operations', 'modules_create_synthetic_operations',
[ [
@ -1931,7 +1931,7 @@ if ($create_module) {
} }
} }
if ($prediction_module == 3 && $serialize_ops == '') { if ($prediction_module == MODULE_PREDICTION_SYNTHETIC && $serialize_ops == '') {
$id_agent_module = false; $id_agent_module = false;
} else { } else {
$id_agent_module = modules_create_agent_module( $id_agent_module = modules_create_agent_module(
@ -1972,7 +1972,7 @@ if ($create_module) {
"Fail to try added module '".io_safe_output($name)."' for agent ".io_safe_output($agent['alias']) "Fail to try added module '".io_safe_output($name)."' for agent ".io_safe_output($agent['alias'])
); );
} else { } else {
if ($prediction_module == 3) { if ($prediction_module == MODULE_PREDICTION_SYNTHETIC) {
enterprise_hook( enterprise_hook(
'modules_create_synthetic_operations', 'modules_create_synthetic_operations',
[ [

View File

@ -61,20 +61,29 @@ if ($row !== false && is_array($row)) {
if (isset($first_op[1]) && $first_op[1] == 'avg') { if (isset($first_op[1]) && $first_op[1] == 'avg') {
$selected = 'synthetic_selected';
} else {
$selected = 'synthetic_avg_selected'; $selected = 'synthetic_avg_selected';
} else {
$selected = 'synthetic_selected';
} }
$custom_integer_1 = 0; $custom_integer_1 = 0;
$custom_integer_2 = 0; $custom_integer_2 = 0;
break; break;
case MODULE_PREDICTION_TRENDING:
$selected = 'module_selected';
case MODULE_PREDICTION_MODULE:
$selected = 'trending_selected';
$prediction_module = $custom_integer_1;
break;
default: default:
$prediction_module = $custom_integer_1; $prediction_module = $custom_integer_1;
break; break;
} }
} else { } else {
$selected = 'module_selected';
$custom_integer_1 = 0; $custom_integer_1 = 0;
} }
@ -135,7 +144,8 @@ $params['use_hidden_input_idagent'] = true;
$params['hidden_input_idagent_id'] = 'hidden-id_agente_module_prediction'; $params['hidden_input_idagent_id'] = 'hidden-id_agente_module_prediction';
$data[1] .= ui_print_agent_autocomplete_input($params); $data[1] .= ui_print_agent_autocomplete_input($params);
$data[1] .= html_print_label(__('Module'), 'prediction_module', true); $data[1] .= '<br />';
$data[1] .= html_print_label(__('Module'), 'prediction_module', true).'<br />';
if ($id_agente) { if ($id_agente) {
$sql = 'SELECT id_agente_modulo, nombre $sql = 'SELECT id_agente_modulo, nombre
FROM tagente_modulo FROM tagente_modulo
@ -156,6 +166,7 @@ if ($id_agente) {
$data[1] .= '<select id="prediction_module" name="custom_integer_1" disabled="disabled"><option value="0">Select an Agent first</option></select>'; $data[1] .= '<select id="prediction_module" name="custom_integer_1" disabled="disabled"><option value="0">Select an Agent first</option></select>';
} }
$data[1] .= '<br />';
$data[1] .= html_print_label(__('Period'), 'custom_integer_2', true).'<br/>'; $data[1] .= html_print_label(__('Period'), 'custom_integer_2', true).'<br/>';
$periods[0] = __('Weekly'); $periods[0] = __('Weekly');
@ -187,7 +198,6 @@ if ($synthetic_module_form !== ENTERPRISE_NOT_HOOK) {
$data[0] = ''; $data[0] = '';
$data[1] = $synthetic_module_form; $data[1] = $synthetic_module_form;
$table_simple->colspan['synthetic_module'][1] = 3;
push_table_simple($data, 'synthetic_module'); push_table_simple($data, 'synthetic_module');
} }
@ -214,7 +224,8 @@ unset($table_advanced->data[3]);
enterprise_hook( enterprise_hook(
'setup_services_synth', 'setup_services_synth',
[ [
$type, $selected,
$is_netflow,
$ops, $ops,
] ]
); );

View File

@ -368,12 +368,15 @@ define('MODULE_WUX', 8);
define('MODULE_WIZARD', 9); define('MODULE_WIZARD', 9);
// Type of Modules of Prediction. // Type of Modules of Prediction.
define('MODULE_PREDICTION_MODULE', 1);
define('MODULE_PREDICTION_SERVICE', 2); define('MODULE_PREDICTION_SERVICE', 2);
define('MODULE_PREDICTION_SYNTHETIC', 3); define('MODULE_PREDICTION_SYNTHETIC', 3);
define('MODULE_PREDICTION_NETFLOW', 4); define('MODULE_PREDICTION_NETFLOW', 4);
define('MODULE_PREDICTION_CLUSTER', 5); define('MODULE_PREDICTION_CLUSTER', 5);
define('MODULE_PREDICTION_CLUSTER_AA', 6); define('MODULE_PREDICTION_CLUSTER_AA', 6);
define('MODULE_PREDICTION_CLUSTER_AP', 7); define('MODULE_PREDICTION_CLUSTER_AP', 7);
define('MODULE_PREDICTION_TRENDING', 8);
// Forced agent OS ID for cluster agents. // Forced agent OS ID for cluster agents.
define('CLUSTER_OS_ID', 100); define('CLUSTER_OS_ID', 100);