diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c8687bd806..a5c51cf939 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-01 Junichi Satoh <junichi@rworks.jp>
+
+ * godmode/massive/massive_edit_modules.php: Improved to support
+ 'FF interval' and 'FF timeout'.
+
2014-05-31 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/configurar_agente.php,
diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index 7d246bd33d..15bab59200 100644
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -464,53 +464,58 @@ $table->data['edit7'][1] .= __('To normal') . html_print_input_text ('min_ff_eve
$table->data['edit7'][1] .= __('To warning') . html_print_input_text ('min_ff_event_warning', '', '', 5, 15, true) . ' ';
$table->data['edit7'][1] .= __('To critical') . html_print_input_text ('min_ff_event_critical', '', '', 5, 15, true) . ' ';
-$table->data['edit8'][0] = __('Historical data');
-$table->data['edit8'][1] = html_print_select(array('' => __('No change'), '1' => __('Yes'), '0' => __('No')),'history_data','','','', '', true);
+$table->data['edit8'][0] = __('FF interval');
+$table->data['edit8'][1] = html_print_input_text ('module_ff_interval', '', '', 5, 10, true) . ui_print_help_tip (__('Module execution flip flop time interval (in secs).'), true);
+$table->data['edit8'][2] = __('FF timeout');
+$table->data['edit8'][3] = html_print_input_text ('ff_timeout', '', '', 5, 10, true).ui_print_help_tip (__('Timeout in secs from start of flip flop counting. If this value is exceeded, FF counter is reset. Set to 0 for no timeout.'), true);
+
+$table->data['edit9'][0] = __('Historical data');
+$table->data['edit9'][1] = html_print_select(array('' => __('No change'), '1' => __('Yes'), '0' => __('No')),'history_data','','','', '', true);
/* Tags avalaible */
$id_tag = array();
-$table->data['edit9'][0] = __('Tags');
-$table->data['edit9'][1] = html_print_select_from_sql ('SELECT id_tag, name FROM ttag ORDER BY name',
+$table->data['edit10'][0] = __('Tags');
+$table->data['edit10'][1] = html_print_select_from_sql ('SELECT id_tag, name FROM ttag ORDER BY name',
'id_tag[]', $id_tag, '',__('None'),'0', true, true, false, false);
-$table->data['edit9'][2] = __('Category');
-$table->data['edit9'][3] = html_print_select (categories_get_all_categories('forselect'), 'id_category', '','', __('No change'), '', true, false, false);
+$table->data['edit10'][2] = __('Category');
+$table->data['edit10'][3] = html_print_select (categories_get_all_categories('forselect'), 'id_category', '','', __('No change'), '', true, false, false);
if (enterprise_installed()) {
- $table->rowspan['edit9'][0] = $table->rowspan['edit9'][1] = 2;
+ $table->rowspan['edit10'][0] = $table->rowspan['edit10'][1] = 2;
- $table->data['edit91'][2] = __('Policy linking status') . ui_print_help_tip(__("This field only has sense in modules adopted by a policy."), true);
- $table->data['edit91'][3] = html_print_select (array(MODULE_PENDING_LINK => __('Linked'), MODULE_PENDING_UNLINK => __('Unlinked')), 'policy_linked', '','', __('No change'), '', true, false, false);
+ $table->data['edit101'][2] = __('Policy linking status') . ui_print_help_tip(__("This field only has sense in modules adopted by a policy."), true);
+ $table->data['edit101'][3] = html_print_select (array(MODULE_PENDING_LINK => __('Linked'), MODULE_PENDING_UNLINK => __('Unlinked')), 'policy_linked', '','', __('No change'), '', true, false, false);
}
-if ($table->rowspan['edit9'][0] == 2) {
- $table->rowspan['edit9'][0] = $table->rowspan['edit9'][1] = 3;
+if ($table->rowspan['edit10'][0] == 2) {
+ $table->rowspan['edit10'][0] = $table->rowspan['edit10'][1] = 3;
}
else {
- $table->rowspan['edit9'][0] = $table->rowspan['edit9'][1] = 2;
+ $table->rowspan['edit10'][0] = $table->rowspan['edit10'][1] = 2;
}
-$table->data['edit92'][2] = __('Throw unknown events');
+$table->data['edit102'][2] = __('Throw unknown events');
-$table->data['edit92'][3] = html_print_select(
+$table->data['edit102'][3] = html_print_select(
array('' => __('No change'),
'1' => __('Yes'),
'0' => __('No')),
'throw_unknown_events','','','', '', true);
-$table->data['edit11'][0] = '<b>'.__('Critical instructions'). '</b>'. ui_print_help_tip(__("Instructions when the status is critical"), true);
-$table->data['edit11'][1] = html_print_textarea ('critical_instructions', 2, 50, '', '', true);
-$table->colspan['edit11'][1] = 3;
-
-$table->data['edit12'][0] = '<b>'.__('Warning instructions'). '</b>'. ui_print_help_tip(__("Instructions when the status is warning"), true);
-$table->data['edit12'][1] = html_print_textarea ('warning_instructions', 2, 50, '', '', true);
+$table->data['edit12'][0] = '<b>'.__('Critical instructions'). '</b>'. ui_print_help_tip(__("Instructions when the status is critical"), true);
+$table->data['edit12'][1] = html_print_textarea ('critical_instructions', 2, 50, '', '', true);
$table->colspan['edit12'][1] = 3;
-$table->data['edit13'][0] = '<b>'.__('Unknown instructions').'</b>'. ui_print_help_tip(__("Instructions when the status is unknown"), true);
-$table->data['edit13'][1] = html_print_textarea ('unknown_instructions', 2, 50, '', '', true);
+$table->data['edit13'][0] = '<b>'.__('Warning instructions'). '</b>'. ui_print_help_tip(__("Instructions when the status is warning"), true);
+$table->data['edit13'][1] = html_print_textarea ('warning_instructions', 2, 50, '', '', true);
$table->colspan['edit13'][1] = 3;
-$table->data['edit10'][0] = __('Quiet');
-$table->data['edit10'][0] .= ui_print_help_tip(__('The module still store data but the alerts and events will be stop'), true);
-$table->data['edit10'][1] = html_print_select(array(-1 => __('No change'),
+$table->data['edit14'][0] = '<b>'.__('Unknown instructions').'</b>'. ui_print_help_tip(__("Instructions when the status is unknown"), true);
+$table->data['edit14'][1] = html_print_textarea ('unknown_instructions', 2, 50, '', '', true);
+$table->colspan['edit14'][1] = 3;
+
+$table->data['edit11'][0] = __('Quiet');
+$table->data['edit11'][0] .= ui_print_help_tip(__('The module still store data but the alerts and events will be stop'), true);
+$table->data['edit11'][1] = html_print_select(array(-1 => __('No change'),
1 => __('Yes'), 0 => __('No')),
"quiet_select", -1, "", '', 0, true);
@@ -583,12 +588,13 @@ $(document).ready (function () {
"tr#delete_table-edit7, " +
"tr#delete_table-edit8, " +
"tr#delete_table-edit9, " +
- "tr#delete_table-edit91, " +
- "tr#delete_table-edit92, " +
"tr#delete_table-edit10, " +
+ "tr#delete_table-edit101, " +
+ "tr#delete_table-edit102, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12, " +
- "tr#delete_table-edit13").hide ();
+ "tr#delete_table-edit13, " +
+ "tr#delete_table-edit14").hide ();
if (this.value == '0') {
filter = '';
@@ -636,12 +642,13 @@ $(document).ready (function () {
"tr#delete_table-edit7, " +
"tr#delete_table-edit8, " +
"tr#delete_table-edit9, " +
- "tr#delete_table-edit91, " +
- "tr#delete_table-edit92, " +
"tr#delete_table-edit10, " +
+ "tr#delete_table-edit101, " +
+ "tr#delete_table-edit102, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12, " +
- "tr#delete_table-edit13").show ();
+ "tr#delete_table-edit13, " +
+ "tr#delete_table-edit14").show ();
}
function clean_lists() {
@@ -663,12 +670,13 @@ $(document).ready (function () {
"tr#delete_table-edit7, " +
"tr#delete_table-edit8, " +
"tr#delete_table-edit9, " +
- "tr#delete_table-edit91, " +
- "tr#delete_table-edit92, " +
"tr#delete_table-edit10, " +
+ "tr#delete_table-edit101, " +
+ "tr#delete_table-edit102, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12, " +
- "tr#delete_table-edit13").hide ();
+ "tr#delete_table-edit13, " +
+ "tr#delete_table-edit14").hide ();
$('input[type=checkbox]').attr('checked', false);
$('input[type=checkbox]').attr('disabled', true);
@@ -691,7 +699,8 @@ $(document).ready (function () {
"tr#delete_table-edit6, " +
"tr#delete_table-edit7, " +
"tr#delete_table-edit8, " +
- "tr#delete_table-edit9").show ();
+ "tr#delete_table-edit9, " +
+ "tr#delete_table-edit10").show ();
}
else {
$(".select_modules_row_2").css('display', '');
@@ -707,12 +716,13 @@ $(document).ready (function () {
"tr#delete_table-edit7, " +
"tr#delete_table-edit8, " +
"tr#delete_table-edit9, " +
- "tr#delete_table-edit91, " +
- "tr#delete_table-edit92, " +
"tr#delete_table-edit10, " +
+ "tr#delete_table-edit101, " +
+ "tr#delete_table-edit102, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12, " +
- "tr#delete_table-edit13").hide ();
+ "tr#delete_table-edit13, " +
+ "tr#delete_table-edit14").hide ();
}
}
}
@@ -744,12 +754,13 @@ $(document).ready (function () {
"tr#delete_table-edit7, " +
"tr#delete_table-edit8, " +
"tr#delete_table-edit9, " +
- "tr#delete_table-edit91, " +
- "tr#delete_table-edit92, " +
"tr#delete_table-edit10, " +
+ "tr#delete_table-edit101, " +
+ "tr#delete_table-edit102, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12, " +
- "tr#delete_table-edit13").show ();
+ "tr#delete_table-edit13, " +
+ "tr#delete_table-edit14").show ();
}
else {
$(".select_agents_row_2").css('display', '');
@@ -765,12 +776,13 @@ $(document).ready (function () {
"tr#delete_table-edit7, " +
"tr#delete_table-edit8, " +
"tr#delete_table-edit9, " +
- "tr#delete_table-edit91, " +
- "tr#delete_table-edit92, " +
"tr#delete_table-edit10, " +
+ "tr#delete_table-edit101, " +
+ "tr#delete_table-edit102, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12, " +
- "tr#delete_table-edit13").hide ();
+ "tr#delete_table-edit13, " +
+ "tr#delete_table-edit14").hide ();
}
}
}
@@ -829,12 +841,13 @@ $(document).ready (function () {
"tr#delete_table-edit7, " +
"tr#delete_table-edit8, " +
"tr#delete_table-edit9, " +
- "tr#delete_table-edit91, " +
- "tr#delete_table-edit92, " +
"tr#delete_table-edit10, " +
+ "tr#delete_table-edit101, " +
+ "tr#delete_table-edit102, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12, " +
- "tr#delete_table-edit13").hide ();
+ "tr#delete_table-edit13, " +
+ "tr#delete_table-edit14").hide ();
jQuery.post ("ajax.php",
{"page" : "operation/agentes/ver_agente",
@@ -894,7 +907,7 @@ function process_manage_edit ($module_name, $agents_select = null) {
'warning_instructions', 'unknown_instructions', 'policy_linked',
'id_category', 'disabled_types_event', 'ip_target', 'descripcion',
'min_ff_event_normal', 'min_ff_event_warning', 'min_ff_event_critical',
- 'each_ff');
+ 'each_ff', 'module_ff_interval', 'ff_timeout');
$values = array ();
// Specific snmp reused fields