System will be undergoing maintenance on November 24th from 20:00 CET to November 25th 05:00 CET Some downtime might happen. Sorry for the inconvenience.

Commit 62ec48f6 authored by Bastien Pujos's avatar Bastien Pujos

Fix importer by adding notification tracking

parent 0537927a
...@@ -80,8 +80,8 @@ function notifier_import_rules($type) { ...@@ -80,8 +80,8 @@ function notifier_import_rules($type) {
$rules_type = explode(PHP_EOL,$xml_rules->$type); $rules_type = explode(PHP_EOL,$xml_rules->$type);
foreach($rules_type as $rule_type) { foreach($rules_type as $rule_type) {
if(!empty($rule_type)) { if(!empty($rule_type)) {
$rule = explode(":",$rule_type,9); $rule = explode(":",$rule_type,10);
if(count($rule) == 9) { if(count($rule) == 10 || count($rule) == 9 ) {
$debug = trim($rule[0]); $debug = trim($rule[0]);
$contact = trim($rule[1]); $contact = trim($rule[1]);
$host = trim($rule[2]); $host = trim($rule[2]);
...@@ -89,6 +89,12 @@ function notifier_import_rules($type) { ...@@ -89,6 +89,12 @@ function notifier_import_rules($type) {
$state = trim($rule[4]); $state = trim($rule[4]);
$notificationnumber = trim($rule[7]); $notificationnumber = trim($rule[7]);
if(isset($rule[9])){
$tracking = trim($rule[9]);
}else{
$tracking = 0;
}
// Timeperiod // Timeperiod
$daysofweek = trim($rule[5]); $daysofweek = trim($rule[5]);
$timeperiod = trim($rule[6]); $timeperiod = trim($rule[6]);
...@@ -114,7 +120,7 @@ function notifier_import_rules($type) { ...@@ -114,7 +120,7 @@ function notifier_import_rules($type) {
} else { } else {
$rule_sort_key=0; $rule_sort_key=0;
} }
$sql_rule = "INSERT INTO rules VALUES('','','".$type."','".$debug."','".$contact."','".$host."','".$service."','".$state."','".$notificationnumber."','".$timeperiod_id."','".$rule_sort_key."')"; $sql_rule = "INSERT INTO rules VALUES('','','".$type."','".$debug."','".$contact."','".$host."','".$service."','".$state."','".$notificationnumber."','".$timeperiod_id."','".$rule_sort_key."', '".$tracking."')";
$rule_type_id = sqlrequest($database_notifier,$sql_rule,true); $rule_type_id = sqlrequest($database_notifier,$sql_rule,true);
$rule_name = "RULE_".strtoupper($type)."_".$rule_type_id.""; $rule_name = "RULE_".strtoupper($type)."_".$rule_type_id."";
sqlrequest($database_notifier,"UPDATE rules set name='".$rule_name."' where id='".$rule_type_id."'"); sqlrequest($database_notifier,"UPDATE rules set name='".$rule_name."' where id='".$rule_type_id."'");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment