).
+ * @param string $thrash3 Don't use.
+ * @example: api.php?op=set&op2=create_network_module&id=pepito&other=prueba|0|7|1|10|15|0|16|18|0|15|0|www.google.es|0||0|180|0|0|0|0|latency%20ping&other_mode=url_encode_separator_|*
+ * @return mixed Return.
*/
function api_set_create_network_module($id, $thrash1, $other, $thrash3)
{
@@ -3090,22 +3106,23 @@ function api_set_create_network_module($id, $thrash1, $other, $thrash3)
'min_ff_event_critical' => $other['data'][27],
'critical_inverse' => $other['data'][28],
'warning_inverse' => $other['data'][29],
+ 'ff_type' => $other['data'][30],
];
if (! $values['descripcion']) {
$values['descripcion'] = '';
- // Column 'descripcion' cannot be null
+ // Column 'descripcion' cannot be null.
}
if (! $values['module_macros']) {
$values['module_macros'] = '';
- // Column 'module_macros' cannot be null
+ // Column 'module_macros' cannot be null.
}
$idModule = modules_create_agent_module($idAgent, $name, $values, true);
if (is_error($idModule)) {
- // TODO: Improve the error returning more info
+ // TODO: Improve the error returning more info.
returnError('error_create_network_module', __('Error in creation network module.'));
} else {
returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -3222,6 +3239,7 @@ function api_set_update_network_module($id_module, $thrash1, $other, $thrash3)
'critical_inverse',
'warning_inverse',
'policy_linked',
+ 'ff_type',
];
$values = [];
@@ -3326,22 +3344,23 @@ function api_set_create_plugin_module($id, $thrash1, $other, $thrash3)
'min_ff_event_critical' => $other['data'][32],
'critical_inverse' => $other['data'][33],
'warning_inverse' => $other['data'][34],
+ 'ff_type' => $other['data'][35],
];
if (! $values['descripcion']) {
$values['descripcion'] = '';
- // Column 'descripcion' cannot be null
+ // Column 'descripcion' cannot be null.
}
if (! $values['module_macros']) {
$values['module_macros'] = '';
- // Column 'module_macros' cannot be null
+ // Column 'module_macros' cannot be null.
}
$idModule = modules_create_agent_module($idAgent, $name, $values, true);
if (is_error($idModule)) {
- // TODO: Improve the error returning more info
+ // TODO: Improve the error returning more info.
returnError('error_create_plugin_module', __('Error in creation plugin module.'));
} else {
returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -3387,7 +3406,7 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
return;
}
- // If we want to change the module to a new agent
+ // If we want to change the module to a new agent.
if ($other['data'][0] != '') {
if (!util_api_check_agent_and_print_error($other['data'][0], 'string', 'AW')) {
return;
@@ -3404,7 +3423,7 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
}
}
- // Check if agent exists
+ // Check if agent exists.
$check_id_agent = db_get_value('id_agente', 'tagente', 'id_agente', $other['data'][0]);
if (!$check_id_agent) {
returnError('error_update_data_module', __('Error updating plugin module. Id_agent doesn\'t exist.'));
@@ -3448,6 +3467,7 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
'critical_inverse',
'warning_inverse',
'policy_linked',
+ 'ff_type',
];
$values = [];
@@ -3546,22 +3566,23 @@ function api_set_create_data_module($id, $thrash1, $other, $thrash3)
'ff_timeout' => $other['data'][23],
'critical_inverse' => $other['data'][24],
'warning_inverse' => $other['data'][25],
+ 'ff_type' => $other['data'][26],
];
if (! $values['descripcion']) {
$values['descripcion'] = '';
- // Column 'descripcion' cannot be null
+ // Column 'descripcion' cannot be null.
}
if (! $values['module_macros']) {
$values['module_macros'] = '';
- // Column 'module_macros' cannot be null
+ // Column 'module_macros' cannot be null.
}
$idModule = modules_create_agent_module($idAgent, $name, $values, true);
if (is_error($idModule)) {
- // TODO: Improve the error returning more info
+ // TODO: Improve the error returning more info.
returnError('error_create_data_module', __('Error in creation data module.'));
} else {
returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -3818,7 +3839,7 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
return;
}
- // If we want to change the module to a new agent
+ // If we want to change the module to a new agent.
if ($other['data'][0] != '') {
if (!util_api_check_agent_and_print_error($other['data'][0], 'string', 'AW')) {
return;
@@ -3835,7 +3856,7 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
}
}
- // Check if agent exists
+ // Check if agent exists.
$check_id_agent = db_get_value('id_agente', 'tagente', 'id_agente', $other['data'][0]);
if (!$check_id_agent) {
returnError('error_update_data_module', __('Error updating data module. Id_agent doesn\'t exist.'));
@@ -3870,6 +3891,7 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
'critical_inverse',
'warning_inverse',
'policy_linked',
+ 'ff_type',
];
$values = [];
@@ -3947,7 +3969,7 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
$disabled_types_event[EVENTS_GOING_UNKNOWN] = (int) !$other['data'][27];
$disabled_types_event = json_encode($disabled_types_event);
- // SNMP version 3
+ // SNMP version 3.
if ($other['data'][14] == '3') {
if ($other['data'][23] != 'AES' and $other['data'][23] != 'DES') {
returnError('error_create_snmp_module', __('Error in creation SNMP module. snmp3_priv_method doesn\'t exist. Set it to \'AES\' or \'DES\'. '));
@@ -4000,6 +4022,7 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
'min_ff_event_normal' => $other['data'][31],
'min_ff_event_warning' => $other['data'][32],
'min_ff_event_critical' => $other['data'][33],
+ 'ff_type' => $other['data'][34],
];
} else {
$values = [
@@ -4032,18 +4055,19 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
'min_ff_event_normal' => $other['data'][25],
'min_ff_event_warning' => $other['data'][26],
'min_ff_event_critical' => $other['data'][27],
+ 'ff_type' => $other['data'][28],
];
}
if (! $values['descripcion']) {
$values['descripcion'] = '';
- // Column 'descripcion' cannot be null
+ // Column 'descripcion' cannot be null.
}
$idModule = modules_create_agent_module($idAgent, $name, $values, true);
if (is_error($idModule)) {
- // TODO: Improve the error returning more info
+ // TODO: Improve the error returning more info.
returnError('error_create_snmp_module', __('Error in creation SNMP module.'));
} else {
returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -4091,7 +4115,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
return;
}
- // If we want to change the module to a new agent
+ // If we want to change the module to a new agent.
if ($other['data'][0] != '') {
if (!util_api_check_agent_and_print_error($other['data'][0], 'string', 'AW')) {
return;
@@ -4108,7 +4132,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
}
}
- // Check if agent exists
+ // Check if agent exists.
$check_id_agent = db_get_value('id_agente', 'tagente', 'id_agente', $other['data'][0]);
if (!$check_id_agent) {
returnError('error_update_data_module', __('Error updating snmp module. Id_agent doesn\'t exist.'));
@@ -4116,7 +4140,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
}
}
- // SNMP version 3
+ // SNMP version 3.
if ($other['data'][13] == '3') {
if ($other['data'][22] != 'AES' and $other['data'][22] != 'DES') {
returnError(
@@ -4180,6 +4204,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
'min_ff_event_warning',
'min_ff_event_critical',
'policy_linked',
+ 'ff_type',
];
} else {
$snmp_module_fields = [
@@ -4211,6 +4236,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
'min_ff_event_warning',
'min_ff_event_critical',
'policy_linked',
+ 'ff_type',
];
}
@@ -4308,6 +4334,7 @@ function api_set_new_network_component($id, $thrash1, $other, $thrash2)
'min_ff_event_normal' => $other['data'][20],
'min_ff_event_warning' => $other['data'][21],
'min_ff_event_critical' => $other['data'][22],
+ 'ff_type' => $other['data'][23],
];
$name_check = db_get_value('name', 'tnetwork_component', 'name', $id);
@@ -4408,6 +4435,7 @@ function api_set_new_plugin_component($id, $thrash1, $other, $thrash2)
'min_ff_event_normal' => $other['data'][24],
'min_ff_event_warning' => $other['data'][25],
'min_ff_event_critical' => $other['data'][26],
+ 'ff_type' => $other['data'][27],
];
$name_check = db_get_value('name', 'tnetwork_component', 'name', $id);
@@ -4543,6 +4571,7 @@ function api_set_new_snmp_component($id, $thrash1, $other, $thrash2)
'min_ff_event_normal' => $other['data'][29],
'min_ff_event_warning' => $other['data'][30],
'min_ff_event_critical' => $other['data'][31],
+ 'ff_type' => $other['data'][32],
];
} else {
$values = [
@@ -4574,6 +4603,7 @@ function api_set_new_snmp_component($id, $thrash1, $other, $thrash2)
'min_ff_event_normal' => $other['data'][25],
'min_ff_event_warning' => $other['data'][26],
'min_ff_event_critical' => $other['data'][27],
+ 'ff_type' => $other['data'][28],
];
}
@@ -4654,6 +4684,7 @@ function api_set_new_local_component($id, $thrash1, $other, $thrash2)
'min_ff_event_warning' => $other['data'][8],
'min_ff_event_critical' => $other['data'][9],
'ff_timeout' => $other['data'][10],
+ 'ff_type' => $other['data'][11],
];
$name_check = enterprise_hook(
@@ -6409,6 +6440,7 @@ function api_set_add_data_module_policy($id, $thrash1, $other, $thrash3)
$values['min_ff_event_warning'] = $other['data'][21];
$values['min_ff_event_critical'] = $other['data'][22];
$values['ff_timeout'] = $other['data'][23];
+ $values['ff_type'] = $other['data'][24];
if ($name_module_policy !== false) {
if ($name_module_policy[0]['name'] == $other['data'][0]) {
@@ -6650,6 +6682,7 @@ function api_set_add_network_module_policy($id, $thrash1, $other, $thrash3)
$values['min_ff_event_normal'] = $other['data'][24];
$values['min_ff_event_warning'] = $other['data'][25];
$values['min_ff_event_critical'] = $other['data'][26];
+ $values['ff_type'] = $other['data'][27];
if ($name_module_policy !== false) {
if ($name_module_policy[0]['name'] == $other['data'][0]) {
@@ -6859,6 +6892,7 @@ function api_set_add_plugin_module_policy($id, $thrash1, $other, $thrash3)
$values['min_ff_event_normal'] = $other['data'][29];
$values['min_ff_event_warning'] = $other['data'][30];
$values['min_ff_event_critical'] = $other['data'][31];
+ $values['ff_type'] = $other['data'][32];
if ($name_module_policy !== false) {
if ($name_module_policy[0]['name'] == $other['data'][0]) {
@@ -7276,6 +7310,7 @@ function api_set_add_snmp_module_policy($id, $thrash1, $other, $thrash3)
'min_ff_event_normal' => $other['data'][30],
'min_ff_event_warning' => $other['data'][31],
'min_ff_event_critical' => $other['data'][32],
+ 'ff_type' => $other['data'][33],
];
} else {
$values = [
@@ -7305,6 +7340,7 @@ function api_set_add_snmp_module_policy($id, $thrash1, $other, $thrash3)
'min_ff_event_normal' => $other['data'][24],
'min_ff_event_warning' => $other['data'][25],
'min_ff_event_critical' => $other['data'][26],
+ 'ff_type' => $other['data'][27],
];
}
@@ -11615,7 +11651,9 @@ function api_set_add_event_comment($id, $thrash2, $other, $thrash3)
global $config;
if (defined('METACONSOLE')) {
- return;
+ $meta = true;
+ } else {
+ $meta = $other['data'][1];
}
if (!check_acl($config['id_user'], 0, 'EW')) {
@@ -11627,8 +11665,7 @@ function api_set_add_event_comment($id, $thrash2, $other, $thrash3)
returnError('error_parameter', 'Error in the parameters.');
return;
} else if ($other['type'] == 'array') {
- $comment = io_safe_input($other['data'][0]);
- $meta = $other['data'][1];
+ $comment = $other['data'][0];
$history = $other['data'][2];
$status = events_comment(
@@ -13275,6 +13312,7 @@ function api_set_apply_module_template($id_template, $id_agent, $thrash3, $thras
'min_ff_event_normal' => $row2['min_ff_event_normal'],
'min_ff_event_warning' => $row2['min_ff_event_warning'],
'min_ff_event_critical' => $row2['min_ff_event_critical'],
+ 'ff_type' => $row2['ff_type'],
];
$name = $row2['name'];
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 4a24d5a964..30b86478f8 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2744,28 +2744,7 @@ function html_print_autocomplete_modules(
global $config;
if ($id_agents === false) {
- $groups = [];
- if ($ACL) {
- $groups = users_get_groups($config['id_user'], 'AW', false);
- $groups = array_keys($groups);
-
- if (empty($groups)) {
- $id_groups = 0;
- } else {
- $id_groups = implode(',', $groups);
- }
-
- $agents = db_get_all_rows_sql(
- 'SELECT id_agente
- FROM tagente
- WHERE id_grupo IN ('.$id_groups.')'
- );
- } else {
- $agents = db_get_all_rows_sql(
- 'SELECT id_agente
- FROM tagente'
- );
- }
+ $agents = agents_get_agents();
if ($agents === false) {
$agents = [];
@@ -2777,10 +2756,7 @@ function html_print_autocomplete_modules(
}
} else {
if ($ACL) {
- $groups = users_get_groups($config['id_user'], 'AW', false);
- $groups = array_keys($groups);
-
- $agents = db_get_all_rows_sql('SELECT id_agente FROM tagente WHERE id_grupo IN ('.implode(',', $groups).')');
+ $agents = agents_get_agents();
if ($agents === false) {
$agents = [];
diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js
index e835f87c24..d6a8e1bfe0 100644
--- a/pandora_console/include/javascript/pandora_modules.js
+++ b/pandora_console/include/javascript/pandora_modules.js
@@ -1,3 +1,8 @@
+/*
+ global $
+ global jQuery
+*/
+
/* Modules ids to check types */
var id_modules_icmp = Array(6, 7);
var id_modules_tcp = Array(8, 9, 10, 11);
@@ -95,6 +100,7 @@ function configure_modules_form() {
$("#text-unit").attr("value", "");
$("#checkbox-critical_inverse").attr("value", 0);
$("#checkbox-warning_inverse").attr("value", 0);
+ $("#checkbox-ff_type").attr("value", 0);
$("#textarea_critical_instructions").attr("value", "");
$("#textarea_warning_instructions").attr("value", "");
$("#textarea_unknown_instructions").attr("value", "");
@@ -177,6 +183,13 @@ function configure_modules_form() {
"value",
data["min_ff_event"] == 0 ? 0 : data["min_ff_event"]
);
+
+ if (data["ff_type"] != 0) {
+ $("#checkbox-ff_type").prop("checked", 1);
+ } else {
+ $("#checkbox-ff_type").prop("checked", 0);
+ }
+
$("#text-post_process").attr(
"value",
data["post_process"] == 0 ? 0 : data["post_process"]
@@ -413,6 +426,12 @@ function configure_modules_form() {
data["min_ff_event_critical"] == 0 ? 0 : data["min_ff_event_critical"]
);
+ if (data["ff_type"] != 0) {
+ $("#checkbox-ff_type").prop("checked", 1);
+ } else {
+ $("#checkbox-ff_type").prop("checked", 0);
+ }
+
// Shows manual input if post_process field is setted
if (data["post_process"] != 0) {
$("#post_process_manual").show();
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b7d52c5106..454ee879b9 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
{'module_interval'};
}
- #Update module status
+ # Update module status.
my $min_ff_event = $module->{'min_ff_event'};
my $current_utimestamp = time ();
my $ff_timeout = $module->{'ff_timeout'};
+ # Counters.
+ my $ff_warning = $agent_status->{'ff_warning'};
+ my $ff_critical = $agent_status->{'ff_critical'};
+ my $ff_normal = $agent_status->{'ff_normal'};
+
if ($module->{'each_ff'}) {
$min_ff_event = $module->{'min_ff_event_normal'} if ($new_status == 0);
$min_ff_event = $module->{'min_ff_event_critical'} if ($new_status == 1);
$min_ff_event = $module->{'min_ff_event_warning'} if ($new_status == 2);
}
-
+
if ($last_known_status == $new_status) {
# Avoid overflows
- $status_changes = $min_ff_event if ($status_changes > $min_ff_event);
+ $status_changes = $min_ff_event if ($status_changes > $min_ff_event && $module->{'ff_type'} == 0);
$status_changes++;
if ($module_type =~ m/async/ && $min_ff_event != 0 && $ff_timeout != 0 && ($utimestamp - $ff_start_utimestamp) > $ff_timeout) {
- $status_changes = 0;
+ # Only type ff with counters.
+ $status_changes = 0 if ($module->{'ff_type'} == 0);
+
$ff_start_utimestamp = $utimestamp;
+
+ # Reset counters because expired timeout.
+ $ff_normal = 0;
+ $ff_critical = 0;
+ $ff_warning = 0;
}
}
else {
- $status_changes = 0;
+ # Only type ff with counters.
+ $status_changes = 0 if ($module->{'ff_type'} == 0);
+
$ff_start_utimestamp = $utimestamp if ($module_type =~ m/async/);
}
- # Active ff interval
- if ($module->{'module_ff_interval'} != 0 && $status_changes < $min_ff_event) {
- $current_interval = $module->{'module_ff_interval'};
- }
-
- # Change status
- if ($status_changes >= $min_ff_event && $known_status != $new_status) {
- generate_status_event ($pa_config, $processed_data, $agent, $module, $new_status, $status, $known_status, $dbh);
- $status = $new_status;
+ if ($module->{'ff_type'} == 0) {
+ # Active ff interval.
+ if ($module->{'module_ff_interval'} != 0 && $status_changes < $min_ff_event) {
+ $current_interval = $module->{'module_ff_interval'};
+ }
+
+ # Change status.
+ if ($status_changes >= $min_ff_event && $known_status != $new_status) {
+ generate_status_event ($pa_config, $processed_data, $agent, $module, $new_status, $status, $known_status, $dbh);
+ $status = $new_status;
- # Update module status count.
- $mark_for_update = 1;
+ # Update module status count.
+ $mark_for_update = 1;
- # Safe mode execution.
- if ($agent->{'safe_mode_module'} == $module->{'id_agente_modulo'}) {
- safe_mode($pa_config, $agent, $module, $new_status, $known_status, $dbh);
+ # Safe mode execution.
+ if ($agent->{'safe_mode_module'} == $module->{'id_agente_modulo'}) {
+ safe_mode($pa_config, $agent, $module, $new_status, $known_status, $dbh);
+ }
+ }
+ } else {
+ if ($status == $new_status) {
+ # If the status is equal to the previous status reset the counters.
+ $ff_normal = 0;
+ $ff_critical = 0;
+ $ff_warning = 0;
+ } else {
+ # Sequential critical and normal status are needed
+ # if don't, reset counters.
+ if ($last_known_status == 1 && $new_status != 1) {
+ $ff_critical = 0;
+ } elsif ($last_known_status == 0 && $new_status != 0) {
+ $ff_normal = 0;
+ }
+
+ # Increase counters.
+ $ff_critical++ if ($new_status == 1);
+ $ff_warning++ if ($new_status == 2);
+ $ff_normal++ if ($new_status == 0);
+ }
+
+ if ( ($new_status == 0 && $ff_normal >= $min_ff_event)
+ || ($new_status == 1 && $ff_critical >= $min_ff_event)
+ || ($new_status == 2 && $ff_warning >= $min_ff_event)) {
+ # Change status generate event.
+ generate_status_event ($pa_config, $processed_data, $agent, $module, $new_status, $status, $known_status, $dbh);
+ $status = $new_status;
+
+ # Update module status count.
+ $mark_for_update = 1;
+
+ # Safe mode execution.
+ if ($agent->{'safe_mode_module'} == $module->{'id_agente_modulo'}) {
+ safe_mode($pa_config, $agent, $module, $new_status, $known_status, $dbh);
+ }
+
+ # Reset counters because change status.
+ $ff_normal = 0;
+ $ff_critical = 0;
+ $ff_warning = 0;
+ } else {
+ # Active ff interval
+ if ($module->{'module_ff_interval'} != 0) {
+ $current_interval = $module->{'module_ff_interval'};
+ }
}
}
+
# Set not-init modules to normal status even if min_ff_event is not matched the first time they receive data.
# if critical or warning status, just pass through here and wait the time min_ff_event will be matched.
- elsif ($status == 4) {
+ if ($status == 4) {
generate_status_event ($pa_config, $processed_data, $agent, $module, 0, $status, $known_status, $dbh);
$status = 0;
@@ -1663,6 +1726,11 @@ sub pandora_process_module ($$$$$$$$$;$) {
generate_status_event ($pa_config, $processed_data, $agent, $module, $known_status, $status, $known_status, $dbh);
$status = $known_status;
+ # reset counters because change status.
+ $ff_normal = 0;
+ $ff_critical = 0;
+ $ff_warning = 0;
+
# Update module status count.
$mark_for_update = 1;
}
@@ -1692,10 +1760,11 @@ sub pandora_process_module ($$$$$$$$$;$) {
status_changes = ?, utimestamp = ?, timestamp = ?,
id_agente = ?, current_interval = ?, running_by = ?,
last_execution_try = ?, last_try = ?, last_error = ?,
- ff_start_utimestamp = ?
+ ff_start_utimestamp = ?, ff_normal = ?, ff_warning = ?, ff_critical = ?
WHERE id_agente_modulo = ?', $processed_data, $status, $status, $new_status, $new_status, $status_changes,
$current_utimestamp, $timestamp, $module->{'id_agente'}, $current_interval, $server_id,
- $utimestamp, ($save == 1) ? $timestamp : $agent_status->{'last_try'}, $last_error, $ff_start_utimestamp, $module->{'id_agente_modulo'});
+ $utimestamp, ($save == 1) ? $timestamp : $agent_status->{'last_try'}, $last_error, $ff_start_utimestamp,
+ $ff_normal, $ff_warning, $ff_critical, $module->{'id_agente_modulo'});
}
# Save module data. Async and log4x modules are not compressed.
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index bc66eb2d72..8e08a7d482 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -641,7 +641,7 @@ sub process_module_data ($$$$$$$$$$) {
'unknown_instructions' => '', 'tags' => '', 'critical_inverse' => 0, 'warning_inverse' => 0, 'quiet' => 0,
'module_ff_interval' => 0, 'alert_template' => '', 'crontab' => '', 'min_ff_event_normal' => 0,
'min_ff_event_warning' => 0, 'min_ff_event_critical' => 0, 'ff_timeout' => 0, 'each_ff' => 0, 'module_parent' => 0,
- 'module_parent_unlink' => 0, 'cron_interval' => 0};
+ 'module_parent_unlink' => 0, 'cron_interval' => 0, 'ff_type' => 0};
# Other tags will be saved here
$module_conf->{'extended_info'} = '';
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index cfedeced72..6615be65a7 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.733";
-my $pandora_build = "190405";
+my $pandora_build = "190410";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
@@ -721,6 +721,9 @@ sub print_module {
if (! (empty ($data->{min_ff_event_critical}))) {
$xml_module .= "\t{min_ff_event_critical} . "]]>\n";
}
+ if (! (empty ($data->{ff_type}))) {
+ $xml_module .= "\t{ff_type} . "]]>\n";
+ }
if (! (empty ($data->{ff_timeout}))) {
$xml_module .= "\t{ff_timeout} . "]]>\n";
}
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 4176856dfe..2fa2a2ccfc 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.733
-%define release 190405
+%define release 190410
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6b55058a13..02befd3046 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.733
-%define release 190405
+%define release 190410
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 961e2132c0..f4def92b06 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.733"
-PI_BUILD="190405"
+PI_BUILD="190410"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 0fadb363c7..56dad39390 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.733 PS190405";
+my $version = "7.0NG.733 PS190410";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 9c2a3f5047..b0715d5029 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "7.0NG.733 PS190405";
+my $version = "7.0NG.733 PS190410";
# save program name for logging
my $progname = basename($0);