Pb patchs

[max-lb]

Salut j'ai un petit problème lors du patchage n°3 d'oreon. En fait j'ai l'erreur avec parsing_log.pl.rej (voir ici).

Il demande de supprimer une ligne dans mon fichier parsing_log.pl .
Mais je ne sais pas laquelle !
Quelqu'un pour m'aider ? Vous avez surement déjà eu ce problème ?
voilà mon fichier :

use strict;
use warnings;
use DBI;
use File::stat;
use Getopt::Long;
use POSIX;

use vars qw($mysql_user $mysql_passwd $mysql_host $mysql_database_oreon $mysql_database_ods $opt_h $opt_a $data);

my $installedPath = "/usr/local/oreon";
#my $installedPath = "/usr/local/oreon";
require $installedPath."/ODS/etc/conf.pm";

## Init Date
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time);

# Init MySQL Connexion
my $dbh = DBI->connect("DBI:mysql:database=".$mysql_database_ods.";host=".$mysql_host, $mysql_user, $mysql_passwd, {'RaiseError' => 1});

Getopt::Long::Configure('bundling');
GetOptions
("h" => \$opt_h,            "help" => \$opt_h,
     "a" => \$opt_a,            "archives" => \$opt_a);

if($opt_h) {
    print "Usage : $0 :\n";
    print "       -a (--archives) load data from log archives to database\n";
    print "       -h (--help) show help\n";
    exit(0);
}

# Get conf Data
my $sth = $dbh->prepare("SELECT archive_log, archive_retention, nagios_log_file  FROM config");
if (!$sth->execute) {die "Error:" . $sth->errstr . "\n";}
$data = $sth->fetchrow_hashref();


my $cpt = 0;
my $ctime = 0;
my $last_line_read;

# Parsing nagios.log
sub parseFile ($) {
if (!open (FILE, $_[0])) {
                print "Cannot open file : $_[0]\n";
    }
    if (!$opt_a) {
                while ($cpt < $last_line_read && <FILE>){
                    $cpt++;
                }
    }
    while (<FILE>) {
                if ($_ =~ /^\[([0-9]*)\]\sSERVICE ALERT\:\ ([a-zA-Z0-9\.\-\_\ \%\'\"\(\[\]\)\{\}\,\;\:\/\=\<\>\*\$\^\~\@\+]*)/){
                    my @tab = split(/;/, $2);
                    $ctime = $1;
                    $tab[5] =~ s/\'/\\\'/g;
                    $sth = $dbh->prepare("INSERT INTO `log` (`msg_type`,`ctime`, `host_name` , `service_description`, `status`, `type`, `retry`, `output`) VALUES ('0', '$ctime', '".$tab[0]."', '".$tab[1]."', '".$tab[2]."', '".$tab[3]."','".$tab[4]."','".$tab[5]."')");
                    if (!$sth->execute) {print "Error:" . $sth->errstr . "\n";}  
                } elsif ($_ =~ /^\[([0-9]*)\]\sHOST ALERT\:\ ([a-zA-Z0-9\.\-\_\ \%\'\"\(\[\]\)\{\}\,\;\:\/\=\<\>\*\$\^\~\@\+]*)/){
                    my @tab = split(/;/, $2);
                    $ctime = $1;
                    $tab[4] =~ s/\'/\\\'/g;
                    $sth = $dbh->prepare("INSERT INTO `log` (`msg_type`,`ctime`, `host_name` , `status`,  `type`, `retry`, `output`) VALUES ('1', '$ctime', '".$tab[0]."', '".$tab[1]."', '".$tab[2]."','".$tab[3]."','".$tab[4]."')");
                    if (!$sth->execute) {print "Error:" . $sth->errstr . "\n";}  
                } elsif ($_ =~ /^\[([0-9]*)\]\sSERVICE NOTIFICATION\:\ ([a-zA-Z0-9\.\-\_\ \%\'\"\(\[\]\)\{\}\,\;\:\/\=\<\>\*\$\^\~\@\+]*)/){
                    my @tab = split(/;/, $2);
                    $ctime = $1;
                    $tab[5] =~ s/\'/\\\'/g;
                    $sth = $dbh->prepare("INSERT INTO `log` (`msg_type`,`ctime`, `host_name` , `service_description`, `status`, `notification_cmd`, `notification_contact`, `output`) VALUES ('2', '$ctime', '".$tab[1]."', '".$tab[2]."', '".$tab[3]."', '".$tab[4]."','".$tab[0]."','".$tab[5]."')");
                    if (!$sth->execute) {print "Error:" . $sth->errstr . "\n";}  
                } elsif ($_ =~ /^\[([0-9]*)\]\sHOST NOTIFICATION\:\ ([a-zA-Z0-9\.\-\_\ \%\'\"\(\[\]\)\{\}\,\;\:\/\=\<\>\*\$\^\~\@\+]*)/){
                    my @tab = split(/;/, $2);
                    $ctime = $1;
                    $tab[4] =~ s/\'/\\\'/g;
  $sth = $dbh->prepare("INSERT INTO `log` (`msg_type`,`ctime`, `notification_contact`, `host_name` , `status`, `notification_cmd`,  `output`) VALUES ('3', '$ctime', '".$tab[0]."','".$tab[1]."', '".$tab[2]."', '".$tab[3]."','".$tab[4]."')");
                    if (!$sth->execute) {print "Error:" . $sth->errstr . "\n";}  
                } elsif ($_ =~ /^\[([0-9]*)\]\sWarning\:\ ([a-zA-Z0-9\.\-\_\ \%\'\"\(\[\]\)\{\}\,\;\:\/\=\<\>\*\$\^\~\@\+]*)/){
                    my $tab = $2;
                    $ctime = $1;
                    $tab =~ s/\'/\\\'/g;
                    $sth = $dbh->prepare("INSERT INTO `log` (`msg_type`,`ctime`, `output`) VALUES ('4','$ctime', '".$tab."')");
                    if (!$sth->execute) {print "Error:" . $sth->errstr . "\n";}  
                } elsif ($_ =~ /^\[([0-9]*)\]\ ([a-zA-Z0-9\.\-\_\ \%\'\"\(\[\]\)\{\}\,\;\:\/\=\<\>\*\$\^\~\@\+]*)/) {
                    $ctime = $1;
                    my $tab = $2;
                    $tab =~ s/\'/\\\'/g;
                    $sth = $dbh->prepare("INSERT INTO `log` (`msg_type`,`ctime`, `output`) VALUES ('5','$ctime', '".$tab."')");
@                                                                               
                    if (!$sth->execute) {print "Error:" . $sth->errstr . "\n";}  
                }
                $cpt++;
    }
    close(FILE);
}


my $retention = $data->{'archive_retention'};

sub parseArchive() {
    my $dbh1 = DBI->connect("DBI:mysql:database=".$mysql_database_oreon.";host=".$mysql_host, $mysql_user, $mysql_passwd, {'RaiseError' => 1});
    my $sth1 = $dbh1->prepare("SELECT log_archive_path  FROM cfg_nagios where nagios_activate = '1'");
    if (!$sth1->execute) {die "Error:" . $sth->errstr . "\n";}
    my $data1 = $sth1->fetchrow_hashref();
    my $archives = $data1->{'log_archive_path'};
    if (!$archives) {
                print "log archive path not found.\n";
                exit;
    }
    if (!($archives =~ /\/$/)) {
                $archives .= "/";
    }
    my @log_files = split /\s/,`ls $archives`;
    my $last_log = time() - ($retention * 24 * 60 * 60);
    foreach(@log_files) {
                $_ =~ /nagios\-([0-9\-]+).log/;
                my @time = split /\-/, $1;
                my $temp = $time[0]."/".$time[1]."/".$time[2];
                $temp = `date -d $temp +%s`;
                if ($temp > $last_log) {
                    if(!(-r $archives.$_)) {
                                print "Error : cannot read file $archives$_\n";
                    }else {
                                print $archives.$_."\n";
                                parseFile($archives.$_);
                    }
                }
    }
}

sub parseLogFile() {
        my $LOG_FILE = $data->{'nagios_log_file'};
    if (!(-r $LOG_FILE)) {
                print "Error : cannot open $LOG_FILE\n";
                exit(0);
    }
    if (!$data->{'archive_log'}){exit();}
    # Decide if we have to read the nagios.log from the begining 
    if ($hour eq 0 && $min eq 0){
                $last_line_read = 0;
                $sth = $dbh->prepare("UPDATE config SET `last_line_read` = '0'");
                if (!$sth->execute) {die "Error:" . $sth->errstr . "\n";}
                $data = $sth->fetchrow_hashref();
    }

        $sth = $dbh->prepare("SELECT last_line_read FROM config");
        if (!$sth->execute) {die "Error:" . $sth->errstr . "\n";}
        $data = $sth->fetchrow_hashref();
        $last_line_read = $data->{'last_line_read'};
        if (!defined($last_line_read)){$last_line_read = 0;}
        parseFile($LOG_FILE);
        # Update statistics and flags
        my $sth1 = $dbh->prepare("UPDATE `config` SET `last_line_read` = '".$cpt."'");
        if (!$sth1->execute) {die "Error:" . $sth1->errstr . "\n";}
}

if ($opt_a) {
    parseArchive;
} else {
        parseLogFile();
}

# if ($retention ne 0){
#     my $last_log = time() - ($retention * 24 * 60 * 60);
#     my $sth1 = $dbh->prepare("DELETE FROM log WHERE ctime < '$last_log'");
#     if (!$sth1->execute) {die "Error:" . $sth1->errstr . "\n";}
# }
exit; 

merci de votre aide



http://city-max.miniville.fr/

[Gio]

Tu aurais plutôt du nous poster ton fichier parsing_log.pl.rej car c'est dans ce fichier là que ce situe les lignes que tu dois enlever et celles que tu dois rajouter dans ton fichier parsing_log.pl.

Celles que tu dois enlever sont précédées d'un - et celles que tu dois rajouter sont précédées d'un +.

Si tu as de la chance tu n'as presque rien à faire, sinon bon courage

Je croit que j'ai d'ailleurs fait une petite erreur à ce niveau, donc ne compte pas sur moi pour te refiler mon fichier.
Faudrait voir si quelqu'un pourrait poster son parsing_log.pl modifié, patché et qui fonctionne bien