Added a new feature to the alert template.

It allows to reset minimum number of alert when the alert status is not
continuously.

pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql

@@ -0,0 +1,5 @@
+-- ---------------------------------------------------------------------
+-- Table `talert_templates`
+-- ---------------------------------------------------------------------
+
+ALTER TABLE talert_templates ADD COLUMN `min_alerts_reset_counter` tinyint(1) DEFAULT 0;

pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql

@@ -0,0 +1,5 @@
+-- ---------------------------------------------------------------------
+-- Table `talert_templates`
+-- ---------------------------------------------------------------------
+
+ALTER TABLE talert_templates ADD COLUMN min_alerts_reset_counter NUMBER(5, 0) DEFAULT 0;

pandora_console/godmode/alerts/configure_alert_template.php

@@ -255,6 +255,7 @@ function update_template ($step) {
 		$threshold = (int) get_parameter ('threshold');
 		$max_alerts = (int) get_parameter ('max_alerts');
 		$min_alerts = (int) get_parameter ('min_alerts');
+		$min_alerts_reset_counter = (int) get_parameter ('min_alerts_reset_counter');
 		$type = (string) get_parameter ('type');
 		$value = (string) html_entity_decode (get_parameter ('value'));
 		$max = (float) get_parameter ('max');
@@ -279,6 +280,7 @@ function update_template ($step) {
 			'id_alert_action' => $default_action,
 			'max_alerts' => $max_alerts,
 			'min_alerts' => $min_alerts,
+			'min_alerts_reset_counter' => $min_alerts_reset_counter,
 			'type' => $type,
 			'value' => $value,
 			'max_value' => $max,
@@ -360,6 +362,7 @@ for ($i = 1; $i <= 10; $i++) {
 }
 $priority = 1;
 $min_alerts = 0;
+$min_alerts_reset_counter = 0;
 $max_alerts = 1;
 $threshold = SECONDS_1DAY;
 $recovery_notify = false;
@@ -467,6 +470,7 @@ if ($id && ! $create_template) {
 	$special_day = (bool) $template['special_day'];
 	$max_alerts = $template['max_alerts'];
 	$min_alerts = $template['min_alerts'];
+	$min_alerts_reset_counter = $template['min_alerts_reset_counter'];
 	$threshold = $template['time_threshold'];
 	$fields = array();
 	for ($i = 1; $i <= 10; $i++) {
@@ -549,11 +553,15 @@ if ($step == 2) {
 	$table->data[3][0] = __('Min. number of alerts');
 	$table->data[3][1] = html_print_input_text ('min_alerts',
 		$min_alerts, '', 5, 7, true);
-	$table->data[3][2] = __('Max. number of alerts');
-	$table->data[3][3] = html_print_input_text ('max_alerts',
+
+	$table->data[3][2] = __('Reset counter when alert is not continuously') . ui_print_help_tip(__('Enable this option if you want to reset the counter for minimum number of alerts when the alert state is not continuously even if it\'s in the time threshold.'), true);;
+	$table->data[3][3] = html_print_checkbox ('min_alerts_reset_counter', 1, $min_alerts_reset_counter, true);
+
+	$table->data[4][0] = __('Max. number of alerts');
+	$table->data[4][1] = html_print_input_text ('max_alerts',
 		$max_alerts, '', 5, 7, true);
 	
-	$table->data[4][0] = __('Default action');
+	$table->data[5][0] = __('Default action');
 	$usr_groups = implode(',', array_keys(users_get_groups($config['id_user'], 'LM', true)));
 	switch ($config['dbtype']) {
 		case "mysql":
@@ -573,23 +581,23 @@ if ($step == 2) {
 				ORDER BY dbms_lob.substr(name,4000,1)', $usr_groups);
 			break;
 	}
-	$table->data[4][1] = html_print_select_from_sql ($sql_query,
+	$table->data[5][1] = html_print_select_from_sql ($sql_query,
 			'default_action', $default_action, '', __('None'), 0,
 			true, false, false, false, false, false, 0) .
 		ui_print_help_tip (
 			__('In case you fill any Field 1, Field 2 or Field 3 above, those will replace the corresponding fields of this associated "Default action".'), true);
 	
-	$table->data[5][0] = __('Condition type');
-	$table->data[5][1] = html_print_select (alerts_get_alert_templates_types (), 'type',
+	$table->data[6][0] = __('Condition type');
+	$table->data[6][1] = html_print_select (alerts_get_alert_templates_types (), 'type',
 		$type, '', __('Select'), 0, true, false, false);
-	$table->data[5][1] .= '<span id="matches_value" ' .
+	$table->data[6][1] .= '<span id="matches_value" ' .
 		($show_matches ? '' : 'style="display: none"').'>';
-	$table->data[5][1] .= '&nbsp;'.html_print_checkbox ('matches_value', 1, $matches, true);
-	$table->data[5][1] .= html_print_label(
+	$table->data[6][1] .= '&nbsp;'.html_print_checkbox ('matches_value', 1, $matches, true);
+	$table->data[6][1] .= html_print_label(
 		__('Trigger when matches the value'),
 		'checkbox-matches_value', true);
-	$table->data[5][1] .= '</span>';
-	$table->colspan[5][1] = 3;
+	$table->data[6][1] .= '</span>';
+	$table->colspan[6][1] = 3;
 	
 	$table->data['value'][0] = __('Value');
 	$table->data['value'][1] = html_print_input_text ('value', $value, '',

pandora_console/pandoradb.oracle.sql

@@ -490,6 +490,7 @@ CREATE TABLE talert_templates (
 	id_group NUMBER(10, 0) DEFAULT 0, 
 	special_day NUMBER(5, 0) DEFAULT 0,
 	wizard_level VARCHAR2(100) DEFAULT 'nowizard',
+	min_alerts_reset_counter NUMBER(5, 0) DEFAULT 0,
 	CONSTRAINT t_alert_templates_type_cons CHECK (type IN ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown', 'always')),
 	CONSTRAINT t_alert_templates_wizard_cons CHECK (wizard_level IN ('basic','advanced','nowizard'))
 );

pandora_console/pandoradb.sql

@@ -441,6 +441,7 @@ CREATE TABLE IF NOT EXISTS `talert_templates` (
 	`id_group` mediumint(8) unsigned NULL default 0,
 	`special_day` tinyint(1) default 0,
 	`wizard_level` enum('basic','advanced','nowizard') default 'nowizard',
+	`min_alerts_reset_counter` tinyint(1) default 0,
 	PRIMARY KEY  (`id`),
 	KEY `idx_template_action` (`id_alert_action`),
 	FOREIGN KEY (`id_alert_action`) REFERENCES talert_actions(`id`)

pandora_server/lib/PandoraFMS/Core.pm

@@ -362,6 +362,10 @@ sub pandora_evaluate_alert ($$$$$$$;$$$) {
 	
 	# Value returned on valid data
 	my $status = 1;
+
+	if ($alert->{'min_alerts_reset_counter'}) {
+		$status = 5;
+	}
 	
 	# Get current time
 	my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime(time());
@@ -380,24 +384,24 @@ sub pandora_evaluate_alert ($$$$$$$;$$$) {
 		
 		if ($special_day ne '') {
 			logger ($pa_config, $date . " is a special day for " . $alert->{'name'} . ". (as a " . $special_day . ")", 10);
-			return 1 if ($alert->{$special_day} != 1);
+			return $status if ($alert->{$special_day} != 1);
 		}
 		else {
 			logger ($pa_config, $date . " is *NOT* a special day for " . $alert->{'name'}, 10);
-			return 1 if ($alert->{$DayNames[$wday]} != 1);
+			return $status if ($alert->{$DayNames[$wday]} != 1);
 		}
 	}
 	else {
-		return 1 if ($alert->{$DayNames[$wday]} != 1);
+		return $status if ($alert->{$DayNames[$wday]} != 1);
 	}
 	
 	# Check time slot
 	my $time = sprintf ("%.2d:%.2d:%.2d", $hour, $min, $sec);
 	if (($alert->{'time_from'} ne $alert->{'time_to'})) {
 		if ($alert->{'time_from'} lt $alert->{'time_to'}) {
-			return 1 if (($time le $alert->{'time_from'}) || ($time ge $alert->{'time_to'}));
+			return $status if (($time le $alert->{'time_from'}) || ($time ge $alert->{'time_to'}));
 		} else {
-			return 1 if (($time le $alert->{'time_from'}) && ($time ge $alert->{'time_to'}));
+			return $status if (($time le $alert->{'time_from'}) && ($time ge $alert->{'time_to'}));
 		}
 	}